diff options
| author | William Todd Stinson <stinson@lindenlab.com> | 2012-11-20 16:20:40 -0800 |
|---|---|---|
| committer | William Todd Stinson <stinson@lindenlab.com> | 2012-11-20 16:20:40 -0800 |
| commit | 67bc42a80ac0c125a719e2d48c974f9259c04551 (patch) | |
| tree | e76b0c3acf0a53d98fb7a7fbc79d912bbb916588 /indra/newview/llwlhandlers.cpp | |
| parent | 1ece38912188650c9bc5a1cf906ca4a88acc21c4 (diff) | |
| parent | cca22d608deb26cf21b33629b170e70a0e221575 (diff) | |
Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta.
Diffstat (limited to 'indra/newview/llwlhandlers.cpp')
| -rw-r--r-- | indra/newview/llwlhandlers.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/indra/newview/llwlhandlers.cpp b/indra/newview/llwlhandlers.cpp index 2425b96678..be3e3ff30e 100644 --- a/indra/newview/llwlhandlers.cpp +++ b/indra/newview/llwlhandlers.cpp @@ -105,10 +105,16 @@ LLEnvironmentRequestResponder::LLEnvironmentRequestResponder() return; } - if (unvalidated_content[0]["regionID"].asUUID() != gAgent.getRegion()->getRegionID()) + LLUUID regionId; + if( gAgent.getRegion() ) + { + regionId = gAgent.getRegion()->getRegionID(); + } + + if (unvalidated_content[0]["regionID"].asUUID() != regionId ) { LL_WARNS("WindlightCaps") << "Not in the region from where this data was received (wanting " - << gAgent.getRegion()->getRegionID() << " but got " << unvalidated_content[0]["regionID"].asUUID() + << regionId << " but got " << unvalidated_content[0]["regionID"].asUUID() << ") - ignoring..." << LL_ENDL; return; } |