summaryrefslogtreecommitdiff
path: root/indra/newview/llviewermessage.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-10-05 18:02:58 -0400
committerOz Linden <oz@lindenlab.com>2011-10-05 18:02:58 -0400
commit5f38ec7f92fcea833352cd30797a9d73ef5a041f (patch)
tree67a35e5cd822b9f630dd72fdc93e4a3749f92735 /indra/newview/llviewermessage.cpp
parent194bedbb96a6dcfe90d5b731aeca8658c83f2306 (diff)
parent30480b58db917e48090ae7b3c1427834875d9626 (diff)
merge changes for storm-1637
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;