summaryrefslogtreecommitdiff
path: root/indra/newview/llviewermessage.cpp
diff options
context:
space:
mode:
authorRichard Linden <none@none>2011-10-15 18:14:49 -0700
committerRichard Linden <none@none>2011-10-15 18:14:49 -0700
commit4aed73ceb18c656e0f36c91bd0efb9a705341629 (patch)
tree013b1382be366aa2a9d1caf7bb563e04f7d8b2ed /indra/newview/llviewermessage.cpp
parent7c2f2b526ad2b33f1e25378b5a05379de6aa0b5a (diff)
parent62d9db2f21b2a6fb579e8f7631a4e387cc5e5b29 (diff)
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience-fui
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 1c07d36e7e..369d2d757d 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -2834,8 +2834,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;