diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2008-04-01 17:45:04 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2008-04-01 17:45:04 +0000 |
| commit | 941cb9f4124c9ccfd5c845bc94639fa46df12c3d (patch) | |
| tree | e0f525e7bd6cc76d89b2df69c6f1554d191561e8 /indra/newview/llviewercontrol.cpp | |
| parent | ecec626dec93524f7ef5831a5ba344d6449b99bc (diff) | |
merge release@83343 skinning-1-merge@83714 -> release
QAR-424
Diffstat (limited to 'indra/newview/llviewercontrol.cpp')
| -rw-r--r-- | indra/newview/llviewercontrol.cpp | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/indra/newview/llviewercontrol.cpp b/indra/newview/llviewercontrol.cpp index 0df04fccfa..2e76fe33a3 100644 --- a/indra/newview/llviewercontrol.cpp +++ b/indra/newview/llviewercontrol.cpp @@ -79,7 +79,6 @@ BOOL gHackGodmode = FALSE; std::map<LLString, LLControlGroup*> gSettings; LLControlGroup gSavedSettings; // saved at end of session LLControlGroup gSavedPerAccountSettings; // saved at end of session -LLControlGroup gViewerArt; // read-only LLControlGroup gColors; // read-only LLControlGroup gCrashSettings; // saved at end of session @@ -101,10 +100,7 @@ static bool handleRenderFarClipChanged(const LLSD& newvalue) { F32 draw_distance = (F32) newvalue.asReal(); gAgent.mDrawDistance = draw_distance; - if (gWorldPointer) - { - gWorldPointer->setLandFarClip(draw_distance); - } + LLWorld::getInstance()->setLandFarClip(draw_distance); return true; } @@ -267,15 +263,14 @@ static bool handleAudioStreamMusicChanged(const LLSD& newvalue) { if ( newvalue.asBoolean() ) { - if (gParcelMgr - && gParcelMgr->getAgentParcel() - && !gParcelMgr->getAgentParcel()->getMusicURL().empty()) + if (LLViewerParcelMgr::getInstance()->getAgentParcel() + && !LLViewerParcelMgr::getInstance()->getAgentParcel()->getMusicURL().empty()) { // if stream is already playing, don't call this // otherwise music will briefly stop - if ( ! gAudiop->isInternetStreamPlaying() ) + if ( !gAudiop->isInternetStreamPlaying() ) { - gAudiop->startInternetStream(gParcelMgr->getAgentParcel()->getMusicURL().c_str()); + gAudiop->startInternetStream(LLViewerParcelMgr::getInstance()->getAgentParcel()->getMusicURL().c_str()); } } } @@ -290,7 +285,7 @@ static bool handleAudioStreamMusicChanged(const LLSD& newvalue) static bool handleUseOcclusionChanged(const LLSD& newvalue) { LLPipeline::sUseOcclusion = (newvalue.asBoolean() && gGLManager.mHasOcclusionQuery - && gFeatureManagerp->isFeatureAvailable("UseOcclusion") && !gUseWireframe) ? 2 : 0; + && LLFeatureManager::getInstance()->isFeatureAvailable("UseOcclusion") && !gUseWireframe) ? 2 : 0; return true; } |