livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

STORM-1142 ADDITIONAL_COMMIT Debugging improvements.

meow-7.2.2
Vadim ProductEngine 2011-04-07 06:26:42 +03:00
parent 89d747221c
commit 4b5eeb3460
4 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
indra/newview/llenvmanager.cpp
View File

@ -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;
}

3
indra/newview/llenvmanager.h
View File

@ -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>;

1
indra/newview/llfloaterenvsettings.cpp
View File

@ -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()));
}

2
indra/newview/llwldaycycle.cpp
View File

@ -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;
}