diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-05-10 17:46:32 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-05-10 17:46:32 -0400 |
| commit | d86eb3dd42d39e6b7647b6680100aeafe2173d36 (patch) | |
| tree | a5f70445f4166336fde8bb64df5414c14558cb65 /indra/newview/llviewermessage.cpp | |
| parent | 56e471c3991c52f1aab37a82d88fc8ad9634483f (diff) | |
| parent | 64289248273fb6cca2460614d1c25663f06ff0e2 (diff) | |
merge changes for beta fixes
Diffstat (limited to 'indra/newview/llviewermessage.cpp')
| -rw-r--r-- | indra/newview/llviewermessage.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index ef5968a5e2..0b8e5cf303 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -344,6 +344,11 @@ void process_layer_data(LLMessageSystem *mesgsys, void **user_data) { LLViewerRegion *regionp = LLWorld::getInstance()->getRegion(mesgsys->getSender()); + if(!regionp) + { + llwarns << "Invalid region for layer data." << llendl; + return; + } S32 size; S8 type; |