diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2011-09-26 15:44:21 -0400 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2011-09-26 15:44:21 -0400 |
commit | ad9c28a2693f0e05f229697bb906216f99029bed (patch) | |
tree | e03f6ac599b6fcc48936da1b0dff2ecd38d78acb /indra/newview/llviewermessage.cpp | |
parent | d475a96e94be90e68cf34bf6c25d8ab259aa47b5 (diff) | |
parent | 773a8e499e3a62043a5247774a4c14cde20b8cd4 (diff) |
Automated merge with http://hg.secondlife.com/viewer-development
Diffstat (limited to 'indra/newview/llviewermessage.cpp')
-rw-r--r-- | indra/newview/llviewermessage.cpp | 4 |
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; |