summaryrefslogtreecommitdiff
path: root/indra/newview/llviewermessage.cpp
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2011-10-10 15:32:57 -0400
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2011-10-10 15:32:57 -0400
commitd65d451448573f95b065a9be7c88ff239d5ed8be (patch)
tree7734e1017a9bb81f4073ffa7839bba39dbde7ab1 /indra/newview/llviewermessage.cpp
parent22795e0a8da1bd99a5bb0e4df62b684eb2fc3931 (diff)
parenta15701de33007f60994181d8e7300d1e624de373 (diff)
merge
Diffstat (limited to 'indra/newview/llviewermessage.cpp')
-rw-r--r--indra/newview/llviewermessage.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index 6435904fee..74ee918bfe 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -2836,8 +2836,8 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
else
{
LLVector3 pos, look_at;
- U64 region_handle;
- U8 region_access;
+ U64 region_handle(0);
+ U8 region_access(0);
std::string region_info = ll_safe_string((char*)binary_bucket, binary_bucket_size);
std::string region_access_str = LLStringUtil::null;
std::string region_access_icn = LLStringUtil::null;