diff options
| author | Vadim ProductEngine <vsavchuk@productengine.com> | 2011-04-07 06:26:42 +0300 |
|---|---|---|
| committer | Vadim ProductEngine <vsavchuk@productengine.com> | 2011-04-07 06:26:42 +0300 |
| commit | 4b5eeb34601ac642194e245ef3928a3b9e56d3b8 (patch) | |
| tree | 7231c6fe014c0ec26c04c7a4ddff2ac49677907d | |
| parent | 89d747221c15ce8eee19252291a0273871e8c986 (diff) | |
STORM-1142 ADDITIONAL_COMMIT Debugging improvements.
| -rw-r--r-- | indra/newview/llenvmanager.cpp | 12 | ||||
| -rw-r--r-- | indra/newview/llenvmanager.h | 3 | ||||
| -rw-r--r-- | indra/newview/llfloaterenvsettings.cpp | 1 | ||||
| -rw-r--r-- | indra/newview/llwldaycycle.cpp | 2 |
4 files changed, 16 insertions, 2 deletions
diff --git a/indra/newview/llenvmanager.cpp b/indra/newview/llenvmanager.cpp index 9300161837..b69586e88e 100644 --- a/indra/newview/llenvmanager.cpp +++ b/indra/newview/llenvmanager.cpp @@ -176,7 +176,6 @@ void LLEnvManager::clearEditingScope(const LLSD& notification, const LLSD& respo return; } - LL_DEBUGS("Windlight") << "Clearing editing scope " << mCurNormalScope << LL_ENDL; mIsEditing = false; updateUIFromEditability(); @@ -536,3 +535,14 @@ void LLEnvManager::notifyOptInChange() maybeClearEditingScope(true, false); } + +void LLEnvManager::dumpScopes() +{ + LLSD scope_dump; + + scope_dump = makePacket(LLEnvKey::SCOPE_LOCAL, LLSD()); + LL_DEBUGS("Windlight") << "Local scope:" << scope_dump << LL_ENDL; + + scope_dump = makePacket(LLEnvKey::SCOPE_REGION, LLSD()); + LL_DEBUGS("Windlight") << "Region scope:" << scope_dump << LL_ENDL; +} diff --git a/indra/newview/llenvmanager.h b/indra/newview/llenvmanager.h index 60298b12e4..438fe4590d 100644 --- a/indra/newview/llenvmanager.h +++ b/indra/newview/llenvmanager.h @@ -179,6 +179,9 @@ public: // gets normally displayed scope LLEnvKey::EScope getNormallyDisplayedScope() const; + // for debugging purposes + void dumpScopes(); + private: // overriden initializer friend class LLSingleton<LLEnvManager>; diff --git a/indra/newview/llfloaterenvsettings.cpp b/indra/newview/llfloaterenvsettings.cpp index d569159d6b..2fa022049d 100644 --- a/indra/newview/llfloaterenvsettings.cpp +++ b/indra/newview/llfloaterenvsettings.cpp @@ -113,6 +113,7 @@ void LLFloaterEnvSettings::initCallbacks(void) getChild<LLUICtrl>("EnvUseLocalTimeButton")->setCommitCallback(boost::bind(&LLFloaterEnvSettings::onUseLocalTime)); childSetCommitCallback("RegionWLOptIn", &LLFloaterEnvSettings::onUseRegionEnvironment, NULL); + getChild<LLUICtrl>("RegionWLOptIn")->setRightMouseDownCallback(boost::bind(&LLEnvManager::dumpScopes, &LLEnvManager::instance())); } diff --git a/indra/newview/llwldaycycle.cpp b/indra/newview/llwldaycycle.cpp index d5c723708c..05f7fd9872 100644 --- a/indra/newview/llwldaycycle.cpp +++ b/indra/newview/llwldaycycle.cpp @@ -142,7 +142,7 @@ LLSD LLWLDayCycle::asLLSD() day_data.append(key); } - LL_DEBUGS("Windlight Sync") << "Dumping day cycle (" << mTimeMap.size() << ") to LLSD: " << day_data << LL_ENDL; + lldebugs << "Dumping day cycle (" << mTimeMap.size() << ") to LLSD: " << day_data << llendl; return day_data; } |