Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Windlight/water parameter managers now derived from standard LLSingleton instead of using some silly redundant clone.

Browse Source
This commit is contained in:
Shyotl
2011-09-02 06:35:53 -05:00
parent 91cb401324
commit 443d4e9f56
31 changed files with 418 additions and 390 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
indra/newview/llviewermessage.cpp
View File

@@ -3746,17 +3746,17 @@ void process_teleport_finish(LLMessageSystem* msg, void**)
*/
//Reset the windlight profile to default
//LLWLParamManager::instance()->mAnimator.mIsRunning = false;
//LLWLParamManager::instance()->mAnimator.mUseLindenTime = false;
//LLWLParamManager::getInstance()->mAnimator.mIsRunning = false;
//LLWLParamManager::getInstance()->mAnimator.mUseLindenTime = false;
LLWLParamSet wl_backup;
if(LLWLParamManager::instance()->getParamSet("LightShare-Backup", wl_backup)) {
LLWLParamManager::instance()->propagateParameters();
LLWLParamManager::instance()->removeParamSet("LightShare-Backup", true);
if(LLWLParamManager::getInstance()->getParamSet("LightShare-Backup", wl_backup)) {
LLWLParamManager::getInstance()->propagateParameters();
LLWLParamManager::getInstance()->removeParamSet("LightShare-Backup", true);
}
LLWaterParamSet backup;
if(LLWaterParamManager::instance()->getParamSet("LightShare-Backup", backup)) {
LLWaterParamManager::instance()->propagateParameters();
LLWaterParamManager::instance()->removeParamSet("LightShare-Backup", true);
if(LLWaterParamManager::getInstance()->getParamSet("LightShare-Backup", backup)) {
LLWaterParamManager::getInstance()->propagateParameters();
LLWaterParamManager::getInstance()->removeParamSet("LightShare-Backup", true);
}
// now, use the circuit info to tell simulator about us!