summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerregion.cpp
diff options
context:
space:
mode:
authorNyx (Neal Orman) <nyx@lindenlab.com>2012-11-06 18:18:27 -0500
committerNyx (Neal Orman) <nyx@lindenlab.com>2012-11-06 18:18:27 -0500
commitc3b00d4063fe4f85ec293b98750735b94776c4fe (patch)
treed49e13d60af8bf9b346536623ccae7bee3602eea /indra/newview/llviewerregion.cpp
parent85e03582b21aef8a74613d14d5dcde63cf476cdb (diff)
parentee2bc008ea8f04ffd1271787382a2b756e6293aa (diff)
merge
Diffstat (limited to 'indra/newview/llviewerregion.cpp')
-rwxr-xr-xindra/newview/llviewerregion.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp
index 0855bc9243..c8ab055e3f 100755
--- a/indra/newview/llviewerregion.cpp
+++ b/indra/newview/llviewerregion.cpp
@@ -1745,6 +1745,11 @@ bool LLViewerRegion::isSpecialCapabilityName(const std::string &name)
std::string LLViewerRegion::getCapability(const std::string& name) const
{
+ if (!capabilitiesReceived() && (name!=std::string("Seed")))
+ {
+ llwarns << "getCapability called before caps received" << llendl;
+ }
+
CapabilityMap::const_iterator iter = mImpl->mCapabilities.find(name);
if(iter == mImpl->mCapabilities.end())
{