diff options
| author | Logan Dethrow <log@lindenlab.com> | 2012-11-15 15:20:46 -0500 |
|---|---|---|
| committer | Logan Dethrow <log@lindenlab.com> | 2012-11-15 15:20:46 -0500 |
| commit | 79dbaed1581a5d8212caebf6b6a3672660e2f5a9 (patch) | |
| tree | c3c539a8ce3ccfb4d7d1a66b58b56fce9b5c293b /indra/newview/llviewerregion.cpp | |
| parent | f93604c399c889e06980554e1cb59a833e7f847d (diff) | |
| parent | 51a016a0cc6928dd2a685ce22dd6475e2610a5c5 (diff) | |
Merge lindenlab/sunshine-internal -> log/sunshine-internal
Diffstat (limited to 'indra/newview/llviewerregion.cpp')
| -rwxr-xr-x | indra/newview/llviewerregion.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp index 94533d97df..f5d2fc6888 100755 --- a/indra/newview/llviewerregion.cpp +++ b/indra/newview/llviewerregion.cpp @@ -1746,6 +1746,11 @@ bool LLViewerRegion::isSpecialCapabilityName(const std::string &name) std::string LLViewerRegion::getCapability(const std::string& name) const { + if (!capabilitiesReceived() && (name!=std::string("Seed")) && (name!=std::string("ObjectMedia"))) + { + llwarns << "getCapability called before caps received" << llendl; + } + CapabilityMap::const_iterator iter = mImpl->mCapabilities.find(name); if(iter == mImpl->mCapabilities.end()) { |