diff options
| author | Rider Linden <rider@lindenlab.com> | 2015-09-25 12:51:44 -0700 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2015-09-25 12:51:44 -0700 |
| commit | cf6c07927d70db9976d2c47bb21552ba9b38c9b0 (patch) | |
| tree | 55c2ea8917183efe8a47bdb5ed51a75dec9afa70 /indra/newview/llwlhandlers.cpp | |
| parent | bb8afb10d5f49e565bbd8af7777359553c54919a (diff) | |
There seemed to be an excess call to setInitialPerms, also cleaned up a ignored call to the environtment settings on login.
Diffstat (limited to 'indra/newview/llwlhandlers.cpp')
| -rwxr-xr-x | indra/newview/llwlhandlers.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llwlhandlers.cpp b/indra/newview/llwlhandlers.cpp index 8ecfeef2dc..87e8c3008e 100755 --- a/indra/newview/llwlhandlers.cpp +++ b/indra/newview/llwlhandlers.cpp @@ -126,7 +126,7 @@ void LLEnvironmentRequest::environmentRequestCoro(std::string url) regionId = gAgent.getRegion()->getRegionID(); } - if (result[0]["regionID"].asUUID() != regionId) + if ((result[0]["regionID"].asUUID() != regionId) && regionId.notNull()) { LL_WARNS("WindlightCaps") << "Not in the region from where this data was received (wanting " << regionId << " but got " << result[0]["regionID"].asUUID() |