1 files changed, 17 insertions, 24 deletions

diff --git a/linden/indra/newview/llviewercontrol.cpp b/linden/indra/newview/llviewercontrol.cpp
index 98d19bc..7a30b22 100644
--- a/linden/indra/newview/llviewercontrol.cpp
+++ b/linden/indra/newview/llviewercontrol.cpp
@@ -43,7 +43,7 @@
 #include "lldrawpoolterrain.h"
 #include "llflexibleobject.h"
 #include "llfeaturemanager.h"
-#include "llglslshader.h"
+#include "llviewershadermgr.h"
 #include "llnetmap.h"
 #include "llpanelgeneral.h"
 #include "llpanelinput.h"
@@ -76,14 +76,14 @@ BOOL 				gHackGodmode = FALSE;
 #endif
 
 
-std::map<LLString, LLControlGroup*> gSettings;
+std::map<std::string, LLControlGroup*> gSettings;
 LLControlGroup gSavedSettings;  // saved at end of session
 LLControlGroup gSavedPerAccountSettings; // saved at end of session
 LLControlGroup gColors;                 // read-only
 LLControlGroup gCrashSettings;  // saved at end of session
 
-LLString gLastRunVersion;
-LLString gCurrentVersion;
+std::string gLastRunVersion;
+std::string gCurrentVersion;
 
 extern BOOL gResizeScreenTexture;
 extern BOOL gDebugGL;
@@ -114,7 +114,7 @@ static bool handleTerrainDetailChanged(const LLSD& newvalue)
 
 static bool handleSetShaderChanged(const LLSD& newvalue)
 {
-        LLShaderMgr::setShaders();
+        LLViewerShaderMgr::instance()->setShaders();
         return true;
 }
 
@@ -141,6 +141,12 @@ static bool handleAvatarLODChanged(const LLSD& newvalue)
         return true;
 }
 
+static bool handleAvatarMaxVisibleChanged(const LLSD& newvalue)
+{
+        LLVOAvatar::sMaxVisible = (U32) newvalue.asInteger();
+        return true;
+}
+
 static bool handleTerrainLODChanged(const LLSD& newvalue)
 {
                 LLVOSurfacePatch::sLODFactor = (F32)newvalue.asReal();
@@ -271,7 +277,7 @@ static bool handleAudioStreamMusicChanged(const LLSD& newvalue)
                                 // otherwise music will briefly stop
                                 if ( !gAudiop->isInternetStreamPlaying() )
                                 {
-                                        gAudiop->startInternetStream(LLViewerParcelMgr::getInstance()->getAgentParcel()->getMusicURL().c_str());
+                                        gAudiop->startInternetStream(LLViewerParcelMgr::getInstance()->getAgentParcel()->getMusicURL());
                                 }
                         }
                 }
@@ -385,7 +391,7 @@ static bool handleDebugViewsChanged(const LLSD& newvalue)
 static bool handleLogFileChanged(const LLSD& newvalue)
 {
         std::string log_filename = newvalue.asString();
-        LLFile::remove(log_filename.c_str());
+        LLFile::remove(log_filename);
         LLError::logToFile(log_filename);
         return true;
 }
@@ -418,22 +424,7 @@ bool handleVoiceClientPrefsChanged(const LLSD& newvalue)
 {
         if(gVoiceClient)
         {
-                // Note: Ignore the specific event value, look up the ones we want
-
-                gVoiceClient->setVoiceEnabled(gSavedSettings.getBOOL("EnableVoiceChat"));
-                gVoiceClient->setUsePTT(gSavedSettings.getBOOL("PTTCurrentlyEnabled"));
-                std::string keyString = gSavedSettings.getString("PushToTalkButton");
-                gVoiceClient->setPTTKey(keyString);
-                gVoiceClient->setPTTIsToggle(gSavedSettings.getBOOL("PushToTalkToggle"));
-                gVoiceClient->setEarLocation(gSavedSettings.getS32("VoiceEarLocation"));
-                std::string serverName = gSavedSettings.getString("VivoxDebugServerName");
-                gVoiceClient->setVivoxDebugServerName(serverName);
-
-                std::string inputDevice = gSavedSettings.getString("VoiceInputAudioDevice");
-                gVoiceClient->setCaptureDevice(inputDevice);
-                std::string outputDevice = gSavedSettings.getString("VoiceOutputAudioDevice");
-                gVoiceClient->setRenderDevice(outputDevice);
-                gVoiceClient->setLipSyncEnabled(gSavedSettings.getBOOL("LipSyncEnabled"));
+                gVoiceClient->updateSettings();
         }
         return true;
 }
@@ -454,6 +445,7 @@ void settings_setup_listeners()
         gSavedSettings.getControl("RenderAvatarCloth")->getSignal()->connect(boost::bind(&handleSetShaderChanged, _1));
         gSavedSettings.getControl("WindLightUseAtmosShaders")->getSignal()->connect(boost::bind(&handleSetShaderChanged, _1));
         gSavedSettings.getControl("RenderGammaFull")->getSignal()->connect(boost::bind(&handleSetShaderChanged, _1));
+        gSavedSettings.getControl("RenderAvatarMaxVisible")->getSignal()->connect(boost::bind(&handleAvatarMaxVisibleChanged, _1));
         gSavedSettings.getControl("RenderVolumeLODFactor")->getSignal()->connect(boost::bind(&handleVolumeLODChanged, _1));
         gSavedSettings.getControl("RenderAvatarLODFactor")->getSignal()->connect(boost::bind(&handleAvatarLODChanged, _1));
         gSavedSettings.getControl("RenderTerrainLODFactor")->getSignal()->connect(boost::bind(&handleTerrainLODChanged, _1));
@@ -686,4 +678,5 @@ void test_cached_control()
 
         if((std::string)test_BrowserHomePage != "http://www.secondlife.com") llerrs << "Fail BrowserHomePage" << llendl;
 }
-#endif // TEST_CACHED_CONTROL
\ No newline at end of file
+#endif // TEST_CACHED_CONTROL
+