From aa817c7cb4caad98628543c60eeb34909413dee2 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Mon, 13 Sep 2010 17:18:52 -0700
Subject: Updated openal device loading and added debug info for startup

---
 linden/indra/llaudio/llaudioengine_openal.cpp | 69 +++++++++++++++++++++------
 linden/indra/llaudio/llaudioengine_openal.h   | 29 ++++++-----
 2 files changed, 70 insertions(+), 28 deletions(-)

diff --git a/linden/indra/llaudio/llaudioengine_openal.cpp b/linden/indra/llaudio/llaudioengine_openal.cpp
index 93bc42b..c33b992 100644
--- a/linden/indra/llaudio/llaudioengine_openal.cpp
+++ b/linden/indra/llaudio/llaudioengine_openal.cpp
@@ -48,7 +48,9 @@ LLAudioEngine_OpenAL::LLAudioEngine_OpenAL()
 	mWindBufSamples(0),
 	mWindBufBytes(0),
 	mWindSource(AL_NONE),
-	mNumEmptyWindALBuffers(MAX_NUM_WIND_BUFFERS)
+	mNumEmptyWindALBuffers(MAX_NUM_WIND_BUFFERS),
+	mContext(NULL),
+	mDevice(NULL)
 {
 }
 
@@ -69,30 +71,63 @@ bool LLAudioEngine_OpenAL::init(const S32 num_channels, void* userdata)
 		return false;
 	}
 
+	// check for extensions
+	if (alcIsExtensionPresent(NULL, "ALC_ENUMERATION_EXT"))
+	{
+		llinfos << "Results for ALC_ENUMERATION_EXT:\n" 
+				<< ll_safe_string(alcGetString(NULL, ALC_DEVICE_SPECIFIER))
+				<< llendl;
+	}
+
+	// initialize device
+    ALCdevice* mDevice = alcOpenDevice(NULL); 
+    if (!mDevice)
+	{
+		llinfos << "OpenAL could not find an installed audio device. Aborting" << llendl;
+		ALCenum error = alcGetError(mDevice);
+		if (error != ALC_NO_ERROR)
+		{
+			llinfos << "ALC error:" << ll_safe_string(alcGetString(mDevice, error)) << llendl;
+		}
+		return false;
+	}
+
+	// create context
+	ALCcontext* mContext = alcCreateContext(mDevice, NULL);
+	if (mContext != NULL)
+	{
+		alcMakeContextCurrent(mContext);
+		if (alGetError() != AL_NO_ERROR)
+		{
+			llinfos << "ALC error:" << alGetError() << ". Could not set current context!" << llendl;
+		}
+	}
+	else
+	{
+		llinfos << "ALC error: could not create context from device!" << llendl;
+	}
+
 	llinfos << "LLAudioEngine_OpenAL::init() OpenAL successfully initialized" << llendl;
 
+	llinfos << "ALC default device: " 
+			<< ll_safe_string(alcGetString(mDevice, ALC_DEFAULT_DEVICE_SPECIFIER)) 
+			<< llendl;
+
 	llinfos << "OpenAL version: "
-		<< ll_safe_string(alGetString(AL_VERSION)) << llendl;
+			<< ll_safe_string(alGetString(AL_VERSION)) << llendl;
 	llinfos << "OpenAL vendor: "
-		<< ll_safe_string(alGetString(AL_VENDOR)) << llendl;
+			<< ll_safe_string(alGetString(AL_VENDOR)) << llendl;
 	llinfos << "OpenAL renderer: "
-		<< ll_safe_string(alGetString(AL_RENDERER)) << llendl;
+			<< ll_safe_string(alGetString(AL_RENDERER)) << llendl;
 
-	ALint major = alutGetMajorVersion ();
-	ALint minor = alutGetMinorVersion ();
+	ALint major = alutGetMajorVersion();
+	ALint minor = alutGetMinorVersion();
 	llinfos << "ALUT version: " << major << "." << minor << llendl;
 
-	ALCdevice *device = alcGetContextsDevice(alcGetCurrentContext());
-
-	alcGetIntegerv(device, ALC_MAJOR_VERSION, 1, &major);
-	alcGetIntegerv(device, ALC_MINOR_VERSION, 1, &minor);
+	alcGetIntegerv(mDevice, ALC_MAJOR_VERSION, 1, &major);
+	alcGetIntegerv(mDevice, ALC_MINOR_VERSION, 1, &minor);
 	llinfos << "ALC version: " << major << "." << minor << llendl;
 
-	llinfos << "ALC default device: "
-		<< ll_safe_string(alcGetString(device,
-					       ALC_DEFAULT_DEVICE_SPECIFIER))
-		<< llendl;
-
 	return true;
 }
 
@@ -148,6 +183,10 @@ void LLAudioEngine_OpenAL::shutdown()
 		llwarns << "LLAudioEngine_OpenAL::shutdown() ALUT shutdown failed: " << alutGetErrorString (alutGetError ()) << llendl;
 	}
 
+	alcMakeContextCurrent(NULL);
+    alcDestroyContext(mContext);
+    alcCloseDevice(mDevice);
+
 	llinfos << "LLAudioEngine_OpenAL::shutdown() OpenAL successfully shut down" << llendl;
 
 	delete mListenerp;
diff --git a/linden/indra/llaudio/llaudioengine_openal.h b/linden/indra/llaudio/llaudioengine_openal.h
index 900bcb3..9b52b88 100644
--- a/linden/indra/llaudio/llaudioengine_openal.h
+++ b/linden/indra/llaudio/llaudioengine_openal.h
@@ -47,7 +47,7 @@ class LLAudioEngine_OpenAL : public LLAudioEngine
 		virtual ~LLAudioEngine_OpenAL();
 
 		virtual bool init(const S32 num_channels, void *user_data);
-        	virtual std::string getDriverName(bool verbose);
+        virtual std::string getDriverName(bool verbose);
 		virtual void allocateListener();
 
 		virtual void shutdown();
@@ -62,17 +62,20 @@ class LLAudioEngine_OpenAL : public LLAudioEngine
 		/*virtual*/ void updateWind(LLVector3 direction, F32 camera_altitude);
 
 	private:
-		void * windDSP(void *newbuffer, int length);
-	        typedef S16 WIND_SAMPLE_T;
-        	LLWindGen<WIND_SAMPLE_T> *mWindGen;
-        	S16 *mWindBuf;
-        	U32 mWindBufFreq;
-        	U32 mWindBufSamples;
-        	U32 mWindBufBytes;
-        	ALuint mWindSource;
-	        int mNumEmptyWindALBuffers;
-
-        	static const int MAX_NUM_WIND_BUFFERS = 80;
+		void* windDSP(void *newbuffer, int length);
+        typedef S16 WIND_SAMPLE_T;
+    	LLWindGen<WIND_SAMPLE_T>* mWindGen;
+    	S16 *mWindBuf;
+    	U32 mWindBufFreq;
+    	U32 mWindBufSamples;
+    	U32 mWindBufBytes;
+    	ALuint mWindSource;
+        int mNumEmptyWindALBuffers;
+
+    	static const int MAX_NUM_WIND_BUFFERS = 80;
+
+		ALCcontext* mContext;
+		ALCdevice* mDevice;
 };
 
 class LLAudioChannelOpenAL : public LLAudioChannel
@@ -91,7 +94,7 @@ class LLAudioChannelOpenAL : public LLAudioChannel
 		/*virtual*/ void updateLoop();
 
 		ALuint mALSource;
-	        ALint mLastSamplePos;
+	    ALint mLastSamplePos;
 };
 
 class LLAudioBufferOpenAL : public LLAudioBuffer{
-- 
cgit v1.1


From 9d7b4020d43abf83bcd22c34d560853a7232c796 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Tue, 14 Sep 2010 13:38:54 -0700
Subject: Added more debugging info and initialization help. For some reason
 openal32.dll crashes on quit

---
 linden/indra/llaudio/llaudioengine_openal.cpp | 162 ++++++++++++++++++++------
 linden/indra/llaudio/llaudioengine_openal.h   |   3 +-
 2 files changed, 130 insertions(+), 35 deletions(-)

diff --git a/linden/indra/llaudio/llaudioengine_openal.cpp b/linden/indra/llaudio/llaudioengine_openal.cpp
index c33b992..08ec464 100644
--- a/linden/indra/llaudio/llaudioengine_openal.cpp
+++ b/linden/indra/llaudio/llaudioengine_openal.cpp
@@ -40,6 +40,35 @@
 
 static const float WIND_BUFFER_SIZE_SEC = 0.05f; // 1/20th sec
 
+std::string convertALErrorToString(ALenum error)
+{
+    switch(error)
+    {
+    case AL_NO_ERROR:
+		return std::string("AL_NO_ERROR");
+		break;
+    case AL_INVALID_NAME:
+        return std::string("AL_INVALID_NAME");
+		break;
+    case AL_INVALID_ENUM:
+        return std::string("AL_INVALID_ENUM");
+		break;
+    case AL_INVALID_VALUE:
+        return std::string("AL_INVALID_VALUE");
+		break;
+    case AL_INVALID_OPERATION:
+        return std::string("AL_INVALID_OPERATION");
+		break;
+    case AL_OUT_OF_MEMORY:
+        return std::string("AL_OUT_OF_MEMORY");
+		break;
+	default:
+		std::stringstream s;
+		s << error;
+		return s.str();
+    }
+}
+
 LLAudioEngine_OpenAL::LLAudioEngine_OpenAL()
 	:
 	mWindGen(NULL),
@@ -72,39 +101,76 @@ bool LLAudioEngine_OpenAL::init(const S32 num_channels, void* userdata)
 	}
 
 	// check for extensions
-	if (alcIsExtensionPresent(NULL, "ALC_ENUMERATION_EXT"))
+	const ALCchar* device_list(NULL);
+	const ALCchar* device_default(NULL);
+	if (alcIsExtensionPresent(NULL, "ALC_ENUMERATION_EXT") == AL_TRUE)
 	{
+		device_default = alcGetString(NULL, ALC_DEFAULT_DEVICE_SPECIFIER);
+		device_list = alcGetString(NULL, ALC_DEVICE_SPECIFIER);
 		llinfos << "Results for ALC_ENUMERATION_EXT:\n" 
-				<< ll_safe_string(alcGetString(NULL, ALC_DEVICE_SPECIFIER))
+				<< ll_safe_string(device_list)
 				<< llendl;
+
 	}
 
 	// initialize device
     ALCdevice* mDevice = alcOpenDevice(NULL); 
-    if (!mDevice)
+    if (mDevice == NULL)
 	{
-		llinfos << "OpenAL could not find an installed audio device. Aborting" << llendl;
-		ALCenum error = alcGetError(mDevice);
-		if (error != ALC_NO_ERROR)
+		llinfos << "Could not find a default device, trying to open default manually: " 
+				<< ll_safe_string(device_default) 
+				<< llendl;
+		mDevice = alcOpenDevice(device_default);
+		if (mDevice == NULL)
 		{
-			llinfos << "ALC error:" << ll_safe_string(alcGetString(mDevice, error)) << llendl;
+			const ALCchar* device_list_walk = device_list;
+			do
+			{
+				mDevice = alcOpenDevice(device_list_walk);
+				if (mDevice != NULL)
+				{
+					break;
+				}
+				else
+				{
+					device_list_walk += strlen(device_list_walk)+1;
+				}
+			}
+			while (device_list_walk[0] != '\0');
+
+			if (mDevice == NULL)
+			{
+				llinfos << "OpenAL could not find an installed audio device. Aborting" << llendl;
+				ALCenum error = alcGetError(mDevice);
+				if (error != ALC_NO_ERROR)
+				{
+					llinfos << "ALC error: " << ll_safe_string(alcGetString(mDevice, error)) << llendl;
+				}
+				return false;
+			}
 		}
-		return false;
 	}
 
 	// create context
 	ALCcontext* mContext = alcCreateContext(mDevice, NULL);
 	if (mContext != NULL)
 	{
-		alcMakeContextCurrent(mContext);
-		if (alGetError() != AL_NO_ERROR)
+		if (!alcMakeContextCurrent(mContext))
 		{
-			llinfos << "ALC error:" << alGetError() << ". Could not set current context!" << llendl;
+			ALenum error = alGetError();
+			if (error != AL_NO_ERROR)
+			{
+				llinfos << "ALC error: " << convertALErrorToString(error) << ". Could not set current context!" << llendl;
+			}
+			alcDestroyContext(mContext);
+			return false;
 		}
 	}
 	else
 	{
 		llinfos << "ALC error: could not create context from device!" << llendl;
+		alcCloseDevice(mDevice);
+		return false;
 	}
 
 	llinfos << "LLAudioEngine_OpenAL::init() OpenAL successfully initialized" << llendl;
@@ -174,23 +240,43 @@ void LLAudioEngine_OpenAL::allocateListener()
 void LLAudioEngine_OpenAL::shutdown()
 {
 	llinfos << "About to LLAudioEngine::shutdown()" << llendl;
+
 	LLAudioEngine::shutdown();
 
 	llinfos << "About to alutExit()" << llendl;
 	if(!alutExit())
 	{
 		llwarns << "Nuts." << llendl;
-		llwarns << "LLAudioEngine_OpenAL::shutdown() ALUT shutdown failed: " << alutGetErrorString (alutGetError ()) << llendl;
+		llwarns << "LLAudioEngine_OpenAL::shutdown() ALUT shutdown failed: " << alutGetErrorString(alutGetError()) << llendl;
 	}
 
-	alcMakeContextCurrent(NULL);
-    alcDestroyContext(mContext);
-    alcCloseDevice(mDevice);
-
 	llinfos << "LLAudioEngine_OpenAL::shutdown() OpenAL successfully shut down" << llendl;
 
 	delete mListenerp;
 	mListenerp = NULL;
+
+	ALenum error;
+
+	alcMakeContextCurrent(NULL);
+	error = alGetError();
+	if (error != AL_NO_ERROR)
+	{
+		llinfos << "AL error: " << convertALErrorToString(error) << ". Could not make current context NULL!" << llendl;
+	}
+
+	alcDestroyContext(mContext);
+	error = alGetError();
+	if (error != AL_NO_ERROR)
+	{
+		llinfos << "AL error: " << convertALErrorToString(error) << ". Could not destroy context!" << llendl;
+	}
+
+    alcCloseDevice(mDevice);
+	error = alGetError();
+	if (error != AL_NO_ERROR)
+	{
+		llinfos << "AL error: " << convertALErrorToString(error) << ". Could not close device!" << llendl;
+	}
 }
 
 LLAudioBuffer *LLAudioEngine_OpenAL::createBuffer()
@@ -220,7 +306,11 @@ LLAudioChannelOpenAL::LLAudioChannelOpenAL()
 LLAudioChannelOpenAL::~LLAudioChannelOpenAL()
 {
 	cleanup();
-	alDeleteSources(1, &mALSource);
+	if (mALSource != AL_NONE) //MC
+	{
+		alDeleteSources(1, &mALSource);
+		mALSource = AL_NONE;
+	}
 }
 
 void LLAudioChannelOpenAL::cleanup()
@@ -379,18 +469,20 @@ bool LLAudioBufferOpenAL::loadWAV(const std::string& filename)
 		ALenum error = alutGetError(); 
 		if (gDirUtilp->fileExists(filename))
 		{
-			llwarns <<
-				"LLAudioBufferOpenAL::loadWAV() Error loading "
-				<< filename
-				<< " " << alutGetErrorString(error) << llendl;
+			llwarns << "LLAudioBufferOpenAL::loadWAV() Error loading "
+					<< filename << " " 
+					<< convertALErrorToString(error) << ": "
+					<< alutGetErrorString(error) 
+					<< llendl;
 		}
 		else
 		{
 			// It's common for the file to not actually exist.
-			lldebugs <<
-				"LLAudioBufferOpenAL::loadWAV() Error loading "
-				 << filename
-				 << " " << alutGetErrorString(error) << llendl;
+			lldebugs << "LLAudioBufferOpenAL::loadWAV() Error loading "
+					<< filename << " " 
+					<< convertALErrorToString(error) << ": "
+					<< alutGetErrorString(error) 
+					<< llendl;
 		}
 		return false;
 	}
@@ -424,7 +516,7 @@ void LLAudioEngine_OpenAL::initWind()
 	
 	if((error=alGetError()) != AL_NO_ERROR)
 	{
-		llwarns << "LLAudioEngine_OpenAL::initWind() Error creating wind sources: "<<error<<llendl;
+		llwarns << "LLAudioEngine_OpenAL::initWind() Error creating wind sources: " << convertALErrorToString(error) << llendl;
 	}
 
 	mWindGen = new LLWindGen<WIND_SAMPLE_T>;
@@ -524,14 +616,14 @@ void LLAudioEngine_OpenAL::updateWind(LLVector3 wind_vec, F32 camera_altitude)
 
 	//llinfos << "mNumEmptyWindALBuffers: " << mNumEmptyWindALBuffers	<<" (" << unprocessed << ":" << processed << ")" << llendl;
 
-	while(processed--) // unqueue old buffers
+	while (processed--) // unqueue old buffers
 	{
 		ALuint buffer;
 		ALenum error;
 		alGetError(); /* clear error */
 		alSourceUnqueueBuffers(mWindSource, 1, &buffer);
 		error = alGetError();
-		if(error != AL_NO_ERROR)
+		if (error != AL_NO_ERROR)
 		{
 			llwarns << "LLAudioEngine_OpenAL::updateWind() error swapping (unqueuing) buffers" << llendl;
 		}
@@ -547,9 +639,9 @@ void LLAudioEngine_OpenAL::updateWind(LLVector3 wind_vec, F32 camera_altitude)
 		ALuint buffer;
 		alGetError(); /* clear error */
 		alGenBuffers(1,&buffer);
-		if((error=alGetError()) != AL_NO_ERROR)
+		if ((error=alGetError()) != AL_NO_ERROR)
 		{
-			llwarns << "LLAudioEngine_OpenAL::initWind() Error creating wind buffer: " << error << llendl;
+			llwarns << "LLAudioEngine_OpenAL::initWind() Error creating wind buffer: " << convertALErrorToString(error) << llendl;
 			break;
 		}
 
@@ -560,14 +652,14 @@ void LLAudioEngine_OpenAL::updateWind(LLVector3 wind_vec, F32 camera_altitude)
 			     mWindBufBytes,
 			     mWindBufFreq);
 		error = alGetError();
-		if(error != AL_NO_ERROR)
+		if (error != AL_NO_ERROR)
 		{
 			llwarns << "LLAudioEngine_OpenAL::updateWind() error swapping (bufferdata) buffers" << llendl;
 		}
 		
 		alSourceQueueBuffers(mWindSource, 1, &buffer);
 		error = alGetError();
-		if(error != AL_NO_ERROR)
+		if (error != AL_NO_ERROR)
 		{
 			llwarns << "LLAudioEngine_OpenAL::updateWind() error swapping (queuing) buffers" << llendl;
 		}
@@ -577,11 +669,13 @@ void LLAudioEngine_OpenAL::updateWind(LLVector3 wind_vec, F32 camera_altitude)
 
 	ALint playing;
 	alGetSourcei(mWindSource, AL_SOURCE_STATE, &playing);
-	if(playing != AL_PLAYING)
+	if (playing != AL_PLAYING)
 	{
 		alSourcePlay(mWindSource);
 
-		lldebugs << "Wind had stopped - probably ran out of buffers - restarting: " << (unprocessed+mNumEmptyWindALBuffers) << " now queued." << llendl;
+		lldebugs << "Wind had stopped - probably ran out of buffers - restarting: " 
+				<< (unprocessed+mNumEmptyWindALBuffers) << " now queued." 
+				<< llendl;
 	}
 }
 
diff --git a/linden/indra/llaudio/llaudioengine_openal.h b/linden/indra/llaudio/llaudioengine_openal.h
index 9b52b88..df32e13 100644
--- a/linden/indra/llaudio/llaudioengine_openal.h
+++ b/linden/indra/llaudio/llaudioengine_openal.h
@@ -97,7 +97,8 @@ class LLAudioChannelOpenAL : public LLAudioChannel
 	    ALint mLastSamplePos;
 };
 
-class LLAudioBufferOpenAL : public LLAudioBuffer{
+class LLAudioBufferOpenAL : public LLAudioBuffer
+{
 	public:
 		LLAudioBufferOpenAL();
 		virtual ~LLAudioBufferOpenAL();
-- 
cgit v1.1


From 18145841697382f7f940eb3df06d62fbc6adb436 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Thu, 23 Jun 2011 20:43:03 -0700
Subject: Updated Imp's easter egg chat commands with the new website urls

---
 linden/indra/newview/llgesturemgr.cpp | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/linden/indra/newview/llgesturemgr.cpp b/linden/indra/newview/llgesturemgr.cpp
index bb678d7..bd05cb3 100644
--- a/linden/indra/newview/llgesturemgr.cpp
+++ b/linden/indra/newview/llgesturemgr.cpp
@@ -627,12 +627,12 @@ BOOL LLGestureManager::triggerAndReviseString(const std::string &utf8str, std::s
 					 LLStringUtil::compareInsensitive("/icanhashelp", cur_token) == 0 ||
 					 LLStringUtil::compareInsensitive("/icanhashalp", cur_token) == 0)
 			{
-				LLWeb::loadURLInternal("http://support.imprudenceviewer.org/");
+				LLWeb::loadURLInternal("http://support.kokuaviewer.org/");
 				return TRUE;
 			}
 			else if (LLStringUtil::compareInsensitive("/icanhasblog", cur_token) == 0)
 			{
-				LLWeb::loadURLInternal("http://www.imprudenceviewer.org/");
+				LLWeb::loadURLInternal("http://kokuaviewer.org/");
 				return TRUE;
 			}
 			else if (LLStringUtil::compareInsensitive("/icanhascodie", cur_token) == 0)
@@ -657,23 +657,23 @@ BOOL LLGestureManager::triggerAndReviseString(const std::string &utf8str, std::s
 					 LLStringUtil::compareInsensitive("/icanhasupdate", cur_token) == 0 ||
 					 LLStringUtil::compareInsensitive("/icanhasupdates", cur_token) == 0 )
 			{
-				LLWeb::loadURLInternal("http://imprudenceviewer.org/wiki/Downloads");
+				LLWeb::loadURLInternal("http://wiki.kokuaviewer.org/wiki/Imprudence:Downloads");
 				return TRUE;
 			}
 			else if (LLStringUtil::compareInsensitive("/icanhasfeatures", cur_token) == 0)
 			{
-				LLWeb::loadURLInternal("http://imprudenceviewer.org/wiki/Features");
+				LLWeb::loadURLInternal("http://wiki.kokuaviewer.org/wiki/Imprudence:Features");
 				return TRUE;
 			}
 			else if (LLStringUtil::compareInsensitive("/icanhaswiki", cur_token) == 0)
 			{
-				LLWeb::loadURLInternal("http://imprudenceviewer.org/wiki/");
+				LLWeb::loadURLInternal("http://wiki.kokuaviewer.org/wiki/");
 				return TRUE;
 			}
 			else if (LLStringUtil::compareInsensitive("/icanhasbugs", cur_token) == 0 ||
 					 LLStringUtil::compareInsensitive("/icanhasbug", cur_token) == 0 )
 			{
-				LLWeb::loadURLInternal("http://redmine.imprudenceviewer.org/");
+				LLWeb::loadURLInternal("http://redmine.kokuaviewer.org/");
 				return TRUE;
 			}
 			else if (LLStringUtil::compareInsensitive("/icanhasgit", cur_token) == 0)
@@ -691,7 +691,6 @@ BOOL LLGestureManager::triggerAndReviseString(const std::string &utf8str, std::s
 				LLWeb::loadURLInternal("http://twitter.com/ImpViewer");
 				return TRUE;
 			}
-			
 
 			else if (LLStringUtil::compareInsensitive("/icanhasimprudence", cur_token) == 0)
 			{
-- 
cgit v1.1


From c96afda71bd39e69e1b26849ac5e956d0fd97072 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Thu, 23 Jun 2011 20:47:21 -0700
Subject: Created new window for inworld dice rolling in advanced > UI. Todo:
 add button for 'rocks fall, everybody dies'

---
 linden/indra/newview/CMakeLists.txt                |   2 +
 linden/indra/newview/app_settings/settings.xml     |  38 ++++++++
 linden/indra/newview/floaterdice.cpp               | 108 +++++++++++++++++++++
 linden/indra/newview/floaterdice.h                 |  50 ++++++++++
 linden/indra/newview/llviewermenu.cpp              |  29 ++++++
 .../skins/default/xui/en-us/floater_dice.xml       |  15 +++
 .../skins/default/xui/en-us/menu_viewer.xml        |   7 +-
 7 files changed, 248 insertions(+), 1 deletion(-)
 create mode 100644 linden/indra/newview/floaterdice.cpp
 create mode 100644 linden/indra/newview/floaterdice.h
 create mode 100644 linden/indra/newview/skins/default/xui/en-us/floater_dice.xml

diff --git a/linden/indra/newview/CMakeLists.txt b/linden/indra/newview/CMakeLists.txt
index b0cb366..46da492 100644
--- a/linden/indra/newview/CMakeLists.txt
+++ b/linden/indra/newview/CMakeLists.txt
@@ -78,6 +78,7 @@ set(viewer_SOURCE_FILES
     floaterao.cpp
     floaterbusy.cpp
     floatercommandline.cpp
+    floaterdice.cpp
     floatergriddefault.cpp
     floatergridmanager.cpp
     floaterlocalassetbrowse.cpp
@@ -535,6 +536,7 @@ set(viewer_HEADER_FILES
     floaterao.h
     floaterbusy.h
     floatercommandline.h
+    floaterdice.h
     floatergriddefault.h
     floatergridmanager.h
     floaterlocalassetbrowse.h
diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index a6b782d..eb59254 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -399,6 +399,44 @@
     <key>Value</key>
     <integer>3</integer>
   </map>
+  <key>DiceLastCount</key>
+  <map>
+    <key>Comment</key>
+    <string>Last entered dice count</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>S32</string>
+    <key>Value</key>
+    <integer>1</integer>
+  </map>
+  <key>DiceLastSides</key>
+  <map>
+    <key>Comment</key>
+    <string>Last entered dice sides</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>S32</string>
+    <key>Value</key>
+    <integer>6</integer>
+  </map>
+  <key>DiceFloaterRect</key>
+  <map>
+    <key>Comment</key>
+    <string>Rectangle for dice window</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Rect</string>
+    <key>Value</key>
+    <array>
+      <integer>0</integer>
+      <integer>100</integer>
+      <integer>100</integer>
+      <integer>100</integer>
+    </array>
+  </map>
   <key>DisableInternalFlyUpAnimation</key>
   <map>
     <key>Comment</key>
diff --git a/linden/indra/newview/floaterdice.cpp b/linden/indra/newview/floaterdice.cpp
new file mode 100644
index 0000000..f16a6ca
--- /dev/null
+++ b/linden/indra/newview/floaterdice.cpp
@@ -0,0 +1,108 @@
+/**
+* @file floaterdice.cpp
+* @brief Dice window for Imprudence
+*
+* $LicenseInfo:firstyear=2009&license=viewergpl$
+*
+* Copyright (c) 2011, McCabe Maxsted
+*
+* Imprudence Viewer Source Code
+* The source code in this file ("Source Code") is provided to you
+* under the terms of the GNU General Public License, version 2.0
+* ("GPL"). Terms of the GPL can be found in doc/GPL-license.txt in
+* this distribution, or online at
+* http://secondlifegrid.net/programs/open_source/licensing/gplv2
+*
+* There are special exceptions to the terms and conditions of the GPL as
+* it is applied to this Source Code. View the full text of the exception
+* in the file doc/FLOSS-exception.txt in this software distribution, or
+* online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+*
+* By copying, modifying or distributing this software, you acknowledge
+* that you have read and understood your obligations described above,
+* and agree to abide by those obligations.
+*
+* ALL SOURCE CODE IS PROVIDED "AS IS." THE AUTHOR MAKES NO
+* WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+* COMPLETENESS OR PERFORMANCE.
+* $/LicenseInfo$
+*/
+
+#include "llviewerprecompiledheaders.h"
+
+#include "floaterdice.h"
+
+#include "llspinctrl.h"
+#include "lluictrlfactory.h"
+
+#include "llchat.h"
+#include "llchatbar.h"
+#include "llkeyboard.h"
+#include "llviewercontrol.h"
+
+
+FloaterDice::FloaterDice(const LLSD& seed) : LLFloater("Roll Dice")
+{
+	LLUICtrlFactory::getInstance()->buildFloater(this, "floater_dice.xml");
+}
+
+FloaterDice::~FloaterDice()
+{
+}
+
+BOOL FloaterDice::postBuild()
+{
+	childSetAction("btn_roll", onClickRoll, this);
+
+	return TRUE;
+}
+
+// static
+void FloaterDice::onClickRoll(void* data)
+{
+	FloaterDice* self = (FloaterDice*)data;
+	if (self)
+	{
+		S32 dice_count = (S32)(self->getChild<LLSpinCtrl>("spin_dice_count")->getValue());
+		S32 dice_sides = (S32)(self->getChild<LLSpinCtrl>("spin_dice_sides")->getValue());
+
+		if (dice_count <= 0 || dice_sides <= 3)
+		{
+			llwarns << "Invalid dice roll! Someone's trying to cheat, perhaps?" << llendl;
+			return;
+		}
+		else
+		{
+			S32 dice_total = 0;
+			std::ostringstream rolls;
+			for (S32 i = 0; i < dice_count; ++i)
+			{
+				S32 roll = ll_rand(dice_sides);
+				dice_total += roll;
+				rolls << roll;
+				if (i < dice_count - 1) rolls << ", ";
+			}
+
+			std::string roll_text = llformat("/me rolled %dd%d for a total of %d", dice_count, dice_sides, dice_total);
+			if (dice_count > 1)
+			{
+				roll_text += " (" + rolls.str() + ")";
+			}
+			gChatBar->sendChatFromViewer(roll_text, CHAT_TYPE_NORMAL, FALSE);
+		}
+	}
+}
+
+// virtual
+BOOL FloaterDice::handleKeyHere(KEY key, MASK mask)
+{
+	BOOL handled = FALSE;
+
+	if ((KEY_RETURN == key) && (mask == MASK_NONE))
+	{
+		onClickRoll(this);
+		handled = TRUE;
+	}
+
+	return handled;
+}
diff --git a/linden/indra/newview/floaterdice.h b/linden/indra/newview/floaterdice.h
new file mode 100644
index 0000000..57a664b
--- /dev/null
+++ b/linden/indra/newview/floaterdice.h
@@ -0,0 +1,50 @@
+/**
+* @file floaterdice.h
+* @brief Dice window for Imprudence
+*
+* $LicenseInfo:firstyear=2009&license=viewergpl$
+*
+* Copyright (c) 2011, McCabe Maxsted
+*
+* Imprudence Viewer Source Code
+* The source code in this file ("Source Code") is provided to you
+* under the terms of the GNU General Public License, version 2.0
+* ("GPL"). Terms of the GPL can be found in doc/GPL-license.txt in
+* this distribution, or online at
+* http://secondlifegrid.net/programs/open_source/licensing/gplv2
+*
+* There are special exceptions to the terms and conditions of the GPL as
+* it is applied to this Source Code. View the full text of the exception
+* in the file doc/FLOSS-exception.txt in this software distribution, or
+* online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+*
+* By copying, modifying or distributing this software, you acknowledge
+* that you have read and understood your obligations described above,
+* and agree to abide by those obligations.
+*
+* ALL SOURCE CODE IS PROVIDED "AS IS." THE AUTHOR MAKES NO
+* WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+* COMPLETENESS OR PERFORMANCE.
+* $/LicenseInfo$
+*/
+
+#ifndef floaterdice_h
+#define floaterdice_h
+
+#include "llfloater.h"
+
+class FloaterDice : public LLFloater, public LLFloaterSingleton<FloaterDice>
+{
+public:
+
+	FloaterDice(const LLSD& seed);
+	virtual ~FloaterDice();
+	BOOL postBuild();
+
+private:
+
+	static void onClickRoll(void* data);
+	virtual BOOL handleKeyHere(KEY key, MASK mask);
+};
+
+#endif //floaterdice_h
diff --git a/linden/indra/newview/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp
index c336c3a..a83c11b 100644
--- a/linden/indra/newview/llviewermenu.cpp
+++ b/linden/indra/newview/llviewermenu.cpp
@@ -84,6 +84,7 @@
 #include "llfirstuse.h"
 #include "llfloater.h"
 #include "floaterao.h"
+#include "floaterdice.h"
 #include "llfloaterabout.h"
 #include "llfloaterbuycurrency.h"
 #include "llfloateractivespeakers.h"
@@ -9601,6 +9602,32 @@ class LLAdvancedReloadBalance : public view_listener_t
 	}
 };
 
+
+/////////////////
+// DICE WINDOW //
+/////////////////
+
+
+class LLAdvancedToggleDice : public view_listener_t
+{
+	bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+	{
+		FloaterDice::toggleInstance();
+		return true;
+	}
+};
+
+class LLAdvancedCheckDice : public view_listener_t
+{
+	bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+	{
+		bool new_value = FloaterDice::instanceVisible();
+		std::string control_name = userdata["control"].asString();
+		gMenuHolder->findControl(control_name)->setValue(new_value);
+		return true;
+	}
+};
+
 /////////////////////
 // DUMP SELECT MGR //
 /////////////////////
@@ -11421,6 +11448,8 @@ void initialize_menus()
 	addMenu(new LLAdvancedWebBrowserTest(), "Advanced.WebBrowserTest");
 	addMenu(new LLAdvancedToggleEditableUI(), "Advanced.ToggleEditableUI");
 	addMenu(new LLAdvancedReloadBalance(), "Advanced.ReloadBalance");
+	addMenu(new LLAdvancedToggleDice(), "Advanced.ToggleDice");
+	addMenu(new LLAdvancedCheckDice(), "Advanced.CheckDice");
 	//addMenu(new LLAdvancedCheckEditableUI(), "Advanced.CheckEditableUI");
 	addMenu(new LLAdvancedDumpSelectMgr(), "Advanced.DumpSelectMgr");
 	addMenu(new LLAdvancedDumpInventory(), "Advanced.DumpInventory");
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_dice.xml b/linden/indra/newview/skins/default/xui/en-us/floater_dice.xml
new file mode 100644
index 0000000..4a70c1c
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_dice.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater bottom="-95" can_close="true" can_drag_on_left="false" can_minimize="true"
+     can_resize="false" follows="left|top" mouse_opaque="true" height="95" width="200"
+     name="Roll Dice" title="Roll Dice" rect_control="DiceFloaterRect">
+  <spinner bottom="-37" decimal_digits="0" follows="left|top" height="16"
+       increment="1" initial_val="1" label="Number of dice:" label_width="120" left="10"
+       max_val="512" min_val="1" mouse_opaque="true" name="spin_dice_count"
+       width="170" control_name="DiceLastCount" />
+  <spinner bottom_delta="-25" decimal_digits="0" follows="left|top" height="16"
+       increment="1" initial_val="6" label="Number of sides:" label_width="120" left="10"
+       max_val="512" min_val="4" mouse_opaque="true" name="spin_dice_sides"
+       width="170" control_name="DiceLastSides" />
+  <button bottom_delta="-30" follows="right|top" font="SansSerif" halign="center" height="22"
+       label="Roll" left="-85" mouse_opaque="true" name="btn_roll" width="80" />
+</floater>
\ No newline at end of file
diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
index df1cdf2..efde449 100644
--- a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
@@ -1609,10 +1609,15 @@
         <on_check control="ShowSearchBar" />
       </menu_item_check>
 
-	<menu_item_call name="Reload Balance" label="Reload [CURRENCY] balance" shortcut="control|alt|B">
+	    <menu_item_call name="Reload Balance" label="Reload [CURRENCY] balance" shortcut="control|alt|B">
         <on_click function="Advanced.ReloadBalance" userdata="" />
       </menu_item_call>
 
+      <menu_item_check name="Roll Dice"
+                       label="Roll Dice">
+        <on_click function="Advanced.ToggleDice" userdata="" />
+        <on_check function="Advanced.CheckDice" userdata="" />
+      </menu_item_check>
 
       <menu_item_separator />
 
-- 
cgit v1.1


From 5cf5dc73eadaa6ba1ebc92aa67c622e600926f24 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Fri, 24 Jun 2011 17:53:33 -0700
Subject: Tiny bit of coding standards changes for llaudioengine_openal and
 moved audio engine cleanup later during shutdown to prevent conflicts

---
 linden/indra/llaudio/llaudioengine_openal.cpp | 43 +++++++++++--------
 linden/indra/llaudio/llaudioengine_openal.h   |  6 +--
 linden/indra/newview/llappviewer.cpp          | 59 ++++++++++++++-------------
 3 files changed, 59 insertions(+), 49 deletions(-)

diff --git a/linden/indra/llaudio/llaudioengine_openal.cpp b/linden/indra/llaudio/llaudioengine_openal.cpp
index 08ec464..90dffc6 100644
--- a/linden/indra/llaudio/llaudioengine_openal.cpp
+++ b/linden/indra/llaudio/llaudioengine_openal.cpp
@@ -38,7 +38,7 @@
 #include "lllistener_openal.h"
 
 
-static const float WIND_BUFFER_SIZE_SEC = 0.05f; // 1/20th sec
+static const F32 WIND_BUFFER_SIZE_SEC = 0.05f; // 1/20th sec
 
 std::string convertALErrorToString(ALenum error)
 {
@@ -94,7 +94,7 @@ bool LLAudioEngine_OpenAL::init(const S32 num_channels, void* userdata)
 	mWindGen = NULL;
 	LLAudioEngine::init(num_channels, userdata);
 
-	if(!alutInit(NULL, NULL))
+	if (!alutInit(NULL, NULL))
 	{
 		llwarns << "LLAudioEngine_OpenAL::init() ALUT initialization failed: " << alutGetErrorString (alutGetError ()) << llendl;
 		return false;
@@ -230,7 +230,7 @@ std::string LLAudioEngine_OpenAL::getDriverName(bool verbose)
 void LLAudioEngine_OpenAL::allocateListener()
 {
 	mListenerp = (LLListener *) new LLListener_OpenAL();
-	if(!mListenerp)
+	if (!mListenerp)
 	{
 		llwarns << "LLAudioEngine_OpenAL::allocateListener() Listener creation failed" << llendl;
 	}
@@ -239,18 +239,19 @@ void LLAudioEngine_OpenAL::allocateListener()
 // virtual
 void LLAudioEngine_OpenAL::shutdown()
 {
-	llinfos << "About to LLAudioEngine::shutdown()" << llendl;
+	llinfos << "Entering LLAudioEngine::shutdown()" << llendl;
 
 	LLAudioEngine::shutdown();
 
-	llinfos << "About to alutExit()" << llendl;
-	if(!alutExit())
+	llinfos << "Entering alutExit()" << llendl;
+	if (!alutExit())
 	{
-		llwarns << "Nuts." << llendl;
 		llwarns << "LLAudioEngine_OpenAL::shutdown() ALUT shutdown failed: " << alutGetErrorString(alutGetError()) << llendl;
 	}
-
-	llinfos << "LLAudioEngine_OpenAL::shutdown() OpenAL successfully shut down" << llendl;
+	else
+	{
+		llinfos << "LLAudioEngine_OpenAL::shutdown() OpenAL successfully shut down" << llendl;
+	}
 
 	delete mListenerp;
 	mListenerp = NULL;
@@ -270,6 +271,10 @@ void LLAudioEngine_OpenAL::shutdown()
 	{
 		llinfos << "AL error: " << convertALErrorToString(error) << ". Could not destroy context!" << llendl;
 	}
+	else
+	{
+		mContext = NULL;
+	}
 
     alcCloseDevice(mDevice);
 	error = alGetError();
@@ -277,6 +282,10 @@ void LLAudioEngine_OpenAL::shutdown()
 	{
 		llinfos << "AL error: " << convertALErrorToString(error) << ". Could not close device!" << llendl;
 	}
+	else
+	{
+		mDevice = NULL;
+	}
 }
 
 LLAudioBuffer *LLAudioEngine_OpenAL::createBuffer()
@@ -306,7 +315,7 @@ LLAudioChannelOpenAL::LLAudioChannelOpenAL()
 LLAudioChannelOpenAL::~LLAudioChannelOpenAL()
 {
 	cleanup();
-	if (mALSource != AL_NONE) //MC
+	if (mALSource != AL_NONE)
 	{
 		alDeleteSources(1, &mALSource);
 		mALSource = AL_NONE;
@@ -327,7 +336,7 @@ void LLAudioChannelOpenAL::play()
 		return;
 	}
 
-	if(!isPlaying())
+	if (!isPlaying())
 	{
 		alSourcePlay(mALSource);
 		getSource()->setPlayedOnce(true);
@@ -453,7 +462,7 @@ LLAudioBufferOpenAL::~LLAudioBufferOpenAL()
 
 void LLAudioBufferOpenAL::cleanup()
 {
-	if(mALBuffer != AL_NONE)
+	if (mALBuffer != AL_NONE)
 	{
 		alDeleteBuffers(1, &mALBuffer);
 		mALBuffer = AL_NONE;
@@ -464,7 +473,7 @@ bool LLAudioBufferOpenAL::loadWAV(const std::string& filename)
 {
 	cleanup();
 	mALBuffer = alutCreateBufferFromFile(filename.c_str());
-	if(mALBuffer == AL_NONE)
+	if (mALBuffer == AL_NONE)
 	{
 		ALenum error = alutGetError(); 
 		if (gDirUtilp->fileExists(filename))
@@ -492,7 +501,7 @@ bool LLAudioBufferOpenAL::loadWAV(const std::string& filename)
 
 U32 LLAudioBufferOpenAL::getLength()
 {
-	if(mALBuffer == AL_NONE)
+	if (mALBuffer == AL_NONE)
 	{
 		return 0;
 	}
@@ -514,7 +523,7 @@ void LLAudioEngine_OpenAL::initWind()
 	
 	alGenSources(1,&mWindSource);
 	
-	if((error=alGetError()) != AL_NO_ERROR)
+	if ((error=alGetError()) != AL_NO_ERROR)
 	{
 		llwarns << "LLAudioEngine_OpenAL::initWind() Error creating wind sources: " << convertALErrorToString(error) << llendl;
 	}
@@ -527,7 +536,7 @@ void LLAudioEngine_OpenAL::initWind()
 
 	mWindBuf = new WIND_SAMPLE_T [mWindBufSamples * 2 /*stereo*/];
 
-	if(mWindBuf==NULL)
+	if (mWindBuf == NULL)
 	{
 		llerrs << "LLAudioEngine_OpenAL::initWind() Error creating wind memory buffer" << llendl;
 		mEnableWind=false;
@@ -576,7 +585,7 @@ void LLAudioEngine_OpenAL::updateWind(LLVector3 wind_vec, F32 camera_altitude)
 	if (!mEnableWind)
 		return;
 	
-	if(!mWindBuf)
+	if (!mWindBuf)
 		return;
 	
 	if (mWindUpdateTimer.checkExpirationAndReset(LL_WIND_UPDATE_INTERVAL))
diff --git a/linden/indra/llaudio/llaudioengine_openal.h b/linden/indra/llaudio/llaudioengine_openal.h
index df32e13..47748c3 100644
--- a/linden/indra/llaudio/llaudioengine_openal.h
+++ b/linden/indra/llaudio/llaudioengine_openal.h
@@ -70,9 +70,9 @@ class LLAudioEngine_OpenAL : public LLAudioEngine
     	U32 mWindBufSamples;
     	U32 mWindBufBytes;
     	ALuint mWindSource;
-        int mNumEmptyWindALBuffers;
+        S32 mNumEmptyWindALBuffers;
 
-    	static const int MAX_NUM_WIND_BUFFERS = 80;
+    	static const S32 MAX_NUM_WIND_BUFFERS = 80;
 
 		ALCcontext* mContext;
 		ALCdevice* mDevice;
@@ -109,7 +109,7 @@ class LLAudioBufferOpenAL : public LLAudioBuffer
 		friend class LLAudioChannelOpenAL;
 	protected:
 		void cleanup();
-		ALuint getBuffer() {return mALBuffer;}
+		ALuint getBuffer() { return mALBuffer; }
 
 		ALuint mALBuffer;
 };
diff --git a/linden/indra/newview/llappviewer.cpp b/linden/indra/newview/llappviewer.cpp
index aeb52a2..c9ab291 100644
--- a/linden/indra/newview/llappviewer.cpp
+++ b/linden/indra/newview/llappviewer.cpp
@@ -1284,35 +1284,6 @@ bool LLAppViewer::cleanup()
 	
 	llinfos << "Global stuff deleted" << llendflush;
 
-	if (gAudioStream)
-	{
-		// shut down the streaming audio sub-subsystem first, in case it relies on not outliving the general audio subsystem.
-
-		delete gAudioStream;
- 		gAudioStream = NULL;
-	}
-
-	if (gAudiop)
-	{
-		// shut down the audio subsystem
-
-		bool want_longname = false;
-		if (gAudiop->getDriverName(want_longname) == "FMOD")
-		{
-			// This hack exists because fmod likes to occasionally
-			// crash or hang forever when shutting down, for no
-			// apparent reason.
-			llwarns << "Hack, skipping FMOD audio engine cleanup" << llendflush;
-		}
-		else
-		{
-			gAudiop->shutdown();
-		}
-
-		delete gAudiop;
-		gAudiop = NULL;
-	}
-
 	// Note: this is where LLFeatureManager::getInstance()-> used to be deleted.
 
 	// Patch up settings for next time
@@ -1548,6 +1519,36 @@ bool LLAppViewer::cleanup()
 	end_messaging_system();
 	llinfos << "Message system deleted." << llendflush;
 
+	if (gAudioStream)
+	{
+		// shut down the streaming audio sub-subsystem first, in case it relies on not outliving the general audio subsystem.
+
+		delete gAudioStream;
+ 		gAudioStream = NULL;
+	}
+
+	if (gAudiop)
+	{
+		// shut down the audio subsystem
+
+		bool want_longname = false;
+		if (gAudiop->getDriverName(want_longname) == "FMOD")
+		{
+			// This hack exists because fmod likes to occasionally
+			// crash or hang forever when shutting down, for no
+			// apparent reason.
+			llwarns << "Hack, skipping FMOD audio engine cleanup" << llendflush;
+		}
+		else
+		{
+			gAudiop->shutdown();
+		}
+
+		delete gAudiop;
+		gAudiop = NULL;
+	}
+	llinfos << "Audio system deleted" << llendl;
+
 	// *NOTE:Mani - The following call is not thread safe. 
 	LLCurl::cleanupClass();
 	llinfos << "LLCurl cleaned up." << llendflush;
-- 
cgit v1.1


From 1eecd2825591240df523f25dbd8e869b99dc89c7 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Fri, 24 Jun 2011 19:54:17 -0700
Subject: Updated the windows version of openal-soft to 1.13

---
 linden/indra/cmake/OPENAL.cmake | 4 ++--
 linden/install.xml              | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/linden/indra/cmake/OPENAL.cmake b/linden/indra/cmake/OPENAL.cmake
index b9efd57..944bc7e 100644
--- a/linden/indra/cmake/OPENAL.cmake
+++ b/linden/indra/cmake/OPENAL.cmake
@@ -25,8 +25,8 @@ elseif (OPENAL)
   
   if (WINDOWS)
     set(OPENAL_LIB
-	  optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libOpenAL32.dll.a.lib
-	  debug ${ARCH_PREBUILT_DIRS_DEBUG}/libOpenAL32.dll.a.lib
+	  optimized ${ARCH_PREBUILT_DIRS_RELEASE}/openal32.lib
+	  debug ${ARCH_PREBUILT_DIRS_DEBUG}/openal32.lib
       )
   
   elseif (DARWIN)
diff --git a/linden/install.xml b/linden/install.xml
index 10226e9..f757d80 100755
--- a/linden/install.xml
+++ b/linden/install.xml
@@ -1232,9 +1232,9 @@ Copyright (C) 2004-2005 Vladimir Berezniker @ http://public.xdi.org/=vmpn
           <key>windows</key>
           <map>
             <key>md5sum</key>
-            <string>79bb92dcc79e310ff9aebf7fbe6b10e5</string>
+            <string>8ded552db94e06574db77a83ff672420</string>
             <key>url</key>
-            <uri>http://imprudenceviewer.org/download/libs/openal-soft-1.12.854-windows-20100822.tar.bz2</uri>
+            <uri>http://download.kokuaviewer.org/files/libs/openal-soft-1.13-windows-20110624.tar.bz2</uri>
           </map>
         </map>
       </map>
-- 
cgit v1.1


From 8eb1ead62d856cae04d69ca09affe17c470eb45f Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Fri, 24 Jun 2011 21:54:25 -0700
Subject: Fixed windows installer files missing from the repo and added the
 VS2010 redist (needed for the new openal libs and upcoming VS2010 support)

---
 .gitignore                                         |   1 -
 .../indra/newview/installers/windows/imp_icon.ico  | Bin 0 -> 533678 bytes
 .../windows/imprudence_installer_icon_left.bmp     | Bin 0 -> 154542 bytes
 .../windows/imprudence_installer_icon_right.bmp    | Bin 0 -> 8534 bytes
 .../windows/imprudence_installer_script.iss        |  45 ++++++++++++++++++---
 .../installers/windows/vcredist_x86_VS2005_SP1.exe | Bin 0 -> 2686232 bytes
 .../installers/windows/vcredist_x86_VS2010_SP1.exe | Bin 0 -> 4995416 bytes
 7 files changed, 40 insertions(+), 6 deletions(-)
 create mode 100644 linden/indra/newview/installers/windows/imp_icon.ico
 create mode 100644 linden/indra/newview/installers/windows/imprudence_installer_icon_left.bmp
 create mode 100644 linden/indra/newview/installers/windows/imprudence_installer_icon_right.bmp
 create mode 100644 linden/indra/newview/installers/windows/vcredist_x86_VS2005_SP1.exe
 create mode 100644 linden/indra/newview/installers/windows/vcredist_x86_VS2010_SP1.exe

diff --git a/.gitignore b/.gitignore
index aaa6740..719ba6a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,7 +24,6 @@ linden/indra/newview/app_settings/*.db2
 linden/indra/newview/app_settings/windlight/
 linden/indra/newview/cursors_mac/
 linden/indra/newview/viewer.icns
-linden/indra/newview/installers/windows/*
 
 # LIBRARIES
 
diff --git a/linden/indra/newview/installers/windows/imp_icon.ico b/linden/indra/newview/installers/windows/imp_icon.ico
new file mode 100644
index 0000000..3b1250a
Binary files /dev/null and b/linden/indra/newview/installers/windows/imp_icon.ico differ
diff --git a/linden/indra/newview/installers/windows/imprudence_installer_icon_left.bmp b/linden/indra/newview/installers/windows/imprudence_installer_icon_left.bmp
new file mode 100644
index 0000000..79fd407
Binary files /dev/null and b/linden/indra/newview/installers/windows/imprudence_installer_icon_left.bmp differ
diff --git a/linden/indra/newview/installers/windows/imprudence_installer_icon_right.bmp b/linden/indra/newview/installers/windows/imprudence_installer_icon_right.bmp
new file mode 100644
index 0000000..1c1d5dc
Binary files /dev/null and b/linden/indra/newview/installers/windows/imprudence_installer_icon_right.bmp differ
diff --git a/linden/indra/newview/installers/windows/imprudence_installer_script.iss b/linden/indra/newview/installers/windows/imprudence_installer_script.iss
index 3282c48..c23fbf4 100644
--- a/linden/indra/newview/installers/windows/imprudence_installer_script.iss
+++ b/linden/indra/newview/installers/windows/imprudence_installer_script.iss
@@ -17,15 +17,14 @@ OutputBaseFilename=Imprudence-1.4.0-beta1-(SSE2-optimized)
 VersionInfoVersion=1.4.0
 VersionInfoTextVersion=1.4.0
 VersionInfoProductVersion=1.4.0
+AppVersion=1.4.0
 VersionInfoCopyright=2011
-AppCopyright=2011
 
 ; These won't change
 VersionInfoCompany=Imprudence
 AppPublisher=The Imprudence Project
 AppPublisherURL=http://kokuaviewer.org
 AppSupportURL=http://kokuaviewer.org
-AppUpdatesURL=http://kokuaviewer.org
 AllowNoIcons=true
 InfoAfterFile=..\..\..\..\..\README.txt
 OutputDir=C:\imprudence_installers
@@ -38,6 +37,8 @@ AllowRootDirectory=true
 WizardImageFile=..\windows\imprudence_installer_icon_left.bmp
 WizardSmallImageFile=..\windows\imprudence_installer_icon_right.bmp
 SetupLogging=true
+RestartIfNeededByRun=false
+AlwaysRestart=false
 
 [Languages]
 Name: english; MessagesFile: compiler:Default.isl
@@ -141,8 +142,10 @@ Source: ..\..\..\build-vc80\newview\release\package\SLVoice.exe; DestDir: {app};
 Source: ..\..\..\build-vc80\newview\release\package\vivoxsdk.dll; DestDir: {app}; Flags: ignoreversion
 Source: ..\..\..\build-vc80\newview\release\package\wrap_oal.dll; DestDir: {app}; Flags: ignoreversion
 
-; VC++ 2005 x86 redist
-Source: ..\windows\vcredist_x86_VS2005.exe; DestDir: {tmp}; DestName: vcredist_x86_2005.exe
+; VC++ 2005 SP1 x86 and VC++ 2010 SP1 x86 redist
+; TODO: add checking for VS2005. See http://blogs.msdn.com/b/astebner/archive/2007/01/16/mailbag-how-to-detect-the-presence-of-the-vc-8-0-runtime-redistributable-package.aspx and
+Source: ..\windows\vcredist_x86_VS2005_SP1.exe; DestDir: {tmp}; DestName: vcredist_x86_VS2005_SP1.exe
+Source: ..\windows\vcredist_x86_VS2010_SP1.exe; DestDir: {tmp}; DestName: vcredist_x86_VS2010_SP1.exe
 
 ; Old files we don't use anymore:
 ; Source: ..\..\..\build-vc80\newview\release\package\dronesettings.xml; DestDir: {app}; Flags: ignoreversion
@@ -173,7 +176,8 @@ Name: {group}\Imprudence; Filename: {app}\imprudence.exe; WorkingDir: {app}; Com
 [Run]
 Filename: {app}\imprudence.exe; WorkingDir: {app}; Flags: nowait postinstall
 Filename: {app}\imprudence.url; WorkingDir: {app}; Flags: nowait postinstall shellexec; Description: See what makes Imprudence different
-Filename: {tmp}\vcredist_x86_2005.exe; Parameters: "/q:a /c:""VCREDI~1.EXE /q:a /c:""""msiexec /i vcredist.msi /qn"""" """; Flags: runhidden
+Filename: {tmp}\vcredist_x86_VS2005_SP1.exe; Parameters: "/q:a /c:""VCREDI~1.EXE /q:a /c:""""msiexec /i vcredist.msi /qn"""" """; Flags: runhidden
+Filename: {tmp}\vcredist_x86_VS2010_SP1.exe; Parameters: "/q /norestart"; Check: Needs2010Redist; Flags: runhidden
 
 [UninstallDelete]
 Name: {userappdata}\Imprudence\user_settings\password.dat; Type: files; Languages: 
@@ -270,3 +274,34 @@ Name: {app}\msvcp80.dll; Type: files; Tasks: ; Languages:
 Name: {app}\msvcr80.dll; Type: files; Tasks: ; Languages:
 Name: {app}\msvcr71.dll; Type: files; Tasks: ; Languages:
 Name: {app}\imprudence.exe.config; Type: files; Tasks: ; Languages:
+
+
+[Code]
+// [HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\VisualStudio\10.0\VC\VCRedist\x86] 
+//   Installed = 1 (REG_DWORD)
+function IsVS2010RedistInstalled(): Boolean;
+var
+  V: Cardinal;
+  Success: Boolean;
+begin
+  if IsWin64 then begin
+    Success := RegQueryDWordValue(HKLM64, 'SOFTWARE\Microsoft\VisualStudio\10.0\VC\VCRedist\x86', 'Installed', V);
+  end else begin
+    Success := RegQueryDWordValue(HKLM, 'SOFTWARE\Microsoft\VisualStudio\10.0\VC\VCRedist\x86', 'Installed', V);
+  end
+
+  if Success = TRUE then begin
+    if V = 1 then begin
+      Result := TRUE;
+    end else begin
+      Result := FALSE;
+    end
+  end else begin
+    Result := FALSE;
+  end
+end;
+
+function Needs2010Redist(): Boolean;
+begin
+  Result := (IsVS2010RedistInstalled = FALSE);
+end;
diff --git a/linden/indra/newview/installers/windows/vcredist_x86_VS2005_SP1.exe b/linden/indra/newview/installers/windows/vcredist_x86_VS2005_SP1.exe
new file mode 100644
index 0000000..1421c29
Binary files /dev/null and b/linden/indra/newview/installers/windows/vcredist_x86_VS2005_SP1.exe differ
diff --git a/linden/indra/newview/installers/windows/vcredist_x86_VS2010_SP1.exe b/linden/indra/newview/installers/windows/vcredist_x86_VS2010_SP1.exe
new file mode 100644
index 0000000..d81f3f5
Binary files /dev/null and b/linden/indra/newview/installers/windows/vcredist_x86_VS2010_SP1.exe differ
-- 
cgit v1.1


From f5f7f67bdd4df81b1c04ab29e98008bb4d9a6d2b Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Sat, 25 Jun 2011 18:03:47 -0700
Subject: Removed some unused code from the media tab panel and fixed the '?'
 button in about land > audio

---
 linden/indra/newview/llpanellandaudio.cpp | 17 ++++++++++++++++-
 linden/indra/newview/llpanellandaudio.h   |  3 ++-
 linden/indra/newview/llpanellandmedia.cpp | 30 ------------------------------
 linden/indra/newview/llpanellandmedia.h   |  4 ----
 4 files changed, 18 insertions(+), 36 deletions(-)

diff --git a/linden/indra/newview/llpanellandaudio.cpp b/linden/indra/newview/llpanellandaudio.cpp
index 8d902b6..c7543a0 100644
--- a/linden/indra/newview/llpanellandaudio.cpp
+++ b/linden/indra/newview/llpanellandaudio.cpp
@@ -69,7 +69,12 @@ enum
 //---------------------------------------------------------------------------
 
 LLPanelLandAudio::LLPanelLandAudio(LLParcelSelectionHandle& parcel)
-:	LLPanel(std::string("land_media_panel")), mParcel(parcel)
+:	LLPanel(std::string("land_media_panel")), 
+	mParcel(parcel),
+	mCheckSoundLocal(NULL),
+	mSoundHelpButton(NULL),
+	mRadioVoiceChat(NULL),
+	mMusicURLEdit(NULL)
 {
 }
 
@@ -82,6 +87,9 @@ LLPanelLandAudio::~LLPanelLandAudio()
 
 BOOL LLPanelLandAudio::postBuild()
 {
+	mSoundHelpButton = getChild<LLButton>("?");
+	mSoundHelpButton->setClickedCallback(onClickSoundHelp, this);
+
 	mCheckSoundLocal = getChild<LLCheckBoxCtrl>("check_sound_local");
 	childSetCommitCallback("check_sound_local", onCommitAny, this);
 
@@ -185,3 +193,10 @@ void LLPanelLandAudio::onCommitAny(LLUICtrl*, void *userdata)
 	// Might have changed properties, so let's redraw!
 	self->refresh();
 }
+
+
+// static
+void LLPanelLandAudio::onClickSoundHelp(void*)
+{
+	LLNotifications::instance().add("ClickSoundHelpLand");
+}
diff --git a/linden/indra/newview/llpanellandaudio.h b/linden/indra/newview/llpanellandaudio.h
index 82e27f6..b443beb 100644
--- a/linden/indra/newview/llpanellandaudio.h
+++ b/linden/indra/newview/llpanellandaudio.h
@@ -50,11 +50,12 @@ public:
 
 private:
 	static void onCommitAny(LLUICtrl* ctrl, void *userdata);
+	static void onClickSoundHelp(void*);
 
-private:
 	LLCheckBoxCtrl* mCheckSoundLocal;
 	LLRadioGroup*	mRadioVoiceChat;
 	LLLineEditor*	mMusicURLEdit;
+	LLButton*       mSoundHelpButton;
 
 	LLSafeHandle<LLParcelSelection>&	mParcel;
 };
diff --git a/linden/indra/newview/llpanellandmedia.cpp b/linden/indra/newview/llpanellandmedia.cpp
index 8a0be86..dba7883 100644
--- a/linden/indra/newview/llpanellandmedia.cpp
+++ b/linden/indra/newview/llpanellandmedia.cpp
@@ -65,12 +65,9 @@ LLPanelLandMedia::LLPanelLandMedia(LLParcelSelectionHandle& parcel)
 :	LLPanel(std::string("land_media_panel")),
 
 	mParcel(parcel),
-	mCheckSoundLocal(NULL),
-	mSoundHelpButton(NULL),
 	mCheckEnableVoiceChat(NULL),
 	mCheckEnableVoiceChatIsEstateDisabled(NULL),
 	mCheckEnableVoiceChatParcel(NULL),
-	mMusicURLEdit(NULL),
 	mMediaURLEdit(NULL),
 	mMediaDescEdit(NULL),
 	mMediaTypeCombo(NULL),
@@ -92,21 +89,8 @@ LLPanelLandMedia::~LLPanelLandMedia()
 }
 
 
-// static
-void LLPanelLandMedia::onClickSoundHelp(void*)
-{
-	LLNotifications::instance().add("ClickSoundHelpLand");
-}
-
-
 BOOL LLPanelLandMedia::postBuild()
 {
-	mCheckSoundLocal = getChild<LLCheckBoxCtrl>("check sound local");
-	childSetCommitCallback("check sound local", onCommitAny, this);
-
-	mSoundHelpButton = getChild<LLButton>("?");
-	mSoundHelpButton->setClickedCallback(onClickSoundHelp, this);
-
 	mCheckEnableVoiceChat = getChild<LLCheckBoxCtrl>("parcel_enable_voice_channel");
 	childSetCommitCallback("parcel_enable_voice_channel", onCommitAny, this);
 	mCheckEnableVoiceChatIsEstateDisabled = getChild<LLCheckBoxCtrl>("parcel_enable_voice_channel_is_estate_disabled");
@@ -114,9 +98,6 @@ BOOL LLPanelLandMedia::postBuild()
 	mCheckEnableVoiceChatParcel = getChild<LLCheckBoxCtrl>("parcel_enable_voice_channel_parcel");
 	childSetCommitCallback("parcel_enable_voice_channel_parcel", onCommitAny, this);
 
-	mMusicURLEdit = getChild<LLLineEditor>("music_url");
-	childSetCommitCallback("music_url", onCommitAny, this);
-
 	mMediaTextureCtrl = getChild<LLTextureCtrl>("media texture");
 	mMediaTextureCtrl->setCommitCallback( onCommitAny );
 	mMediaTextureCtrl->setCallbackUserData( this );
@@ -169,9 +150,6 @@ void LLPanelLandMedia::refresh()
 		// Display options
 		BOOL can_change_media = LLViewerParcelMgr::isParcelModifiableByAgent(parcel, GP_LAND_CHANGE_MEDIA);
 
-		mCheckSoundLocal->set( parcel->getSoundLocal() );
-		mCheckSoundLocal->setEnabled( can_change_media );
-
 		LLViewerRegion* region = LLViewerParcelMgr::getInstance()->getSelectionRegion();
 		if (!region)
 		{
@@ -217,9 +195,6 @@ void LLPanelLandMedia::refresh()
 
 		mCheckEnableVoiceChatParcel->set(!parcel->getParcelFlagUseEstateVoiceChannel());
 
-		mMusicURLEdit->setText(parcel->getMusicURL());
-		mMusicURLEdit->setEnabled( can_change_media );
-
 		mMediaURLEdit->setText(parcel->getMediaURL());
 		mMediaURLEdit->setEnabled( FALSE );
 
@@ -374,8 +349,6 @@ void LLPanelLandMedia::onCommitAny(LLUICtrl*, void *userdata)
 	}
 
 	// Extract data from UI
-	BOOL sound_local		= self->mCheckSoundLocal->get();
-	std::string music_url	= self->mMusicURLEdit->getText();
 	std::string media_url	= self->mMediaURLEdit->getText();
 	std::string media_desc	= self->mMediaDescEdit->getText();
 	std::string mime_type	= self->childGetText("mime_type");
@@ -391,14 +364,11 @@ void LLPanelLandMedia::onCommitAny(LLUICtrl*, void *userdata)
 	self->childSetText("mime_type", mime_type);
 
 	// Remove leading/trailing whitespace (common when copying/pasting)
-	LLStringUtil::trim(music_url);
 	LLStringUtil::trim(media_url);
 
 	// Push data into current parcel
 	parcel->setParcelFlag(PF_ALLOW_VOICE_CHAT, voice_enabled);
 	parcel->setParcelFlag(PF_USE_ESTATE_VOICE_CHAN, voice_estate_chan);
-	parcel->setParcelFlag(PF_SOUND_LOCAL, sound_local);
-	parcel->setMusicURL(music_url);
 	parcel->setMediaURL(media_url);
 	parcel->setMediaType(mime_type);
 	parcel->setMediaDesc(media_desc);
diff --git a/linden/indra/newview/llpanellandmedia.h b/linden/indra/newview/llpanellandmedia.h
index 845b953..fda99bd 100644
--- a/linden/indra/newview/llpanellandmedia.h
+++ b/linden/indra/newview/llpanellandmedia.h
@@ -56,15 +56,11 @@ private:
 	static void onCommitAny(LLUICtrl* ctrl, void *userdata);
 	static void onCommitType(LLUICtrl* ctrl, void *userdata);
 	static void onSetBtn(void* userdata);
-	static void onClickSoundHelp(void*);
 
 private:
-	LLCheckBoxCtrl* mCheckSoundLocal;
-	LLButton*       mSoundHelpButton;
 	LLCheckBoxCtrl*	mCheckEnableVoiceChat;
 	LLCheckBoxCtrl*	mCheckEnableVoiceChatIsEstateDisabled;
 	LLCheckBoxCtrl*	mCheckEnableVoiceChatParcel;
-	LLLineEditor*	mMusicURLEdit;
 	LLLineEditor*	mMediaURLEdit;
 	LLLineEditor*	mMediaDescEdit;
 	LLComboBox*		mMediaTypeCombo;
-- 
cgit v1.1


From d5bd612e099d9501d2a679900aec573ed90655a1 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Mon, 27 Jun 2011 16:30:46 -0700
Subject: Fixed llinfos comment in llaudioengine_openal.cpp: updatewind, not
 initwind

---
 linden/indra/llaudio/llaudioengine_openal.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/linden/indra/llaudio/llaudioengine_openal.cpp b/linden/indra/llaudio/llaudioengine_openal.cpp
index 90dffc6..720fb7f 100644
--- a/linden/indra/llaudio/llaudioengine_openal.cpp
+++ b/linden/indra/llaudio/llaudioengine_openal.cpp
@@ -650,7 +650,7 @@ void LLAudioEngine_OpenAL::updateWind(LLVector3 wind_vec, F32 camera_altitude)
 		alGenBuffers(1,&buffer);
 		if ((error=alGetError()) != AL_NO_ERROR)
 		{
-			llwarns << "LLAudioEngine_OpenAL::initWind() Error creating wind buffer: " << convertALErrorToString(error) << llendl;
+			llwarns << "LLAudioEngine_OpenAL::updateWind() Error creating wind buffer: " << convertALErrorToString(error) << llendl;
 			break;
 		}
 
-- 
cgit v1.1


From dcb2432d7d7283b93f79f457637469f52a87268f Mon Sep 17 00:00:00 2001
From: Nicky Perian
Date: Thu, 23 Jun 2011 21:44:21 -0500
Subject: Code from Singularity Viewer. Original author Shyotl. Place machine
 SSE status and viewer compiled status in Help->About Imprudence Floater.

Signed-off-by: Nicky Perian <nickyperian@yahoo.com>
---
 linden/indra/newview/llfloaterabout.cpp | 23 ++++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/linden/indra/newview/llfloaterabout.cpp b/linden/indra/newview/llfloaterabout.cpp
index 8878de5..13795e5 100644
--- a/linden/indra/newview/llfloaterabout.cpp
+++ b/linden/indra/newview/llfloaterabout.cpp
@@ -190,7 +190,14 @@ LLFloaterAbout::LLFloaterAbout()
 	support.append("CPU: ");
 	support.append( gSysCPU.getCPUString() );
 	support.append("\n");
-
+	
+	support.append("SSE Support:");
+	if(gSysCPU.hasSSE())
+		support.append(" SSE2\n");
+	else if(gSysCPU.hasSSE())
+		support.append(" SSE\n");
+	else
+		support.append(" None\n");
 	U32 memory = gSysMemory.getPhysicalMemoryKB() / 1024;
 	// Moved hack adjustment to Windows memory size into llsys.cpp
 
@@ -225,9 +232,19 @@ LLFloaterAbout::LLFloaterAbout()
 
 	support.append("OpenGL Version: ");
 	support.append( (const char*) glGetString(GL_VERSION) );
-	support.append("\n");
+	support.append("\n\n");
+
+	support.append("Viewer SSE Version: ");
+#if _M_IX86_FP > 0 //Windows
+	support.append(llformat("SSE%i\n", _M_IX86_FP ));
+#elif defined(__SSE2__) //GCC
+	support.append("SSE2\n");	
+#elif defined(__SSE__) //GCC
+	support.append("SSE\n");
+#else
+	support.append("None\n");
+#endif
 
-	support.append("\n");
 
 	support.append("libcurl Version: ");
 	support.append( LLCurl::getVersionString() );
-- 
cgit v1.1


From f1b743e15a0f694fd800d2622b15d5285db8355c Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Thu, 30 Jun 2011 20:17:05 -0700
Subject: Fixed dice rolling to use the right range

---
 linden/indra/newview/floaterdice.cpp | 32 ++++++++++++--------------------
 linden/indra/newview/floaterdice.h   |  1 -
 2 files changed, 12 insertions(+), 21 deletions(-)

diff --git a/linden/indra/newview/floaterdice.cpp b/linden/indra/newview/floaterdice.cpp
index f16a6ca..203878c 100644
--- a/linden/indra/newview/floaterdice.cpp
+++ b/linden/indra/newview/floaterdice.cpp
@@ -37,7 +37,6 @@
 
 #include "llchat.h"
 #include "llchatbar.h"
-#include "llkeyboard.h"
 #include "llviewercontrol.h"
 
 
@@ -75,13 +74,20 @@ void FloaterDice::onClickRoll(void* data)
 		{
 			S32 dice_total = 0;
 			std::ostringstream rolls;
-			for (S32 i = 0; i < dice_count; ++i)
+			S32 i = 0;
+			do
 			{
-				S32 roll = ll_rand(dice_sides);
-				dice_total += roll;
-				rolls << roll;
-				if (i < dice_count - 1) rolls << ", ";
+				// see the clamping rules for ll_rand
+				S32 roll = ll_rand(dice_sides+1);
+				if (roll > 0)
+				{
+					dice_total += roll;
+					rolls << roll;
+					if (i < dice_count - 1) rolls << ", ";
+					++i;
+				}
 			}
+			while (i < dice_count);
 
 			std::string roll_text = llformat("/me rolled %dd%d for a total of %d", dice_count, dice_sides, dice_total);
 			if (dice_count > 1)
@@ -92,17 +98,3 @@ void FloaterDice::onClickRoll(void* data)
 		}
 	}
 }
-
-// virtual
-BOOL FloaterDice::handleKeyHere(KEY key, MASK mask)
-{
-	BOOL handled = FALSE;
-
-	if ((KEY_RETURN == key) && (mask == MASK_NONE))
-	{
-		onClickRoll(this);
-		handled = TRUE;
-	}
-
-	return handled;
-}
diff --git a/linden/indra/newview/floaterdice.h b/linden/indra/newview/floaterdice.h
index 57a664b..5f36a80 100644
--- a/linden/indra/newview/floaterdice.h
+++ b/linden/indra/newview/floaterdice.h
@@ -44,7 +44,6 @@ public:
 private:
 
 	static void onClickRoll(void* data);
-	virtual BOOL handleKeyHere(KEY key, MASK mask);
 };
 
 #endif //floaterdice_h
-- 
cgit v1.1


From a3219972a035cc2d7fea8d9f59860a9262f4235c Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Thu, 30 Jun 2011 22:30:08 -0700
Subject: Created new window for selectively clearing different parts of the
 cache from disk

---
 linden/indra/newview/CMakeLists.txt                |  2 +
 linden/indra/newview/app_settings/cmd_line.xml     |  2 +-
 linden/indra/newview/app_settings/settings.xml     | 71 +++++++++++++---
 linden/indra/newview/floatercache.cpp              | 97 ++++++++++++++++++++++
 linden/indra/newview/floatercache.h                | 50 +++++++++++
 linden/indra/newview/llappviewer.cpp               | 64 ++++++++++++--
 linden/indra/newview/llpanelnetwork.cpp            |  6 +-
 .../default/xui/en-us/floater_clear_cache.xml      | 28 +++++++
 .../skins/default/xui/en-us/notifications.xml      |  7 --
 9 files changed, 299 insertions(+), 28 deletions(-)
 create mode 100644 linden/indra/newview/floatercache.cpp
 create mode 100644 linden/indra/newview/floatercache.h
 create mode 100644 linden/indra/newview/skins/default/xui/en-us/floater_clear_cache.xml

diff --git a/linden/indra/newview/CMakeLists.txt b/linden/indra/newview/CMakeLists.txt
index 46da492..1b9f75a 100644
--- a/linden/indra/newview/CMakeLists.txt
+++ b/linden/indra/newview/CMakeLists.txt
@@ -78,6 +78,7 @@ set(viewer_SOURCE_FILES
     floaterao.cpp
     floaterbusy.cpp
     floatercommandline.cpp
+    floatercache.cpp
     floaterdice.cpp
     floatergriddefault.cpp
     floatergridmanager.cpp
@@ -536,6 +537,7 @@ set(viewer_HEADER_FILES
     floaterao.h
     floaterbusy.h
     floatercommandline.h
+    floatercache.h
     floaterdice.h
     floatergriddefault.h
     floatergridmanager.h
diff --git a/linden/indra/newview/app_settings/cmd_line.xml b/linden/indra/newview/app_settings/cmd_line.xml
index f5c6cdb..9fd4669 100644
--- a/linden/indra/newview/app_settings/cmd_line.xml
+++ b/linden/indra/newview/app_settings/cmd_line.xml
@@ -157,7 +157,7 @@
       <key>desc</key>
       <string>Delete files in the cache.</string>
       <key>map-to</key>
-      <string>PurgeCacheOnNextStartup</string>
+      <string>PurgeCacheOnStartup</string>
     </map>
 
     <key>noinvlib</key>
diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index eb59254..7d9a0ca 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -2571,6 +2571,66 @@
   </map>
 
   <!-- End: full radar (Advanced menu) -->
+  
+  <!-- Begin: cache clearing -->
+
+  <key>PurgeCacheOnStartup</key>
+  <map>
+    <key>Comment</key>
+    <string>Clear local file cache every time viewer is run (cmd line --purge)</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Boolean</string>
+    <key>Value</key>
+    <integer>0</integer>
+  </map>
+  <key>ClearTextureCache</key>
+  <map>
+    <key>Comment</key>
+    <string>Clear texture cache</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Boolean</string>
+    <key>Value</key>
+    <integer>0</integer>
+  </map>
+  <key>ClearObjectCache</key>
+  <map>
+    <key>Comment</key>
+    <string>Clear object cache</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Boolean</string>
+    <key>Value</key>
+    <integer>0</integer>
+  </map>
+  <key>ClearInvCache</key>
+  <map>
+    <key>Comment</key>
+    <string>Clear inventory cache</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Boolean</string>
+    <key>Value</key>
+    <integer>0</integer>
+  </map>
+  <key>ClearNameCache</key>
+  <map>
+    <key>Comment</key>
+    <string>Clear cached avatar names/uuids</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Boolean</string>
+    <key>Value</key>
+    <integer>0</integer>
+  </map>
+  
+  <!-- End: clear cache -->
 
   <!-- END IMPRUDENCE-SPECIFIC SETTINGS -->
 
@@ -9334,17 +9394,6 @@
       <key>Value</key>
       <integer>0</integer>
     </map>
-    <key>PurgeCacheOnStartup</key>
-    <map>
-      <key>Comment</key>
-      <string>Clear local file cache every time viewer is run</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>Boolean</string>
-      <key>Value</key>
-      <integer>0</integer>
-    </map>
     <key>PushToTalkButton</key>
     <map>
       <key>Comment</key>
diff --git a/linden/indra/newview/floatercache.cpp b/linden/indra/newview/floatercache.cpp
new file mode 100644
index 0000000..3d3091f
--- /dev/null
+++ b/linden/indra/newview/floatercache.cpp
@@ -0,0 +1,97 @@
+/**
+* @file floatercache.cpp
+* @brief clear cache window for Imprudence
+*
+* $LicenseInfo:firstyear=2009&license=viewergpl$
+*
+* Copyright (c) 2011, McCabe Maxsted
+*
+* Imprudence Viewer Source Code
+* The source code in this file ("Source Code") is provided to you
+* under the terms of the GNU General Public License, version 2.0
+* ("GPL"). Terms of the GPL can be found in doc/GPL-license.txt in
+* this distribution, or online at
+* http://secondlifegrid.net/programs/open_source/licensing/gplv2
+*
+* There are special exceptions to the terms and conditions of the GPL as
+* it is applied to this Source Code. View the full text of the exception
+* in the file doc/FLOSS-exception.txt in this software distribution, or
+* online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+*
+* By copying, modifying or distributing this software, you acknowledge
+* that you have read and understood your obligations described above,
+* and agree to abide by those obligations.
+*
+* ALL SOURCE CODE IS PROVIDED "AS IS." THE AUTHOR MAKES NO
+* WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+* COMPLETENESS OR PERFORMANCE.
+* $/LicenseInfo$
+*/
+
+#include "llviewerprecompiledheaders.h"
+
+#include "floatercache.h"
+
+#include "llcheckboxctrl.h"
+#include "lluictrlfactory.h"
+
+#include "llviewercontrol.h"
+
+
+FloaterCache::FloaterCache(const LLSD& seed) : LLFloater("Clear Cache")
+{
+	LLUICtrlFactory::getInstance()->buildFloater(this, "floater_clear_cache.xml");
+}
+
+FloaterCache::~FloaterCache()
+{
+}
+
+BOOL FloaterCache::postBuild()
+{
+	getChild<LLCheckBoxCtrl>("texture_cache")->setValue(gSavedSettings.getBOOL("ClearTextureCache"));
+	getChild<LLCheckBoxCtrl>("object_cache")->setValue(gSavedSettings.getBOOL("ClearObjectCache"));
+	getChild<LLCheckBoxCtrl>("inv_cache")->setValue(gSavedSettings.getBOOL("ClearInvCache"));
+	getChild<LLCheckBoxCtrl>("name_cache")->setValue(gSavedSettings.getBOOL("ClearNameCache"));
+
+	childSetAction("btn_ok", onClickOK, this);
+	childSetAction("btn_cancel", onClickCancel, this);
+
+	return TRUE;
+}
+
+// static
+void FloaterCache::onClickOK(void* data)
+{
+	FloaterCache* self = (FloaterCache*)data;
+	if (self)
+	{
+		bool purge_textures = self->getChild<LLCheckBoxCtrl>("texture_cache")->getValue().asBoolean();
+		bool purge_objects = self->getChild<LLCheckBoxCtrl>("object_cache")->getValue().asBoolean();
+		bool purge_inv = self->getChild<LLCheckBoxCtrl>("inv_cache")->getValue().asBoolean();
+		bool purge_names = self->getChild<LLCheckBoxCtrl>("name_cache")->getValue().asBoolean();
+		
+		gSavedSettings.setBOOL("ClearTextureCache", purge_textures);
+		gSavedSettings.setBOOL("ClearObjectCache", purge_objects);
+		gSavedSettings.setBOOL("ClearInvCache", purge_inv);
+		gSavedSettings.setBOOL("ClearNameCache", purge_names);
+			
+		if (purge_textures || purge_objects || purge_inv || purge_names)
+		{
+			// flag client cache for clearing next time the client runs
+			gSavedSettings.setBOOL("PurgeCacheOnNextStartup", TRUE);
+		}
+
+		self->close();
+	}
+}
+
+// static
+void FloaterCache::onClickCancel(void* data)
+{
+	FloaterCache* self = (FloaterCache*)data;
+	if (self)
+	{
+		self->close();
+	}
+}
diff --git a/linden/indra/newview/floatercache.h b/linden/indra/newview/floatercache.h
new file mode 100644
index 0000000..ea3c53e
--- /dev/null
+++ b/linden/indra/newview/floatercache.h
@@ -0,0 +1,50 @@
+/**
+* @file floatercache.h
+* @brief clear cache window for Imprudence
+*
+* $LicenseInfo:firstyear=2009&license=viewergpl$
+*
+* Copyright (c) 2011, McCabe Maxsted
+*
+* Imprudence Viewer Source Code
+* The source code in this file ("Source Code") is provided to you
+* under the terms of the GNU General Public License, version 2.0
+* ("GPL"). Terms of the GPL can be found in doc/GPL-license.txt in
+* this distribution, or online at
+* http://secondlifegrid.net/programs/open_source/licensing/gplv2
+*
+* There are special exceptions to the terms and conditions of the GPL as
+* it is applied to this Source Code. View the full text of the exception
+* in the file doc/FLOSS-exception.txt in this software distribution, or
+* online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+*
+* By copying, modifying or distributing this software, you acknowledge
+* that you have read and understood your obligations described above,
+* and agree to abide by those obligations.
+*
+* ALL SOURCE CODE IS PROVIDED "AS IS." THE AUTHOR MAKES NO
+* WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+* COMPLETENESS OR PERFORMANCE.
+* $/LicenseInfo$
+*/
+
+#ifndef floatercache_h
+#define floatercache_h
+
+#include "llfloater.h"
+
+class FloaterCache : public LLFloater, public LLFloaterSingleton<FloaterCache>
+{
+public:
+
+	FloaterCache(const LLSD& seed);
+	virtual ~FloaterCache();
+	BOOL postBuild();
+
+private:
+
+	static void onClickOK(void* data);
+	static void onClickCancel(void* data);
+};
+
+#endif //floatercache_h
diff --git a/linden/indra/newview/llappviewer.cpp b/linden/indra/newview/llappviewer.cpp
index c9ab291..2fab25b 100644
--- a/linden/indra/newview/llappviewer.cpp
+++ b/linden/indra/newview/llappviewer.cpp
@@ -2963,10 +2963,11 @@ bool LLAppViewer::initCache()
 {
 	mPurgeCache = false;
 	// Purge cache if user requested it
-	if (gSavedSettings.getBOOL("PurgeCacheOnStartup") ||
-		gSavedSettings.getBOOL("PurgeCacheOnNextStartup"))
+	if (gSavedSettings.getBOOL("PurgeCacheOnStartup") || // cmd-line -- MC
+		gSavedSettings.getBOOL("PurgeCacheOnNextStartup")) // ui -- MC
 	{
 		gSavedSettings.setBOOL("PurgeCacheOnNextStartup", false);
+		gSavedSettings.setBOOL("PurgeCacheOnStartup", FALSE);
 		mPurgeCache = true;
 	}
 	// Purge cache if it belongs to an old version
@@ -3175,10 +3176,61 @@ bool LLAppViewer::initCache()
 
 void LLAppViewer::purgeCache()
 {
-	LL_INFOS("AppCache") << "Purging Cache and Texture Cache..." << llendl;
-	LLAppViewer::getTextureCache()->purgeCache(LL_PATH_CACHE);
-	std::string mask = gDirUtilp->getDirDelimiter() + "*.*";
-	gDirUtilp->deleteFilesInDir(gDirUtilp->getExpandedFilename(LL_PATH_CACHE,""),mask);
+	LL_INFOS("AppCache") << "Begin purging cachees..." << llendl;
+	if (gSavedSettings.getBOOL("PurgeCacheOnStartup")) // purging from cmd line
+	{
+		LLAppViewer::getTextureCache()->purgeCache(LL_PATH_CACHE);
+		std::string mask = gDirUtilp->getDirDelimiter() + "*.*";
+		gDirUtilp->deleteFilesInDir(gDirUtilp->getExpandedFilename(LL_PATH_CACHE, ""), mask);
+	}
+	else // purging cache from ui
+	{
+		if (gSavedSettings.getBOOL("ClearTextureCache"))
+		{
+			LLAppViewer::getTextureCache()->purgeCache(LL_PATH_CACHE);
+			gSavedSettings.setBOOL("ClearTextureCache", FALSE);
+		}
+
+		if (gSavedSettings.getBOOL("ClearObjectCache"))
+		{
+			std::string mask = gDirUtilp->getDirDelimiter() + "*.slc";
+			gDirUtilp->deleteFilesInDir(gDirUtilp->getExpandedFilename(LL_PATH_CACHE, ""), mask);
+			gSavedSettings.setBOOL("ClearObjectCache", FALSE);
+		}
+
+		if (gSavedSettings.getBOOL("ClearInvCache"))
+		{
+			std::vector<std::string> masks;
+			masks.push_back(gDirUtilp->getDirDelimiter() + "*.inv.gz");
+			masks.push_back(gDirUtilp->getDirDelimiter() + VFS_DATA_FILE_BASE + "*");
+			masks.push_back(gDirUtilp->getDirDelimiter() + VFS_INDEX_FILE_BASE + "*");
+			
+			for (std::vector<std::string>::iterator vIt = masks.begin(); 
+				vIt != masks.end(); ++vIt)
+			{
+				gDirUtilp->deleteFilesInDir(gDirUtilp->getExpandedFilename(LL_PATH_CACHE, ""), (*vIt));
+			}
+
+			gSavedSettings.setBOOL("ClearInvCache", FALSE);
+		}
+
+		if (gSavedSettings.getBOOL("ClearNameCache"))
+		{
+			// ick @ not making these variables -- MC
+			std::vector<std::string> masks;
+			masks.push_back(gDirUtilp->getDirDelimiter() + "name.cache");
+			masks.push_back(gDirUtilp->getDirDelimiter() + "avatar_name_cache.xml");
+			masks.push_back(gDirUtilp->getDirDelimiter() + "*.cached_mute");
+			
+			for (std::vector<std::string>::iterator vIt = masks.begin(); 
+				vIt != masks.end(); ++vIt)
+			{
+				gDirUtilp->deleteFilesInDir(gDirUtilp->getExpandedFilename(LL_PATH_CACHE, ""), (*vIt));
+			}
+
+			gSavedSettings.setBOOL("ClearNameCache", FALSE);
+		}
+	}
 }
 
 const std::string& LLAppViewer::getSecondLifeTitle() const
diff --git a/linden/indra/newview/llpanelnetwork.cpp b/linden/indra/newview/llpanelnetwork.cpp
index b4ebe42..70d88d9 100644
--- a/linden/indra/newview/llpanelnetwork.cpp
+++ b/linden/indra/newview/llpanelnetwork.cpp
@@ -45,6 +45,7 @@
 #include "llviewerwindow.h"
 
 // project includes
+#include "floatercache.h"
 #include "llcheckboxctrl.h"
 #include "hippogridmanager.h"
 #include "lluictrlfactory.h"
@@ -267,9 +268,8 @@ void LLPanelNetwork::refresh()
 // static
 void LLPanelNetwork::onClickClearDiskCache(void*)
 {
-	// flag client cache for clearing next time the client runs
-	gSavedSettings.setBOOL("PurgeCacheOnNextStartup", TRUE);
-	LLNotifications::instance().add("CacheWillClear");
+	FloaterCache::getInstance()->open();
+	FloaterCache::getInstance()->center();
 }
 
 // static
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_clear_cache.xml b/linden/indra/newview/skins/default/xui/en-us/floater_clear_cache.xml
new file mode 100644
index 0000000..e965b28
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_clear_cache.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater bottom="-175" can_close="true" can_drag_on_left="false" can_minimize="true"
+     can_resize="false" follows="left|top" mouse_opaque="true" height="175" width="200"
+     name="Clear Cache" title="Clear Disk Cache">
+  <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+     bottom="-39" drop_shadow_visible="true" follows="left|top" font-style="BOLD|SHADOW"
+     font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="20"
+     mouse_opaque="true" name="cache_label" v_pad="0" width="185">
+Cache Will Be Cleared After
+You Restart Imprudence
+  </text>
+  <check_box bottom_delta="-37" follows="left|top" font="SansSerifSmall" height="20"
+     initial_value="false" label="Clear texture cache" left="10"
+     mouse_opaque="true" name="texture_cache" width="185" />
+  <check_box bottom_delta="-22" follows="left|top" font="SansSerifSmall" height="20"
+     initial_value="false" label="Clear object cache" left_delta="0"
+     mouse_opaque="true" name="object_cache" width="185" />
+  <check_box bottom_delta="-22" follows="left|top" font="SansSerifSmall" height="20"
+     initial_value="false" label="Clear inventory cache" left_delta="0"
+     mouse_opaque="true" name="inv_cache" width="185" />
+  <check_box bottom_delta="-22" follows="left|top" font="SansSerifSmall" height="20"
+     initial_value="false" label="Clear avatar name cache" left_delta="0"
+     mouse_opaque="true" name="name_cache" width="185" />
+  <button bottom_delta="-30" follows="right|top" font="SansSerif" halign="center" height="22"
+     label="OK" left="-170" mouse_opaque="true" name="btn_ok" width="80" />
+  <button bottom_delta="0" follows="right|top" font="SansSerif" halign="center" height="22"
+     label="Cancel" left="-85" mouse_opaque="true" name="btn_cancel" width="80" />
+</floater>
\ No newline at end of file
diff --git a/linden/indra/newview/skins/default/xui/en-us/notifications.xml b/linden/indra/newview/skins/default/xui/en-us/notifications.xml
index 4474dad..033b01b 100644
--- a/linden/indra/newview/skins/default/xui/en-us/notifications.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/notifications.xml
@@ -903,13 +903,6 @@ Would you like to disable all popups which can be skipped?
 
 <notification
  icon="notify.tga"
- name="CacheWillClear"
- type="notify">
-Cache will be cleared after you restart [VIEWER_NAME].
-</notification>
-
-<notification
- icon="notify.tga"
  name="CacheWillBeMoved"
  type="notify">
 Cache will be moved after you restart [VIEWER_NAME].
-- 
cgit v1.1


From fedf23cb3dc11abbe466d0d77bce4044c4d6c77b Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Fri, 1 Jul 2011 02:00:05 -0700
Subject: Make sure we clear out skin files that could cause bugs when we
 install over 1.3

---
 .../newview/installers/windows/imprudence_installer_script.iss | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/linden/indra/newview/installers/windows/imprudence_installer_script.iss b/linden/indra/newview/installers/windows/imprudence_installer_script.iss
index c23fbf4..783ea0f 100644
--- a/linden/indra/newview/installers/windows/imprudence_installer_script.iss
+++ b/linden/indra/newview/installers/windows/imprudence_installer_script.iss
@@ -1,5 +1,5 @@
-; Script generated by the Inno Setup Script Wizard.
-; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
+; InWorldz inno setup installer script by McCabe Maxsted
+; This script only works with VS2005, currently
 
 [Setup]
 ; NOTE: The value of AppId uniquely identifies this application.
@@ -196,7 +196,11 @@ Name: C:\Documents and Settings\{username}\.gstreamer-0.10; Type: filesandordirs
 ; Name: {app}\*.dll; Type: files; Tasks: ; Languages:
 Name: {app}\lib\gstreamer-plugins\*; Type: filesandordirs; Tasks: ; Languages: 
 ; Name: {app}\skins\default\xui\*; Type: filesandordirs; Tasks: ; Languages:
-; Name: {app}\skins\silver\xui\*; Type: filesandordirs; Tasks: ; Languages:
+; Old xui skin files can cause bugs, always kill them
+Name: {app}\skins\silver\xui\en-us\*; Type: filesandordirs; Tasks: ; Languages:
+Name: {app}\app_settings\mozilla; Type: filesandordirs; Tasks: ; Languages:
+Name: {app}\app_settings\mozilla_debug; Type: filesandordirs; Tasks: ; Languages:
+Name: {app}\app_settings\viewerversion.xml; Type: filesandordirs; Tasks: ; Languages:
 Name: C:\Documents and Settings\{username}\.gstreamer-0.10\*; Type: filesandordirs
 Name: C:\Users\{username}\.gstreamer-0.10\*; Type: filesandordirs
 ; Breaks the browser if installing on top of 1.1:
-- 
cgit v1.1


From 990a821f70ca648bc7d1a58045fdd79f53b61fbd Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Fri, 1 Jul 2011 02:00:58 -0700
Subject: A fix for #995: crashing when changing 'Only my Friends and Groups
 can see when I am online'

---
 linden/indra/newview/llfloaterpreference.cpp | 95 ++++++++++++++++++----------
 linden/indra/newview/llprefschat.cpp         | 25 ++++++--
 linden/indra/newview/llprefschat.h           |  3 +
 linden/indra/newview/llprefsim.cpp           | 70 ++++++++++++++------
 linden/indra/newview/llprefsim.h             |  3 +
 5 files changed, 138 insertions(+), 58 deletions(-)

diff --git a/linden/indra/newview/llfloaterpreference.cpp b/linden/indra/newview/llfloaterpreference.cpp
index d518eac..301fba0 100644
--- a/linden/indra/newview/llfloaterpreference.cpp
+++ b/linden/indra/newview/llfloaterpreference.cpp
@@ -303,6 +303,24 @@ void LLPreferenceCore::apply()
 		mLCDPanel->apply();
 	}
 #endif
+
+	// Sims always wants us to send IMViaEMail and DirectoryVisible in the same msg or we crash, they're evil like that
+	// We only know both these values after mPrefsChat and mPrefsIM have been applied -- MC
+	if (mPrefsChat->getUpdateUserInfo() || mPrefsIM->getUpdateUserInfo())
+	{
+		bool new_im_via_email = mPrefsChat->getIMViaEmail();
+		std::string directory_visibility = mPrefsIM->getDirectoryVis();
+
+		LLMessageSystem* msg = gMessageSystem;
+		msg->newMessageFast(_PREHASH_UpdateUserInfo);
+		msg->nextBlockFast(_PREHASH_AgentData);
+		msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
+		msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
+		msg->nextBlockFast(_PREHASH_UserData);
+		msg->addBOOLFast(_PREHASH_IMViaEMail, new_im_via_email);	 	 
+		msg->addString("DirectoryVisibility", directory_visibility);
+		gAgent.sendReliableMessage();
+	}
 }
 
 
@@ -469,34 +487,37 @@ bool LLFloaterPreference::callbackReset(const LLSD& notification, const LLSD& re
 void LLFloaterPreference::onBtnOK( void* userdata )
 {
 	LLFloaterPreference *fp =(LLFloaterPreference *)userdata;
-	// commit any outstanding text entry
-	if (fp->hasFocus())
+	if (fp)
 	{
-		LLUICtrl* cur_focus = dynamic_cast<LLUICtrl*>(gFocusMgr.getKeyboardFocus());
-		if (cur_focus->acceptsTextInput())
+		// commit any outstanding text entry
+		if (fp->hasFocus())
 		{
-			cur_focus->onCommit();
+			LLUICtrl* cur_focus = dynamic_cast<LLUICtrl*>(gFocusMgr.getKeyboardFocus());
+			if (cur_focus->acceptsTextInput())
+			{
+				cur_focus->onCommit();
+			}
 		}
-	}
 
-	if (fp->canClose())
-	{
-		fp->apply();
-		fp->close(false);
+		if (fp->canClose())
+		{
+			fp->apply();
+			fp->close(false);
 
-		gSavedSettings.saveToFile( gSavedSettings.getString("ClientSettingsFile"), TRUE );
-		
-		std::string crash_settings_filename = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, CRASH_SETTINGS_FILE);
-		// save all settings, even if equals defaults
-		gCrashSettings.saveToFile(crash_settings_filename, FALSE);
-	}
-	else
-	{
-		// Show beep, pop up dialog, etc.
-		llinfos << "Can't close preferences!" << llendl;
-	}
+			gSavedSettings.saveToFile( gSavedSettings.getString("ClientSettingsFile"), TRUE );
+			
+			std::string crash_settings_filename = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, CRASH_SETTINGS_FILE);
+			// save all settings, even if equals defaults
+			gCrashSettings.saveToFile(crash_settings_filename, FALSE);
+		}
+		else
+		{
+			// Show beep, pop up dialog, etc.
+			llinfos << "Can't close preferences!" << llendl;
+		}
 
-	LLPanelLogin::refreshLocation( false );
+		LLPanelLogin::refreshLocation( false );
+	}
 }
 
 
@@ -504,17 +525,20 @@ void LLFloaterPreference::onBtnOK( void* userdata )
 void LLFloaterPreference::onBtnApply( void* userdata )
 {
 	LLFloaterPreference *fp =(LLFloaterPreference *)userdata;
-	if (fp->hasFocus())
+	if (fp)
 	{
-		LLUICtrl* cur_focus = dynamic_cast<LLUICtrl*>(gFocusMgr.getKeyboardFocus());
-		if (cur_focus->acceptsTextInput())
+		if (fp->hasFocus())
 		{
-			cur_focus->onCommit();
+			LLUICtrl* cur_focus = dynamic_cast<LLUICtrl*>(gFocusMgr.getKeyboardFocus());
+			if (cur_focus->acceptsTextInput())
+			{
+				cur_focus->onCommit();
+			}
 		}
-	}
-	fp->apply();
+		fp->apply();
 
-	LLPanelLogin::refreshLocation( false );
+		LLPanelLogin::refreshLocation( false );
+	}
 }
 
 
@@ -530,15 +554,18 @@ void LLFloaterPreference::onClose(bool app_quitting)
 void LLFloaterPreference::onBtnCancel( void* userdata )
 {
 	LLFloaterPreference *fp =(LLFloaterPreference *)userdata;
-	if (fp->hasFocus())
+	if (fp)
 	{
-		LLUICtrl* cur_focus = dynamic_cast<LLUICtrl*>(gFocusMgr.getKeyboardFocus());
-		if (cur_focus->acceptsTextInput())
+		if (fp->hasFocus())
 		{
-			cur_focus->onCommit();
+			LLUICtrl* cur_focus = dynamic_cast<LLUICtrl*>(gFocusMgr.getKeyboardFocus());
+			if (cur_focus->acceptsTextInput())
+			{
+				cur_focus->onCommit();
+			}
 		}
+		fp->close(); // side effect will also cancel any unsaved changes.
 	}
-	fp->close(); // side effect will also cancel any unsaved changes.
 }
 
 
diff --git a/linden/indra/newview/llprefschat.cpp b/linden/indra/newview/llprefschat.cpp
index 9490ba2..1cdab46 100644
--- a/linden/indra/newview/llprefschat.cpp
+++ b/linden/indra/newview/llprefschat.cpp
@@ -46,7 +46,6 @@
 #include "lggautocorrectfloater.h"
 #include "llprefschat.h"
 #include "llviewercontrol.h"
-#include "llviewermessage.h"
 
 class LLPrefsChatImpl : public LLPanel
 {
@@ -72,8 +71,10 @@ public:
 	static void onSpellEditCustom(void* data);
 	static void onSpellBaseComboBoxCommit(LLUICtrl* ctrl, void* userdata);
 
-protected:
+	bool mUpdateUserInfo;
 	bool mOriginalIMViaEmail;
+
+protected:
 	bool mGotPersonalInfo;
 
 private:
@@ -84,7 +85,8 @@ LLPrefsChatImpl::LLPrefsChatImpl()
 	:	LLPanel(std::string("Chat Panel")),
 	mChatChannel(false),
 	mOriginalIMViaEmail(false),
-	mGotPersonalInfo(false)
+	mGotPersonalInfo(false),
+	mUpdateUserInfo(false)
 {
 	LLUICtrlFactory::getInstance()->buildPanel(this, "panel_preferences_chat.xml");
 }
@@ -230,14 +232,17 @@ void LLPrefsChatImpl::apply()
 
 		if (new_im_via_email != mOriginalIMViaEmail)
 		{
-			LLMessageSystem* msg = gMessageSystem;
+			mOriginalIMViaEmail = new_im_via_email;
+			mUpdateUserInfo = true;
+
+			/*LLMessageSystem* msg = gMessageSystem;
 			msg->newMessageFast(_PREHASH_UpdateUserInfo);
 			msg->nextBlockFast(_PREHASH_AgentData);
 			msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
 			msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
 			msg->nextBlockFast(_PREHASH_UserData);
 			msg->addBOOLFast(_PREHASH_IMViaEMail, new_im_via_email);
-			gAgent.sendReliableMessage();
+			gAgent.sendReliableMessage();*/
 		}
 	}
 
@@ -379,6 +384,16 @@ void LLPrefsChat::setPersonalInfo(bool im_via_email, const std::string& email)
 	impl.setPersonalInfo(im_via_email, email);
 }
 
+bool LLPrefsChat::getUpdateUserInfo()
+{ 
+	return impl.mUpdateUserInfo; 
+}
+
+bool LLPrefsChat::getIMViaEmail()
+{
+	return impl.mOriginalIMViaEmail;
+}
+
 LLPanel* LLPrefsChat::getPanel()
 {
 	return &impl;
diff --git a/linden/indra/newview/llprefschat.h b/linden/indra/newview/llprefschat.h
index 64bfb36..6c69a2b 100644
--- a/linden/indra/newview/llprefschat.h
+++ b/linden/indra/newview/llprefschat.h
@@ -48,6 +48,9 @@ public:
 
 	LLPanel* getPanel();
 
+	bool getUpdateUserInfo();
+	bool getIMViaEmail();
+
 protected:
 	LLPrefsChatImpl& impl;
 };
diff --git a/linden/indra/newview/llprefsim.cpp b/linden/indra/newview/llprefsim.cpp
index 47b5d8b..e037ac7 100644
--- a/linden/indra/newview/llprefsim.cpp
+++ b/linden/indra/newview/llprefsim.cpp
@@ -74,13 +74,15 @@ public:
 
 	static void onClickBusyAdvanced(void* user_data);
 
+	bool mUpdateUserInfo;
+	std::string mDirectoryVisibility;
+
 protected:
  
 	bool mGotPersonalInfo;
 	bool mGotPerAccountSettings;
 
 	bool mOriginalHideOnlineStatus;
-	std::string mDirectoryVisibility;
 };
 
 
@@ -88,7 +90,9 @@ LLPrefsIMImpl::LLPrefsIMImpl()
 	: LLPanel(std::string("IM Prefs Panel")),
 	  mGotPersonalInfo(false),
 	  mGotPerAccountSettings(false),
-	  mOriginalHideOnlineStatus(false)
+	  mOriginalHideOnlineStatus(false),
+	  mDirectoryVisibility(""),
+	  mUpdateUserInfo(false)
 {
 	LLUICtrlFactory::getInstance()->buildPanel(this, "panel_preferences_im.xml");
 }
@@ -178,27 +182,45 @@ void LLPrefsIMImpl::apply()
 
 		if (new_hide_online != mOriginalHideOnlineStatus)
 		{
-			LLMessageSystem* msg = gMessageSystem;
-			msg->newMessageFast(_PREHASH_UpdateUserInfo);
-			msg->nextBlockFast(_PREHASH_AgentData);
-			msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
-			msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
-			msg->nextBlockFast(_PREHASH_UserData);
-			//msg->addBOOLFast(_PREHASH_IMViaEMail, new_im_via_email);
+			mOriginalHideOnlineStatus = new_hide_online;
+
 			// This hack is because we are representing several different 	 
 			// possible strings with a single checkbox. Since most users 	 
 			// can only select between 2 values, we represent it as a 	 
 			// checkbox. This breaks down a little bit for liaisons, but 	 
-			// works out in the end. 	 
-			if(new_hide_online != mOriginalHideOnlineStatus) 	 
-			{ 	 
-				if(new_hide_online) mDirectoryVisibility = VISIBILITY_HIDDEN;
-				else mDirectoryVisibility = VISIBILITY_DEFAULT;
-				//Update showonline value, otherwise multiple applys won't work
-				mOriginalHideOnlineStatus = new_hide_online;
-			} 	 
-			msg->addString("DirectoryVisibility", mDirectoryVisibility);
-			gAgent.sendReliableMessage();
+			// works out in the end. 
+			if (new_hide_online)
+			{
+				mDirectoryVisibility = VISIBILITY_HIDDEN;
+			}
+			else
+			{
+				mDirectoryVisibility = VISIBILITY_DEFAULT;
+			}
+
+			mUpdateUserInfo = true;
+
+			//LLMessageSystem* msg = gMessageSystem;
+			//msg->newMessageFast(_PREHASH_UpdateUserInfo);
+			//msg->nextBlockFast(_PREHASH_AgentData);
+			//msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
+			//msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
+			//msg->nextBlockFast(_PREHASH_UserData);
+			////msg->addBOOLFast(_PREHASH_IMViaEMail, new_im_via_email);
+			//// This hack is because we are representing several different 	 
+			//// possible strings with a single checkbox. Since most users 	 
+			//// can only select between 2 values, we represent it as a 	 
+			//// checkbox. This breaks down a little bit for liaisons, but 	 
+			//// works out in the end. 	 
+			//if(new_hide_online != mOriginalHideOnlineStatus) 	 
+			//{ 	 
+			//	if(new_hide_online) mDirectoryVisibility = VISIBILITY_HIDDEN;
+			//	else mDirectoryVisibility = VISIBILITY_DEFAULT;
+			//	//Update showonline value, otherwise multiple applys won't work
+			//	mOriginalHideOnlineStatus = new_hide_online;
+			//} 	 
+			//msg->addString("DirectoryVisibility", mDirectoryVisibility);
+			//gAgent.sendReliableMessage();
 		}
 	}
 }
@@ -341,6 +363,16 @@ void LLPrefsIM::preparePerAccountPrefs(bool enable)
 	impl.preparePerAccountPrefs(enable);
 }
 
+bool LLPrefsIM::getUpdateUserInfo()
+{
+	return impl.mUpdateUserInfo; 
+}
+
+std::string LLPrefsIM::getDirectoryVis()
+{
+	return impl.mDirectoryVisibility;
+}
+
 LLPanel* LLPrefsIM::getPanel()
 {
 	return &impl;
diff --git a/linden/indra/newview/llprefsim.h b/linden/indra/newview/llprefsim.h
index 054e4c7..8003ca2 100644
--- a/linden/indra/newview/llprefsim.h
+++ b/linden/indra/newview/llprefsim.h
@@ -50,6 +50,9 @@ public:
 
 	LLPanel* getPanel();
 
+	bool getUpdateUserInfo();
+	std::string getDirectoryVis();
+
 protected:
 	LLPrefsIMImpl& impl;
 };
-- 
cgit v1.1


From 2a8933ddc0aacdfd324afe293cf4a04744a1362c Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Fri, 1 Jul 2011 02:16:21 -0700
Subject: Fixed #994: double click action combobox not enabling

---
 linden/indra/newview/llpanelinput.cpp                               | 6 ++++--
 .../newview/skins/default/xui/en-us/panel_preferences_input.xml     | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/linden/indra/newview/llpanelinput.cpp b/linden/indra/newview/llpanelinput.cpp
index 9664b6f..538f706 100644
--- a/linden/indra/newview/llpanelinput.cpp
+++ b/linden/indra/newview/llpanelinput.cpp
@@ -79,6 +79,8 @@ BOOL LLPanelInput::postBuild()
 	childSetValue("double_click_action", gSavedSettings.getString("DoubleClickAction"));
 	childSetCommitCallback("double_click_action", onCommitAction, this);
 	childSetValue("go_action", gSavedSettings.getString("GoAction"));
+	childSetEnabled("go_action_label", gSavedSettings.getString("DoubleClickAction") == "Go");
+	childSetEnabled("go_action", gSavedSettings.getString("DoubleClickAction") == "Go");
 
 	childSetValue("Disable camera constraints", gSavedSettings.getBOOL("DisableCameraConstraints"));
 	childSetValue("disable_min_zoom_check", gSavedSettings.getBOOL("DisableMinZoomDist"));
@@ -139,7 +141,7 @@ void LLPanelInput::onCommitAction(LLUICtrl* ctrl, void* user_data)
 	LLComboBox* combo = (LLComboBox*)ctrl;
 	if (self && combo)
 	{
-		self->childSetEnabled("go_action_label", combo->getSimple() == "Go");
-		self->childSetEnabled("go_action", combo->getSimple() == "Go");
+		self->childSetEnabled("go_action_label", combo->getValue().asString() == "Go");
+		self->childSetEnabled("go_action", combo->getValue().asString() == "Go");
 	}
 }
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_input.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_input.xml
index 5713933..9f3c5c4 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_input.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_input.xml
@@ -25,7 +25,7 @@ USE left="270" FOR TABBING OPTIONS
     Double-Click Action:
   </text>
 
-  <combo_box name="double_click_action"
+  <combo_box name="double_click_action" enabled="true" 
              bottom_delta="-25" left_delta="30" height="18" width="160"
              follows="left|top" mouse_opaque="true">
     <combo_item name="None" value="None">
-- 
cgit v1.1


From 95ecfad58275879ebf8d803f89f17cf34790c1cc Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Fri, 1 Jul 2011 02:44:44 -0700
Subject: Fixed #742: cache reset to default button doesn't work (introduced in
 7507619e)

---
 linden/indra/newview/llappviewer.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/linden/indra/newview/llappviewer.cpp b/linden/indra/newview/llappviewer.cpp
index 2fab25b..1b32581 100644
--- a/linden/indra/newview/llappviewer.cpp
+++ b/linden/indra/newview/llappviewer.cpp
@@ -2991,7 +2991,7 @@ bool LLAppViewer::initCache()
 		cache_location = gSavedSettings.getString("CacheLocation");
 	}
 	std::string new_cache_location = gSavedSettings.getString("NewCacheLocation");
-	if ((new_cache_location != cache_location) && new_cache_location != "")
+	if (new_cache_location != cache_location)
 	{
 		gDirUtilp->setCacheDir(gSavedSettings.getString("CacheLocation"));
 		purgeCache(); // purge old cache
@@ -2999,7 +2999,7 @@ bool LLAppViewer::initCache()
 		cache_location = new_cache_location;
 	}
 	
-	if (!gDirUtilp->setCacheDir(cache_location))
+	if (!gDirUtilp->setCacheDir(gSavedSettings.getString("CacheLocation")))
 	{
 		LL_WARNS("AppCache") << "Unable to set cache location" << LL_ENDL;
 		gSavedSettings.setString("CacheLocation", "");
-- 
cgit v1.1


From f14afa87e93ba35553cf54ce5b6568a6eb1fcc1b Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Fri, 1 Jul 2011 03:00:20 -0700
Subject: Fixed #986: Preferences->Graphics Advanced Options checkbox is not
 available in French

---
 .../skins/default/xui/fr/panel_preferences_graphics1.xml     | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/linden/indra/newview/skins/default/xui/fr/panel_preferences_graphics1.xml b/linden/indra/newview/skins/default/xui/fr/panel_preferences_graphics1.xml
index 27825b7..c3e8d83 100644
--- a/linden/indra/newview/skins/default/xui/fr/panel_preferences_graphics1.xml
+++ b/linden/indra/newview/skins/default/xui/fr/panel_preferences_graphics1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Graphiques" name="Display panel">
 	<button label="?" name="GraphicsPreferencesHelpButton"/>
-	<text_editor bottom="-56" height="40" left="25" name="FullScreenInfo" width="460">
+	<text_editor name="FullScreenInfo" width="460">
 		Décochez cette option pour passer en mode plein écran.
 	</text_editor>
 	<text name="WindowSizeLabel">
@@ -63,7 +63,7 @@
 		Options d&apos;affichage :
 	</text>
 	<check_box label="Lancer Second Life en mode fenêtré" name="windowed mode"/>
-	<check_box label="Auto-détection du ratio" left="350" name="aspect_auto_detect"/>
+	<check_box label="Auto-détection du ratio" name="aspect_auto_detect"/>
 	<check_box label="Utiliser échelle de résolution indépendante" name="ui_auto_scale"/>
 	<check_box label="Montrer l&apos;avatar en vue subjective" name="avfp"/>
 	<spinner label="Distance d&apos;affichage :" name="draw_distance"/>
@@ -73,7 +73,7 @@
 	<text name="QualityText">
 		Performance :
 	</text>
-	<text left="105" name="FasterText">
+	<text name="FasterText">
 		Plus rapide
 	</text>
 	<text name="ShadersPrefText">
@@ -88,11 +88,11 @@
 	<text name="ShadersPrefText4">
 		Ultra
 	</text>
-	<text bottom="-86" left="325" name="HigherText2">
+	<text name="HigherText2">
 		Plus élevée
 	</text>
 	<text name="QualityText2" visible="false"/>
-	<check_box label="Personnaliser" left="395" name="CustomSettings"/>
+	<check_box label="Personnaliser" name="CustomSettings"/>
 	<text name="ShadersText">
 		Effets :
 	</text>
@@ -173,7 +173,7 @@
 			Lumières à proximité
 		</radio_item>
 	</radio_group>
-	<text left="380" name="TerrainDetailText">
+	<text name="TerrainDetailText">
 		Rendu du terrain :
 	</text>
 	<radio_group name="TerrainDetailRadio">
-- 
cgit v1.1


From 5fb019a522c276d18fb632de66d52f56439f65e4 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Tue, 5 Jul 2011 14:06:40 -0700
Subject: return 0 when mFile isn't found in llapr rather than asserting always

---
 linden/indra/llcommon/llapr.cpp | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/linden/indra/llcommon/llapr.cpp b/linden/indra/llcommon/llapr.cpp
index a013d9c..1040671 100644
--- a/linden/indra/llcommon/llapr.cpp
+++ b/linden/indra/llcommon/llapr.cpp
@@ -82,7 +82,7 @@ bool ll_apr_warn_status(apr_status_t status)
 	if(APR_SUCCESS == status) return false;
 	char buf[MAX_STRING];	/* Flawfinder: ignore */
 	apr_strerror(status, buf, MAX_STRING);
-	LL_WARNS("APR") << "APR: " << buf << LL_ENDL;
+	LL_WARNS("APR") << "APR: " << buf << " (" << status << ")" << LL_ENDL;
 	return true;
 }
 
@@ -194,8 +194,12 @@ apr_status_t LLAPRFile::open(std::string const& filename, apr_int32_t flags, acc
 // File I/O
 S32 LLAPRFile::read(void *buf, S32 nbytes)
 {
-	llassert_always(mFile) ;
-	
+	if(!mFile) 
+	{
+		llwarns << "apr mFile is removed by somebody else. Can not read." << llendl ;
+		return 0;
+	}
+
 	apr_size_t sz = nbytes;
 	apr_status_t s = apr_file_read(mFile, buf, &sz);
 	if (s != APR_SUCCESS)
@@ -212,7 +216,11 @@ S32 LLAPRFile::read(void *buf, S32 nbytes)
 
 S32 LLAPRFile::write(const void *buf, S32 nbytes)
 {
-	llassert_always(mFile) ;
+	if(!mFile) 
+	{
+		llwarns << "apr mFile is removed by somebody else. Can not read." << llendl ;
+		return 0;
+	}
 	
 	apr_size_t sz = nbytes;
 	apr_status_t s = apr_file_write(mFile, buf, &sz);
-- 
cgit v1.1


From ab60078741ea804913f4b82d400e41a4e1c5100b Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Tue, 5 Jul 2011 14:41:13 -0700
Subject: Always add the version to the top of the log--makes debugging easier

---
 linden/indra/newview/llappviewer.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/linden/indra/newview/llappviewer.cpp b/linden/indra/newview/llappviewer.cpp
index 1b32581..62b6242 100644
--- a/linden/indra/newview/llappviewer.cpp
+++ b/linden/indra/newview/llappviewer.cpp
@@ -607,6 +607,10 @@ bool LLAppViewer::init()
 	//
 	// OK to write stuff to logs now, we've now crash reported if necessary
 	//
+	
+	// Always add the version to the top of the log--makes debugging easier -- MC
+	llinfos << ViewerInfo::prettyInfo() << llendl;
+
     if (!initConfiguration())
 		return false;
 
-- 
cgit v1.1


From 30519243fcb0a5119dc00983aafec65a17fd9158 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Tue, 5 Jul 2011 17:31:54 -0700
Subject: Don't crash if someone sends us a notecard they've managed to embed a
 calling card in

---
 linden/indra/newview/llviewertexteditor.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/linden/indra/newview/llviewertexteditor.cpp b/linden/indra/newview/llviewertexteditor.cpp
index 5d0656d..217770c 100644
--- a/linden/indra/newview/llviewertexteditor.cpp
+++ b/linden/indra/newview/llviewertexteditor.cpp
@@ -417,6 +417,7 @@ void LLEmbeddedItems::bindEmbeddedChars( const LLFontGL* font ) const
 
 			break;
 		  case LLAssetType::AT_SOUND:			img_name = "inv_item_sound.tga";	break;
+		  case LLAssetType::AT_CALLINGCARD:		img_name = "inv_item_callingcard_offline.tga";   break;
 		  case LLAssetType::AT_LANDMARK:		
 			if (item->getFlags() & LLInventoryItem::II_FLAGS_LANDMARK_VISITED)
 			{
@@ -1384,6 +1385,7 @@ BOOL LLViewerTextEditor::openEmbeddedItem(LLInventoryItem* item, llwchar wc)
 	case LLAssetType::AT_GESTURE:
 		showCopyToInvDialog( item, wc );
 		return TRUE;
+	case LLAssetType::AT_CALLINGCARD:
 	default:
 		return FALSE;
 	}
-- 
cgit v1.1


From ff64af596bbd7fb50d3c28208e863eaf83b0a376 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Tue, 5 Jul 2011 17:54:25 -0700
Subject: Applied
 0001-Fix-hang-in-LLFloater-getClosableFloaterFromFocus-2..patch by Makomk
 Makosen for #763: Possible infinite loop in
 LLFloater::getClosableFloaterFromFocus

---
 linden/indra/llui/llfloater.cpp | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/linden/indra/llui/llfloater.cpp b/linden/indra/llui/llfloater.cpp
index bb42ca3..58c717a 100644
--- a/linden/indra/llui/llfloater.cpp
+++ b/linden/indra/llui/llfloater.cpp
@@ -1368,6 +1368,7 @@ LLFloater* LLFloater::getClosableFloaterFromFocus()
 
 	// The focused floater may not be closable,
 	// Find and close a parental floater that is closeable, if any.
+	LLFloater* prev_floater = NULL;
 	for(LLFloater* floater_to_close = focused_floater; 
 		NULL != floater_to_close; 
 		floater_to_close = gFloaterView->getParentFloater(floater_to_close))
@@ -1376,6 +1377,15 @@ LLFloater* LLFloater::getClosableFloaterFromFocus()
 		{
 			return floater_to_close;
 		}
+
+		// If floater has as parent root view	
+		// gFloaterView->getParentFloater(floater_to_close) returns
+		// the same floater_to_close, so we need to check this.
+		if (prev_floater == floater_to_close)
+		{
+			break;
+		}
+		prev_floater = floater_to_close;
 	}
 
 	return NULL;
-- 
cgit v1.1


From c196d23ec86e30adc3b62aa21f14aec7f0cbd0ad Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Tue, 5 Jul 2011 18:08:56 -0700
Subject: Fixed #1011: chat range options aren't saved in prefs > notifications

---
 linden/indra/newview/llpanelgeneral.cpp | 5 -----
 linden/indra/newview/llpanelmsgs.cpp    | 6 ++++++
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/linden/indra/newview/llpanelgeneral.cpp b/linden/indra/newview/llpanelgeneral.cpp
index ac957ed..9c5e993 100644
--- a/linden/indra/newview/llpanelgeneral.cpp
+++ b/linden/indra/newview/llpanelgeneral.cpp
@@ -99,9 +99,6 @@ BOOL LLPanelGeneral::postBuild()
 	childSetValue("afk_timeout_checkbox", gSavedSettings.getBOOL("AllowIdleAFK"));
 	childSetCommitCallback("afk_timeout_checkbox", onCommitAFKCheckbox, this);
 
-	childSetValue("mini_map_notify_chat", gSavedSettings.getBOOL("MiniMapNotifyChatRange"));
-	childSetValue("mini_map_notify_sim", gSavedSettings.getBOOL("MiniMapNotifySimRange"));
-
 // 	mDisplayNamesUsage =  gSavedSettings.getU32("DisplayNamesUsage");
 // 	mLegacyNamesForFriends =  gSavedSettings.getBOOL("LegacyNamesForFriends");
 
@@ -168,8 +165,6 @@ void LLPanelGeneral::apply()
 	//gSavedSettings.setBOOL("RenderHideGroupTitle", childGetValue("show_my_title_checkbox")); -- MC
 	gSavedSettings.setF32("AFKTimeout", 60 * childGetValue("afk_timeout_spinner").asReal()); // User enters minutes, we store as seconds -- MC
 	gSavedSettings.setBOOL("AllowIdleAFK", childGetValue("afk_timeout_checkbox"));
-	gSavedSettings.setBOOL("MiniMapNotifyChatRange", childGetValue("mini_map_notify_chat"));
-	gSavedSettings.setBOOL("MiniMapNotifySimRange", childGetValue("mini_map_notify_sim"));
 	gSavedSettings.setString("Language", childGetValue("language_combobox"));
 
 	/*
diff --git a/linden/indra/newview/llpanelmsgs.cpp b/linden/indra/newview/llpanelmsgs.cpp
index 572bcc3..ad8de87 100644
--- a/linden/indra/newview/llpanelmsgs.cpp
+++ b/linden/indra/newview/llpanelmsgs.cpp
@@ -72,6 +72,9 @@ BOOL LLPanelMsgs::postBuild()
 
 	childSetValue("friends_online_notify_checkbox", gSavedSettings.getBOOL("ChatOnlineNotification"));
 
+	childSetValue("mini_map_notify_chat", gSavedSettings.getBOOL("MiniMapNotifyChatRange"));
+	childSetValue("mini_map_notify_sim", gSavedSettings.getBOOL("MiniMapNotifySimRange"));
+
 	return TRUE;
 }
 
@@ -170,6 +173,9 @@ void LLPanelMsgs::apply()
 	gSavedSettings.setBOOL("NotifyMoneyChange", childGetValue("notify_money_change_checkbox"));
 
 	gSavedSettings.setBOOL("ChatOnlineNotification", childGetValue("friends_online_notify_checkbox").asBoolean());
+
+	gSavedSettings.setBOOL("MiniMapNotifyChatRange", childGetValue("mini_map_notify_chat"));
+	gSavedSettings.setBOOL("MiniMapNotifySimRange", childGetValue("mini_map_notify_sim"));
 }
 
 void LLPanelMsgs::cancel()
-- 
cgit v1.1


From a435295186fc501801bebcd2aea8b4ef76fb0a3b Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Tue, 5 Jul 2011 20:13:34 -0700
Subject: Added debug setting KeepUnpackedCacheFiles to keep unpacked script,
 sound, and avatar files in the cache between restarts

---
 linden/indra/newview/app_settings/settings.xml | 11 +++++++++++
 linden/indra/newview/llappviewer.cpp           | 14 +++++++++-----
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index 7d9a0ca..3d38a18 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -2574,6 +2574,17 @@
   
   <!-- Begin: cache clearing -->
 
+  <key>KeepUnpackedCacheFiles</key>
+  <map>
+    <key>Comment</key>
+    <string>If TRUE, the viewer won't delete unpacked cache files when logging out (improves overall performance and fixes sound bugs)</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Boolean</string>
+    <key>Value</key>
+    <integer>1</integer>
+  </map>
   <key>PurgeCacheOnStartup</key>
   <map>
     <key>Comment</key>
diff --git a/linden/indra/newview/llappviewer.cpp b/linden/indra/newview/llappviewer.cpp
index 62b6242..c10c79b 100644
--- a/linden/indra/newview/llappviewer.cpp
+++ b/linden/indra/newview/llappviewer.cpp
@@ -1298,13 +1298,17 @@ bool LLAppViewer::cleanup()
 	llinfos << "Settings patched up" << llendflush;
 
 	// delete some of the files left around in the cache.
-	removeCacheFiles("*.wav");
+	if (!gSavedSettings.getBOOL("KeepUnpackedCacheFiles"))
+	{
+		LL_INFOS("AppCache") << "Purging unpacked files..." << llendl;
+		removeCacheFiles("*.wav");
+		removeCacheFiles("*.lso");
+		removeCacheFiles("*.dsf");
+		removeCacheFiles("*.bodypart");
+		removeCacheFiles("*.clothing");
+	}
 	removeCacheFiles("*.tmp");
-	removeCacheFiles("*.lso");
 	removeCacheFiles("*.out");
-	removeCacheFiles("*.dsf");
-	removeCacheFiles("*.bodypart");
-	removeCacheFiles("*.clothing");
 
 	llinfos << "Cache files removed" << llendflush;
 
-- 
cgit v1.1


From 676beaab8d6f6717d15f4e6d30e08a428ba7c408 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Tue, 5 Jul 2011 20:07:38 -0700
Subject: Added clear sounds cache option

---
 linden/indra/newview/app_settings/settings.xml                | 11 +++++++++++
 linden/indra/newview/floatercache.cpp                         |  5 ++++-
 linden/indra/newview/llappviewer.cpp                          |  7 +++++++
 .../newview/skins/default/xui/en-us/floater_clear_cache.xml   |  7 +++++--
 4 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index 3d38a18..74750a6 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -2640,6 +2640,17 @@
     <key>Value</key>
     <integer>0</integer>
   </map>
+  <key>ClearSoundsCache</key>
+  <map>
+    <key>Comment</key>
+    <string>Clear cached sounds</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Boolean</string>
+    <key>Value</key>
+    <integer>0</integer>
+  </map>
   
   <!-- End: clear cache -->
 
diff --git a/linden/indra/newview/floatercache.cpp b/linden/indra/newview/floatercache.cpp
index 3d3091f..211fd5a 100644
--- a/linden/indra/newview/floatercache.cpp
+++ b/linden/indra/newview/floatercache.cpp
@@ -53,6 +53,7 @@ BOOL FloaterCache::postBuild()
 	getChild<LLCheckBoxCtrl>("object_cache")->setValue(gSavedSettings.getBOOL("ClearObjectCache"));
 	getChild<LLCheckBoxCtrl>("inv_cache")->setValue(gSavedSettings.getBOOL("ClearInvCache"));
 	getChild<LLCheckBoxCtrl>("name_cache")->setValue(gSavedSettings.getBOOL("ClearNameCache"));
+	getChild<LLCheckBoxCtrl>("sounds_cache")->setValue(gSavedSettings.getBOOL("ClearSoundsCache"));
 
 	childSetAction("btn_ok", onClickOK, this);
 	childSetAction("btn_cancel", onClickCancel, this);
@@ -70,13 +71,15 @@ void FloaterCache::onClickOK(void* data)
 		bool purge_objects = self->getChild<LLCheckBoxCtrl>("object_cache")->getValue().asBoolean();
 		bool purge_inv = self->getChild<LLCheckBoxCtrl>("inv_cache")->getValue().asBoolean();
 		bool purge_names = self->getChild<LLCheckBoxCtrl>("name_cache")->getValue().asBoolean();
+		bool purge_sounds = self->getChild<LLCheckBoxCtrl>("sounds_cache")->getValue().asBoolean();
 		
 		gSavedSettings.setBOOL("ClearTextureCache", purge_textures);
 		gSavedSettings.setBOOL("ClearObjectCache", purge_objects);
 		gSavedSettings.setBOOL("ClearInvCache", purge_inv);
 		gSavedSettings.setBOOL("ClearNameCache", purge_names);
+		gSavedSettings.setBOOL("ClearSoundsCache", purge_sounds);
 			
-		if (purge_textures || purge_objects || purge_inv || purge_names)
+		if (purge_textures || purge_objects || purge_inv || purge_names || purge_sounds)
 		{
 			// flag client cache for clearing next time the client runs
 			gSavedSettings.setBOOL("PurgeCacheOnNextStartup", TRUE);
diff --git a/linden/indra/newview/llappviewer.cpp b/linden/indra/newview/llappviewer.cpp
index c10c79b..5a398a5 100644
--- a/linden/indra/newview/llappviewer.cpp
+++ b/linden/indra/newview/llappviewer.cpp
@@ -3238,6 +3238,13 @@ void LLAppViewer::purgeCache()
 
 			gSavedSettings.setBOOL("ClearNameCache", FALSE);
 		}
+
+		if (gSavedSettings.getBOOL("ClearSoundsCache"))
+		{
+			removeCacheFiles("*.wav");
+			removeCacheFiles("*.dsf");
+			gSavedSettings.setBOOL("ClearSoundsCache", FALSE);
+		}
 	}
 }
 
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_clear_cache.xml b/linden/indra/newview/skins/default/xui/en-us/floater_clear_cache.xml
index e965b28..7974d85 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_clear_cache.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_clear_cache.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater bottom="-175" can_close="true" can_drag_on_left="false" can_minimize="true"
-     can_resize="false" follows="left|top" mouse_opaque="true" height="175" width="200"
+<floater bottom="-200" can_close="true" can_drag_on_left="false" can_minimize="true"
+     can_resize="false" follows="left|top" mouse_opaque="true" height="200" width="200"
      name="Clear Cache" title="Clear Disk Cache">
   <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
      bottom="-39" drop_shadow_visible="true" follows="left|top" font-style="BOLD|SHADOW"
@@ -19,6 +19,9 @@ You Restart Imprudence
      initial_value="false" label="Clear inventory cache" left_delta="0"
      mouse_opaque="true" name="inv_cache" width="185" />
   <check_box bottom_delta="-22" follows="left|top" font="SansSerifSmall" height="20"
+     initial_value="false" label="Clear sound cache" left_delta="0"
+     mouse_opaque="true" name="sounds_cache" width="185" />
+  <check_box bottom_delta="-22" follows="left|top" font="SansSerifSmall" height="20"
      initial_value="false" label="Clear avatar name cache" left_delta="0"
      mouse_opaque="true" name="name_cache" width="185" />
   <button bottom_delta="-30" follows="right|top" font="SansSerif" halign="center" height="22"
-- 
cgit v1.1


From 0512d1cb6befcd5e291b4c9c9db4df9f9de04db1 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Tue, 5 Jul 2011 20:33:04 -0700
Subject: A little cleanup for cache clearing

---
 linden/indra/newview/llappviewer.cpp | 37 +++++++++++-------------------------
 1 file changed, 11 insertions(+), 26 deletions(-)

diff --git a/linden/indra/newview/llappviewer.cpp b/linden/indra/newview/llappviewer.cpp
index 5a398a5..b96f6c2 100644
--- a/linden/indra/newview/llappviewer.cpp
+++ b/linden/indra/newview/llappviewer.cpp
@@ -3188,8 +3188,7 @@ void LLAppViewer::purgeCache()
 	if (gSavedSettings.getBOOL("PurgeCacheOnStartup")) // purging from cmd line
 	{
 		LLAppViewer::getTextureCache()->purgeCache(LL_PATH_CACHE);
-		std::string mask = gDirUtilp->getDirDelimiter() + "*.*";
-		gDirUtilp->deleteFilesInDir(gDirUtilp->getExpandedFilename(LL_PATH_CACHE, ""), mask);
+		removeCacheFiles("*.*");
 	}
 	else // purging cache from ui
 	{
@@ -3201,41 +3200,27 @@ void LLAppViewer::purgeCache()
 
 		if (gSavedSettings.getBOOL("ClearObjectCache"))
 		{
-			std::string mask = gDirUtilp->getDirDelimiter() + "*.slc";
-			gDirUtilp->deleteFilesInDir(gDirUtilp->getExpandedFilename(LL_PATH_CACHE, ""), mask);
+			removeCacheFiles("*.slc");
 			gSavedSettings.setBOOL("ClearObjectCache", FALSE);
 		}
 
 		if (gSavedSettings.getBOOL("ClearInvCache"))
 		{
-			std::vector<std::string> masks;
-			masks.push_back(gDirUtilp->getDirDelimiter() + "*.inv.gz");
-			masks.push_back(gDirUtilp->getDirDelimiter() + VFS_DATA_FILE_BASE + "*");
-			masks.push_back(gDirUtilp->getDirDelimiter() + VFS_INDEX_FILE_BASE + "*");
-			
-			for (std::vector<std::string>::iterator vIt = masks.begin(); 
-				vIt != masks.end(); ++vIt)
-			{
-				gDirUtilp->deleteFilesInDir(gDirUtilp->getExpandedFilename(LL_PATH_CACHE, ""), (*vIt));
-			}
-
+			removeCacheFiles("*.inv.gz");
+			removeCacheFiles(std::string(VFS_DATA_FILE_BASE) + "*");
+			removeCacheFiles(std::string(VFS_INDEX_FILE_BASE) + "*");
+			removeCacheFiles("*.lso");
+			removeCacheFiles("*.bodypart");
+			removeCacheFiles("*.clothing");
 			gSavedSettings.setBOOL("ClearInvCache", FALSE);
 		}
 
 		if (gSavedSettings.getBOOL("ClearNameCache"))
 		{
 			// ick @ not making these variables -- MC
-			std::vector<std::string> masks;
-			masks.push_back(gDirUtilp->getDirDelimiter() + "name.cache");
-			masks.push_back(gDirUtilp->getDirDelimiter() + "avatar_name_cache.xml");
-			masks.push_back(gDirUtilp->getDirDelimiter() + "*.cached_mute");
-			
-			for (std::vector<std::string>::iterator vIt = masks.begin(); 
-				vIt != masks.end(); ++vIt)
-			{
-				gDirUtilp->deleteFilesInDir(gDirUtilp->getExpandedFilename(LL_PATH_CACHE, ""), (*vIt));
-			}
-
+			removeCacheFiles("name.cache");
+			removeCacheFiles("avatar_name_cache.xml");
+			removeCacheFiles("*.cached_mute");
 			gSavedSettings.setBOOL("ClearNameCache", FALSE);
 		}
 
-- 
cgit v1.1


From 534767ef00ccac5a5c5edd60f93df25648c4716a Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Fri, 8 Jul 2011 13:29:53 -0700
Subject: Only check if an object is above SculptSAThresh if it's an actual
 sculptie

---
 linden/indra/newview/app_settings/logcontrol.xml |  1 +
 linden/indra/newview/llvovolume.cpp              | 14 ++++++++++----
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/linden/indra/newview/app_settings/logcontrol.xml b/linden/indra/newview/app_settings/logcontrol.xml
index 50f8ba5..def847b 100644
--- a/linden/indra/newview/app_settings/logcontrol.xml
+++ b/linden/indra/newview/app_settings/logcontrol.xml
@@ -87,6 +87,7 @@
 							<!--<string>VOAvatar</string>-->
 							<!--<string>View</string>-->
 							<!--<string>ViewerImages</string>-->
+              <!--<string>Volume</string>-->
               <!--<string>TextureCache</string>-->
               <!--<string>Throttle</string>-->
 							<!--<string>Voice</string>-->
diff --git a/linden/indra/newview/llvovolume.cpp b/linden/indra/newview/llvovolume.cpp
index 8d5bfb4..77201da 100644
--- a/linden/indra/newview/llvovolume.cpp
+++ b/linden/indra/newview/llvovolume.cpp
@@ -2308,16 +2308,22 @@ void LLVolumeGeometryManager::rebuildGeom(LLSpatialGroup* group)
 
 		LLVOVolume* vobj = drawablep->getVOVolume();
 
-		if (vobj->mSculptSurfaceArea > sSculptSAThresh)
+		llassert_always(vobj);
+
+		if (vobj->isSculpted() && vobj->mSculptSurfaceArea > sSculptSAThresh)
 		{
 		    LLPipeline::sSculptSurfaceAreaFrame += vobj->mSculptSurfaceArea;
-		    if(LLPipeline::sSculptSurfaceAreaFrame > sSculptSAMax)
+		    if (LLPipeline::sSculptSurfaceAreaFrame > sSculptSAMax)
 		    {
-		      continue;
+				LL_DEBUGS("Volume") << "Sculptie (" 
+									<< vobj->getID() << ") above RenderSculptSAMax ("
+									<< sSculptSAMax
+									<< ")! Turning invisible!" 
+									<< LL_ENDL;
+				continue;
 		    }
 		}
 		
-		llassert_always(vobj);
 		vobj->updateTextureVirtualSize();
 		vobj->preRebuild();
 
-- 
cgit v1.1


From 14f4622c3b836caafea64a260a00a5f5a9f103f9 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Fri, 8 Jul 2011 14:48:05 -0700
Subject: Added debug settings RenderSculptSAThreshold and RenderSculptSAMax.
 Adjust these if sculpties ever go invisible that shouldn't

---
 linden/indra/newview/app_settings/settings.xml | 22 ++++++++++++++++++++++
 linden/indra/newview/llappviewer.cpp           |  2 ++
 linden/indra/newview/llviewercontrol.cpp       | 14 ++++++++++++++
 linden/indra/newview/llvovolume.cpp            | 13 ++++++-------
 linden/indra/newview/llvovolume.h              |  3 +++
 5 files changed, 47 insertions(+), 7 deletions(-)

diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index 74750a6..e03e1f3 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -1097,6 +1097,28 @@
     <key>Value</key>
     <integer>1</integer>
   </map>
+  <key>RenderSculptSAMax</key>
+  <map>
+    <key>Comment</key>
+    <string>The maximum combined surface area of sculpts(per frame) that are above the threshold before they stop being rendered</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>F32</string>
+    <key>Value</key>
+    <integer>50000</integer>
+  </map>
+  <key>RenderSculptSAThreshold</key>
+  <map>
+    <key>Comment</key>
+    <string>Surface area at which sculpts are considered for not being rendered</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>F32</string>
+    <key>Value</key>
+    <integer>1750</integer>
+  </map>
   <key>RenderWaterVoidCulling</key>
   <map>
     <key>Comment</key>
diff --git a/linden/indra/newview/llappviewer.cpp b/linden/indra/newview/llappviewer.cpp
index b96f6c2..519fa62 100644
--- a/linden/indra/newview/llappviewer.cpp
+++ b/linden/indra/newview/llappviewer.cpp
@@ -422,6 +422,8 @@ static void settings_to_globals()
 	LLVOTree::sTreeFactor				= gSavedSettings.getF32("RenderTreeLODFactor");
 	LLVOAvatar::sLODFactor				= gSavedSettings.getF32("RenderAvatarLODFactor");
 	LLVOAvatar::sMaxVisible				= gSavedSettings.getS32("RenderAvatarMaxVisible");
+	LLVOVolume::sSculptSAThresh			= gSavedSettings.getF32("RenderSculptSAThreshold");
+	LLVOVolume::sSculptSAMax			= gSavedSettings.getF32("RenderSculptSAMax");
 	LLVOAvatar::sVisibleInFirstPerson	= gSavedSettings.getBOOL("FirstPersonAvatarVisible");
 	// clamp auto-open time to some minimum usable value
 	LLFolderView::sAutoOpenTime			= llmax(0.25f, gSavedSettings.getF32("FolderAutoOpenDelay"));
diff --git a/linden/indra/newview/llviewercontrol.cpp b/linden/indra/newview/llviewercontrol.cpp
index 0a23045..4c81e71 100644
--- a/linden/indra/newview/llviewercontrol.cpp
+++ b/linden/indra/newview/llviewercontrol.cpp
@@ -530,6 +530,18 @@ bool handleSliderScrollWheelMultiplierChanged(const LLSD& newvalue)
 	return true;
 }
 
+bool handleRenderSculptSAThresholdChanged(const LLSD& newvalue)
+{
+	LLVOVolume::sSculptSAThresh = newvalue.asReal();
+	return true;
+}
+
+bool handleRenderSculptSAMaxChanged(const LLSD& newvalue)
+{
+	LLVOVolume::sSculptSAMax = newvalue.asReal();
+	return true;
+}
+
 
 ////////////////////////////////////////////////////////////////////////////
 
@@ -676,6 +688,8 @@ void settings_setup_listeners()
 	gSavedSettings.getControl("LipSyncEnabled")->getSignal()->connect(boost::bind(&handleVoiceClientPrefsChanged, _1));	
 	gSavedSettings.getControl("SliderScrollWheelMultiplier")->getSignal()->connect(boost::bind(&handleSliderScrollWheelMultiplierChanged, _1));	
 	gSavedSettings.getControl("TranslateChat")->getSignal()->connect(boost::bind(&handleTranslateChatPrefsChanged, _1));	
+	gSavedSettings.getControl("RenderSculptSAThreshold")->getSignal()->connect(boost::bind(&handleRenderSculptSAThresholdChanged, _1));
+	gSavedSettings.getControl("RenderSculptSAMax")->getSignal()->connect(boost::bind(&handleRenderSculptSAMaxChanged, _1));
 }
 
 template <> eControlType get_control_type<U32>(const U32& in, LLSD& out) 
diff --git a/linden/indra/newview/llvovolume.cpp b/linden/indra/newview/llvovolume.cpp
index 77201da..d40ee99 100644
--- a/linden/indra/newview/llvovolume.cpp
+++ b/linden/indra/newview/llvovolume.cpp
@@ -71,10 +71,6 @@
 const S32 MIN_QUIET_FRAMES_COALESCE = 30;
 const F32 FORCE_SIMPLE_RENDER_AREA = 512.f;
 const F32 FORCE_CULL_AREA = 8.f;
-
-static const F32 sSculptSAThresh = 1750.f;	// Surface area at which sculpts are considered for not being rendered
-static const F32 sSculptSAMax = 50000.f;	// The maximum combined surface area of sculpts(per frame) that are above the 
-											// threshold before they stop being rendered
 		
 BOOL gAnimateTextures = TRUE;
 extern BOOL gHideSelectedObjects;
@@ -83,6 +79,9 @@ F32 LLVOVolume::sLODFactor = 1.f;
 F32	LLVOVolume::sLODSlopDistanceFactor = 0.5f; //Changing this to zero, effectively disables the LOD transition slop 
 F32 LLVOVolume::sDistanceFactor = 1.0f;
 S32 LLVOVolume::sNumLODChanges = 0;
+F32 LLVOVolume::sSculptSAThresh = 1750.f;
+F32 LLVOVolume::sSculptSAMax = 50000.f;
+
 
 LLVOVolume::LLVOVolume(const LLUUID &id, const LLPCode pcode, LLViewerRegion *regionp)
 	: LLViewerObject(id, pcode, regionp),
@@ -2310,14 +2309,14 @@ void LLVolumeGeometryManager::rebuildGeom(LLSpatialGroup* group)
 
 		llassert_always(vobj);
 
-		if (vobj->isSculpted() && vobj->mSculptSurfaceArea > sSculptSAThresh)
+		if (vobj->isSculpted() && vobj->mSculptSurfaceArea > LLVOVolume::sSculptSAThresh)
 		{
 		    LLPipeline::sSculptSurfaceAreaFrame += vobj->mSculptSurfaceArea;
-		    if (LLPipeline::sSculptSurfaceAreaFrame > sSculptSAMax)
+		    if (LLPipeline::sSculptSurfaceAreaFrame > LLVOVolume::sSculptSAMax)
 		    {
 				LL_DEBUGS("Volume") << "Sculptie (" 
 									<< vobj->getID() << ") above RenderSculptSAMax ("
-									<< sSculptSAMax
+									<< LLVOVolume::sSculptSAMax
 									<< ")! Turning invisible!" 
 									<< LL_ENDL;
 				continue;
diff --git a/linden/indra/newview/llvovolume.h b/linden/indra/newview/llvovolume.h
index 2da1d7a..25f5d95 100644
--- a/linden/indra/newview/llvovolume.h
+++ b/linden/indra/newview/llvovolume.h
@@ -247,6 +247,9 @@ public:
 	static F32 sLODSlopDistanceFactor;// Changing this to zero, effectively disables the LOD transition slop 
 	static F32 sLODFactor;				// LOD scale factor
 	static F32 sDistanceFactor;			// LOD distance factor
+	static F32 sSculptSAThresh;		// Surface area at which sculpts are considered for not being rendered
+	static F32 sSculptSAMax;		// The maximum combined surface area of sculpts(per frame) that are above the 
+									// threshold before they stop being rendered
 		
 protected:
 	static S32 sNumLODChanges;
-- 
cgit v1.1


From 505b067191c29e798987722b92d7af2b92515109 Mon Sep 17 00:00:00 2001
From: thickbrick
Date: Sat, 9 Jul 2011 00:38:11 +0300
Subject: Fix #985: Crash after teleport

Stale LLVOVolume pointer was caused by a leftover from porting
the sculpt->volumes list from V2, which I forgot to port. Needed for
correct volume accounting.
---
 linden/indra/newview/llvovolume.cpp | 14 ++++++++++++++
 linden/indra/newview/llvovolume.h   |  1 +
 2 files changed, 15 insertions(+)

diff --git a/linden/indra/newview/llvovolume.cpp b/linden/indra/newview/llvovolume.cpp
index d40ee99..b422c51 100644
--- a/linden/indra/newview/llvovolume.cpp
+++ b/linden/indra/newview/llvovolume.cpp
@@ -108,6 +108,20 @@ LLVOVolume::~LLVOVolume()
 	mVolumeImpl = NULL;
 }
 
+// virtual
+void LLVOVolume::markDead()
+{
+	if (!mDead)
+	{
+		if (mSculptTexture.notNull())
+		{
+			mSculptTexture->removeVolume(this);
+		}
+	}
+
+	LLViewerObject::markDead();
+}
+
 
 // static
 void LLVOVolume::initClass()
diff --git a/linden/indra/newview/llvovolume.h b/linden/indra/newview/llvovolume.h
index 25f5d95..2f53bea 100644
--- a/linden/indra/newview/llvovolume.h
+++ b/linden/indra/newview/llvovolume.h
@@ -91,6 +91,7 @@ public:
 
 public:
 						LLVOVolume(const LLUUID &id, const LLPCode pcode, LLViewerRegion *regionp);
+	/*virtual*/ void markDead();		// Override (and call through to parent) to clean up sculpt texture references
 
 	/*virtual*/ LLDrawable* createDrawable(LLPipeline *pipeline);
 
-- 
cgit v1.1


From 0eb356875bfa7681f2f28bc17545c77fdd9c1881 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Fri, 8 Jul 2011 21:54:09 -0700
Subject: Updated the way the Windows installer handles the VC++ redist files.
 Includes the following changes:

* Updated the VC++ 2005 redist to 8.0.50727.6195. Installers created under Win7 should now work under XP.
* Added 2008 redist to the repo in case we ever need it/people who fork from us want to use it 2008 instead of 2005.
* Added a check to see if we should install redstributables for 2005/2008 or not.
* Fixed issue with the 2005 redist not installing when it should under Vista/7.
* The installer now copies redistributables to a new subfolder: 'redist'. Anyone having 'application configuration' errors should be told to run the files in there
---
 .../windows/imprudence_installer_script.iss        |  79 ++++++++++++++++++---
 .../installers/windows/vcredist_x86_VS2005_SP1.exe | Bin 2686232 -> 0 bytes
 .../windows/vcredist_x86_VS2005_SP1_MFC_SEC.EXE    | Bin 0 -> 2707352 bytes
 .../windows/vcredist_x86_VS2008_SP1_ATL_SEC.exe    | Bin 0 -> 4485976 bytes
 4 files changed, 71 insertions(+), 8 deletions(-)
 delete mode 100644 linden/indra/newview/installers/windows/vcredist_x86_VS2005_SP1.exe
 create mode 100644 linden/indra/newview/installers/windows/vcredist_x86_VS2005_SP1_MFC_SEC.EXE
 create mode 100644 linden/indra/newview/installers/windows/vcredist_x86_VS2008_SP1_ATL_SEC.exe

diff --git a/linden/indra/newview/installers/windows/imprudence_installer_script.iss b/linden/indra/newview/installers/windows/imprudence_installer_script.iss
index 783ea0f..e463640 100644
--- a/linden/indra/newview/installers/windows/imprudence_installer_script.iss
+++ b/linden/indra/newview/installers/windows/imprudence_installer_script.iss
@@ -1,4 +1,4 @@
-; InWorldz inno setup installer script by McCabe Maxsted
+; Imprudence inno setup installer script by McCabe Maxsted
 ; This script only works with VS2005, currently
 
 [Setup]
@@ -32,7 +32,7 @@ SetupIconFile=..\windows\imp_icon.ico
 Compression=lzma2/ultra64
 InternalCompressLevel=ultra64
 SolidCompression=true
-;PrivilegesRequired=poweruser
+PrivilegesRequired=poweruser
 AllowRootDirectory=true
 WizardImageFile=..\windows\imprudence_installer_icon_left.bmp
 WizardSmallImageFile=..\windows\imprudence_installer_icon_right.bmp
@@ -142,10 +142,10 @@ Source: ..\..\..\build-vc80\newview\release\package\SLVoice.exe; DestDir: {app};
 Source: ..\..\..\build-vc80\newview\release\package\vivoxsdk.dll; DestDir: {app}; Flags: ignoreversion
 Source: ..\..\..\build-vc80\newview\release\package\wrap_oal.dll; DestDir: {app}; Flags: ignoreversion
 
-; VC++ 2005 SP1 x86 and VC++ 2010 SP1 x86 redist
-; TODO: add checking for VS2005. See http://blogs.msdn.com/b/astebner/archive/2007/01/16/mailbag-how-to-detect-the-presence-of-the-vc-8-0-runtime-redistributable-package.aspx and
-Source: ..\windows\vcredist_x86_VS2005_SP1.exe; DestDir: {tmp}; DestName: vcredist_x86_VS2005_SP1.exe
-Source: ..\windows\vcredist_x86_VS2010_SP1.exe; DestDir: {tmp}; DestName: vcredist_x86_VS2010_SP1.exe
+; VC++ 2005 SP1 x86, VC++ 2008 SP1 x86, and VC++ 2010 SP1 x86 redist
+Source: ..\windows\vcredist_x86_VS2005_SP1_MFC_SEC.exe; DestDir: {app}\redist; DestName: vcredist_x86_VS2005_SP1_MFC_SEC.exe
+;Source: ..\windows\vcredist_x86_VS2008_SP1_ATL_SEC.exe; DestDir: {app}\redist; DestName: vcredist_x86_VS2008_SP1_ATL_SEC.exe
+Source: ..\windows\vcredist_x86_VS2010_SP1.exe; DestDir: {app}\redist; DestName: vcredist_x86_VS2010_SP1.exe
 
 ; Old files we don't use anymore:
 ; Source: ..\..\..\build-vc80\newview\release\package\dronesettings.xml; DestDir: {app}; Flags: ignoreversion
@@ -176,8 +176,17 @@ Name: {group}\Imprudence; Filename: {app}\imprudence.exe; WorkingDir: {app}; Com
 [Run]
 Filename: {app}\imprudence.exe; WorkingDir: {app}; Flags: nowait postinstall
 Filename: {app}\imprudence.url; WorkingDir: {app}; Flags: nowait postinstall shellexec; Description: See what makes Imprudence different
-Filename: {tmp}\vcredist_x86_VS2005_SP1.exe; Parameters: "/q:a /c:""VCREDI~1.EXE /q:a /c:""""msiexec /i vcredist.msi /qn"""" """; Flags: runhidden
-Filename: {tmp}\vcredist_x86_VS2010_SP1.exe; Parameters: "/q /norestart"; Check: Needs2010Redist; Flags: runhidden
+
+; Install redistributables. 
+;
+;     !!!!BEWARE!!!! 
+;
+; Command line parameters and filenames WILL change with each version. Blame Microsoft.
+
+; Always use /q for VS2005 rather than something quieter such as Parameters: "/q:a c:""msiexec /i vcredist.msi /qn"" ". The redist will fail sometimes if you do otherwise.
+Filename: {app}\redist\vcredist_x86_VS2005_SP1_MFC_SEC.exe; Parameters: "/q"; Check: Needs2005Redist; Flags: runhidden
+;Filename: {app}\redist\vcredist_x86_VS2008_SP1_ATL_SEC.exe; Parameters: "/q"; Check: Needs2008Redist; Flags: runhidden
+Filename: {app}\redist\vcredist_x86_VS2010_SP1.exe; Parameters: "/q /norestart"; Check: Needs2010Redist; Flags: runhidden
 
 [UninstallDelete]
 Name: {userappdata}\Imprudence\user_settings\password.dat; Type: files; Languages: 
@@ -308,4 +317,58 @@ end;
 function Needs2010Redist(): Boolean;
 begin
   Result := (IsVS2010RedistInstalled = FALSE);
+  if (Result = TRUE) then begin
+    Log('User system needs VS 2010 SP1 x86 Redistributable, installing.');
+  end else begin
+    Log('User already has VS 2010 SP1 x86 Redistributable installed, skipping.');
+  end
+end;
+
+// VS2008 and 2005 x86 redists. Always look for the latest version we know about. I wish there were a better way to check for these
+const
+  VS2005_X86 =              '{A49F249F-0C91-497F-86DF-B2585E8E76B7}';    // http://www.microsoft.com/downloads/details.aspx?familyid=32BC1BEE-A3F9-4C13-9C99-220B62A191EE
+  VS2005_SP1_X86 =          '{7299052B-02A4-4627-81F2-1818DA5D550D}';    // 8.0.50727.762: http://www.microsoft.com/downloads/details.aspx?FamilyID=200B2FD9-AE1A-4A14-984D-389C36F85647
+  VS2005_SP1_X86_ATL_SEC =  '{837B34E3-7C30-493C-8F6A-2B0F04E2912C}';    // 8.0.50727.4053: http://www.microsoft.com/download/en/details.aspx?displaylang=en&id=14431
+  VS2005_SP1_X86_MFC_SEC =  '{710f4c1c-cc18-4c49-8cbf-51240c89a1a2}';    // 8.0.50727.6195: http://www.microsoft.com/download/en/details.aspx?displaylang=en&id=26347     
+  
+  VS2008_X86 =              '{FF66E9F6-83E7-3A3E-AF14-8DE9A809A6A4}';    // http://www.microsoft.com/downloads/details.aspx?FamilyID=9b2da534-3e03-4391-8a4d-074b9f2bc1bf
+  VS2008_SP1_X86 =          '{9A25302D-30C0-39D9-BD6F-21E6EC160475}';    // 9.0.30729.17: http://www.microsoft.com/downloads/details.aspx?familyid=A5C84275-3B97-4AB7-A40D-3802B2AF5FC2
+  VS2008_SP1_X86_ATL_SEC =  '{1F1C2DFC-2D24-3E06-BCB8-725134ADF989}';    // 9.0.30729.4148: http://www.microsoft.com/downloads/details.aspx?familyid=2051A0C1-C9B5-4B0A-A8F5-770A549FD78C
+  // These updates currently don't have redist links:
+  // 9.0.30729.5026:
+  // 9.0.30729.5570: 
+  // 9.0.30729.6161: http://support.microsoft.com/kb/2538243
+
+  INSTALLSTATE_INVALIDARG	= -2;	  // An invalid parameter was passed to the function
+  INSTALLSTATE_UNKNOWN	  = -1;   // The product is not advertised or installed
+  INSTALLSTATE_ADVERTISED	= 1;	  // The product is advertised but not installed
+  INSTALLSTATE_ABSENT	    = 2;	  // The product is installed for a different user
+  INSTALLSTATE_DEFAULT	  = 5;    // The product is installed for the current user
+
+function MsiQueryProductState(ProductCode: String): Integer;
+  external 'MsiQueryProductStateA@msi.dll stdcall';
+
+function IsProductCodeInstalled(ProductUUID: String): Boolean;
+begin
+  Result := (MsiQueryProductState(ProductUUID) = INSTALLSTATE_DEFAULT);
+end;
+
+function Needs2005Redist(): Boolean;
+begin
+  Result:= (IsProductCodeInstalled(VS2005_SP1_X86_MFC_SEC) = FALSE);
+  if (Result = TRUE) then begin
+    Log('User system needs VS 2005 SP1 x86 Redistributable, installing.');
+  end else begin
+    Log('User already has VS 2005 SP1 x86 Redistributable installed, skipping.');
+  end
+end;
+
+function Needs2008Redist(): Boolean;
+begin
+  Result := (IsProductCodeInstalled(VS2008_SP1_X86_ATL_SEC) = FALSE);
+  if (Result = TRUE) then begin
+    Log('User system needs VS 2008 SP1 x86 Redistributable, installing.');
+  end else begin
+    Log('User already has VS 2008 SP1 x86 Redistributable installed, skipping.');
+  end
 end;
diff --git a/linden/indra/newview/installers/windows/vcredist_x86_VS2005_SP1.exe b/linden/indra/newview/installers/windows/vcredist_x86_VS2005_SP1.exe
deleted file mode 100644
index 1421c29..0000000
Binary files a/linden/indra/newview/installers/windows/vcredist_x86_VS2005_SP1.exe and /dev/null differ
diff --git a/linden/indra/newview/installers/windows/vcredist_x86_VS2005_SP1_MFC_SEC.EXE b/linden/indra/newview/installers/windows/vcredist_x86_VS2005_SP1_MFC_SEC.EXE
new file mode 100644
index 0000000..8cd783c
Binary files /dev/null and b/linden/indra/newview/installers/windows/vcredist_x86_VS2005_SP1_MFC_SEC.EXE differ
diff --git a/linden/indra/newview/installers/windows/vcredist_x86_VS2008_SP1_ATL_SEC.exe b/linden/indra/newview/installers/windows/vcredist_x86_VS2008_SP1_ATL_SEC.exe
new file mode 100644
index 0000000..378e7f0
Binary files /dev/null and b/linden/indra/newview/installers/windows/vcredist_x86_VS2008_SP1_ATL_SEC.exe differ
-- 
cgit v1.1


From 5ce3a3e900d1a780ff7736546bb393563826f462 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Tue, 12 Jul 2011 16:08:40 -0700
Subject: Updated the experimental installer script

---
 .../imprudence_installer_script_experimental.iss   | 120 +++++++++++++++++++--
 1 file changed, 111 insertions(+), 9 deletions(-)

diff --git a/linden/indra/newview/installers/windows/imprudence_installer_script_experimental.iss b/linden/indra/newview/installers/windows/imprudence_installer_script_experimental.iss
index 99eb4fe..400eb48 100644
--- a/linden/indra/newview/installers/windows/imprudence_installer_script_experimental.iss
+++ b/linden/indra/newview/installers/windows/imprudence_installer_script_experimental.iss
@@ -1,5 +1,5 @@
-; Script generated by the Inno Setup Script Wizard.
-; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
+; Imprudence inno setup installer script by McCabe Maxsted
+; This script only works with VS2005, currently
 
 [Setup]
 ; NOTE: The value of AppId uniquely identifies this application.
@@ -17,15 +17,14 @@ OutputBaseFilename=Imprudence-1.4.0-Experimental-2011.04.19-Setup
 VersionInfoVersion=1.4.0
 VersionInfoTextVersion=1.4.0
 VersionInfoProductVersion=1.4.0
+AppVersion=1.4.0
 VersionInfoCopyright=2011
-AppCopyright=2011
 
 ; These won't change
 VersionInfoCompany=Imprudence
 AppPublisher=The Imprudence Project
 AppPublisherURL=http://kokuaviewer.org
 AppSupportURL=http://kokuaviewer.org
-AppUpdatesURL=http://kokuaviewer.org
 AllowNoIcons=true
 InfoAfterFile=..\..\..\..\..\README.txt
 OutputDir=C:\imprudence_installers
@@ -33,11 +32,13 @@ SetupIconFile=..\windows\imp_icon.ico
 Compression=lzma2/ultra64
 InternalCompressLevel=ultra64
 SolidCompression=true
-;PrivilegesRequired=poweruser
+PrivilegesRequired=poweruser
 AllowRootDirectory=true
 WizardImageFile=..\windows\imprudence_installer_icon_left.bmp
 WizardSmallImageFile=..\windows\imprudence_installer_icon_right.bmp
 SetupLogging=true
+RestartIfNeededByRun=false
+AlwaysRestart=false
 
 [Languages]
 Name: english; MessagesFile: compiler:Default.isl
@@ -141,8 +142,10 @@ Source: ..\..\..\build-vc80\newview\release\package\SLVoice.exe; DestDir: {app};
 Source: ..\..\..\build-vc80\newview\release\package\vivoxsdk.dll; DestDir: {app}; Flags: ignoreversion
 Source: ..\..\..\build-vc80\newview\release\package\wrap_oal.dll; DestDir: {app}; Flags: ignoreversion
 
-; VC++ 2005 x86 redist
-Source: ..\windows\vcredist_x86_VS2005.exe; DestDir: {tmp}; DestName: vcredist_x86_2005.exe
+; VC++ 2005 SP1 x86, VC++ 2008 SP1 x86, and VC++ 2010 SP1 x86 redist
+Source: ..\windows\vcredist_x86_VS2005_SP1_MFC_SEC.exe; DestDir: {app}\redist; DestName: vcredist_x86_VS2005_SP1_MFC_SEC.exe
+;Source: ..\windows\vcredist_x86_VS2008_SP1_ATL_SEC.exe; DestDir: {app}\redist; DestName: vcredist_x86_VS2008_SP1_ATL_SEC.exe
+Source: ..\windows\vcredist_x86_VS2010_SP1.exe; DestDir: {app}\redist; DestName: vcredist_x86_VS2010_SP1.exe
 
 ; Old files we don't use anymore:
 ; Source: ..\..\..\build-vc80\newview\release\package\dronesettings.xml; DestDir: {app}; Flags: ignoreversion
@@ -173,7 +176,17 @@ Name: {group}\Imprudence Experimental; Filename: {app}\imprudence.exe; WorkingDi
 [Run]
 Filename: {app}\imprudence.exe; WorkingDir: {app}; Flags: nowait postinstall
 Filename: {app}\imprudence.url; WorkingDir: {app}; Flags: nowait postinstall shellexec; Description: See what makes Imprudence different
-Filename: {tmp}\vcredist_x86_2005.exe; Parameters: "/q:a /c:""VCREDI~1.EXE /q:a /c:""""msiexec /i vcredist.msi /qn"""" """; Flags: runhidden
+
+; Install redistributables. 
+;
+;     !!!!BEWARE!!!! 
+;
+; Command line parameters and filenames WILL change with each version. Blame Microsoft.
+
+; Always use /q for VS2005 rather than something quieter such as Parameters: "/q:a c:""msiexec /i vcredist.msi /qn"" ". The redist will fail sometimes if you do otherwise.
+Filename: {app}\redist\vcredist_x86_VS2005_SP1_MFC_SEC.exe; Parameters: "/q"; Check: Needs2005Redist; Flags: runhidden
+;Filename: {app}\redist\vcredist_x86_VS2008_SP1_ATL_SEC.exe; Parameters: "/q"; Check: Needs2008Redist; Flags: runhidden
+Filename: {app}\redist\vcredist_x86_VS2010_SP1.exe; Parameters: "/q /norestart"; Check: Needs2010Redist; Flags: runhidden
 
 [UninstallDelete]
 Name: {userappdata}\Imprudence\user_settings\password.dat; Type: files; Languages: 
@@ -192,7 +205,11 @@ Name: C:\Documents and Settings\{username}\.gstreamer-0.10; Type: filesandordirs
 ; Name: {app}\*.dll; Type: files; Tasks: ; Languages:
 Name: {app}\lib\gstreamer-plugins\*; Type: filesandordirs; Tasks: ; Languages: 
 ; Name: {app}\skins\default\xui\*; Type: filesandordirs; Tasks: ; Languages:
-; Name: {app}\skins\silver\xui\*; Type: filesandordirs; Tasks: ; Languages:
+; Old xui skin files can cause bugs, always kill them
+Name: {app}\skins\silver\xui\en-us\*; Type: filesandordirs; Tasks: ; Languages:
+Name: {app}\app_settings\mozilla; Type: filesandordirs; Tasks: ; Languages:
+Name: {app}\app_settings\mozilla_debug; Type: filesandordirs; Tasks: ; Languages:
+Name: {app}\app_settings\viewerversion.xml; Type: filesandordirs; Tasks: ; Languages:
 Name: C:\Documents and Settings\{username}\.gstreamer-0.10\*; Type: filesandordirs
 Name: C:\Users\{username}\.gstreamer-0.10\*; Type: filesandordirs
 ; Breaks the browser if installing on top of 1.1:
@@ -270,3 +287,88 @@ Name: {app}\msvcp80.dll; Type: files; Tasks: ; Languages:
 Name: {app}\msvcr80.dll; Type: files; Tasks: ; Languages:
 Name: {app}\msvcr71.dll; Type: files; Tasks: ; Languages:
 Name: {app}\imprudence.exe.config; Type: files; Tasks: ; Languages:
+
+
+[Code]
+// [HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\VisualStudio\10.0\VC\VCRedist\x86] 
+//   Installed = 1 (REG_DWORD)
+function IsVS2010RedistInstalled(): Boolean;
+var
+  V: Cardinal;
+  Success: Boolean;
+begin
+  if IsWin64 then begin
+    Success := RegQueryDWordValue(HKLM64, 'SOFTWARE\Microsoft\VisualStudio\10.0\VC\VCRedist\x86', 'Installed', V);
+  end else begin
+    Success := RegQueryDWordValue(HKLM, 'SOFTWARE\Microsoft\VisualStudio\10.0\VC\VCRedist\x86', 'Installed', V);
+  end
+
+  if Success = TRUE then begin
+    if V = 1 then begin
+      Result := TRUE;
+    end else begin
+      Result := FALSE;
+    end
+  end else begin
+    Result := FALSE;
+  end
+end;
+
+function Needs2010Redist(): Boolean;
+begin
+  Result := (IsVS2010RedistInstalled = FALSE);
+  if (Result = TRUE) then begin
+    Log('User system needs VS 2010 SP1 x86 Redistributable, installing.');
+  end else begin
+    Log('User already has VS 2010 SP1 x86 Redistributable installed, skipping.');
+  end
+end;
+
+// VS2008 and 2005 x86 redists. Always look for the latest version we know about. I wish there were a better way to check for these
+const
+  VS2005_X86 =              '{A49F249F-0C91-497F-86DF-B2585E8E76B7}';    // http://www.microsoft.com/downloads/details.aspx?familyid=32BC1BEE-A3F9-4C13-9C99-220B62A191EE
+  VS2005_SP1_X86 =          '{7299052B-02A4-4627-81F2-1818DA5D550D}';    // 8.0.50727.762: http://www.microsoft.com/downloads/details.aspx?FamilyID=200B2FD9-AE1A-4A14-984D-389C36F85647
+  VS2005_SP1_X86_ATL_SEC =  '{837B34E3-7C30-493C-8F6A-2B0F04E2912C}';    // 8.0.50727.4053: http://www.microsoft.com/download/en/details.aspx?displaylang=en&id=14431
+  VS2005_SP1_X86_MFC_SEC =  '{710f4c1c-cc18-4c49-8cbf-51240c89a1a2}';    // 8.0.50727.6195: http://www.microsoft.com/download/en/details.aspx?displaylang=en&id=26347     
+  
+  VS2008_X86 =              '{FF66E9F6-83E7-3A3E-AF14-8DE9A809A6A4}';    // http://www.microsoft.com/downloads/details.aspx?FamilyID=9b2da534-3e03-4391-8a4d-074b9f2bc1bf
+  VS2008_SP1_X86 =          '{9A25302D-30C0-39D9-BD6F-21E6EC160475}';    // 9.0.30729.17: http://www.microsoft.com/downloads/details.aspx?familyid=A5C84275-3B97-4AB7-A40D-3802B2AF5FC2
+  VS2008_SP1_X86_ATL_SEC =  '{1F1C2DFC-2D24-3E06-BCB8-725134ADF989}';    // 9.0.30729.4148: http://www.microsoft.com/downloads/details.aspx?familyid=2051A0C1-C9B5-4B0A-A8F5-770A549FD78C
+  // These updates currently don't have redist links:
+  // 9.0.30729.5026:
+  // 9.0.30729.5570: 
+  // 9.0.30729.6161: http://support.microsoft.com/kb/2538243
+
+  INSTALLSTATE_INVALIDARG	= -2;	  // An invalid parameter was passed to the function
+  INSTALLSTATE_UNKNOWN	  = -1;   // The product is not advertised or installed
+  INSTALLSTATE_ADVERTISED	= 1;	  // The product is advertised but not installed
+  INSTALLSTATE_ABSENT	    = 2;	  // The product is installed for a different user
+  INSTALLSTATE_DEFAULT	  = 5;    // The product is installed for the current user
+
+function MsiQueryProductState(ProductCode: String): Integer;
+  external 'MsiQueryProductStateA@msi.dll stdcall';
+
+function IsProductCodeInstalled(ProductUUID: String): Boolean;
+begin
+  Result := (MsiQueryProductState(ProductUUID) = INSTALLSTATE_DEFAULT);
+end;
+
+function Needs2005Redist(): Boolean;
+begin
+  Result:= (IsProductCodeInstalled(VS2005_SP1_X86_MFC_SEC) = FALSE);
+  if (Result = TRUE) then begin
+    Log('User system needs VS 2005 SP1 x86 Redistributable, installing.');
+  end else begin
+    Log('User already has VS 2005 SP1 x86 Redistributable installed, skipping.');
+  end
+end;
+
+function Needs2008Redist(): Boolean;
+begin
+  Result := (IsProductCodeInstalled(VS2008_SP1_X86_ATL_SEC) = FALSE);
+  if (Result = TRUE) then begin
+    Log('User system needs VS 2008 SP1 x86 Redistributable, installing.');
+  end else begin
+    Log('User already has VS 2008 SP1 x86 Redistributable installed, skipping.');
+  end
+end;
-- 
cgit v1.1


From 3301aeefa62fc018c238c0aafbaef1f6bdce7728 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Tue, 12 Jul 2011 16:18:40 -0700
Subject: Changed version to beta 1.5 windows test release

---
 .../installers/windows/imprudence_installer_script_experimental.iss   | 4 ++--
 linden/indra/newview/viewerinfo.cpp                                   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/linden/indra/newview/installers/windows/imprudence_installer_script_experimental.iss b/linden/indra/newview/installers/windows/imprudence_installer_script_experimental.iss
index 400eb48..c551919 100644
--- a/linden/indra/newview/installers/windows/imprudence_installer_script_experimental.iss
+++ b/linden/indra/newview/installers/windows/imprudence_installer_script_experimental.iss
@@ -9,11 +9,11 @@
 ; These will change
 AppId={{1B3E68BC-13EB-4277-9439-CB5FF9259460}
 AppName=Imprudence Viewer Experimental
-AppVerName=Imprudence Viewer 1.4.0 Experimental 2011.04.19
+AppVerName=Imprudence Viewer 1.4.0 beta 1.5 windows test release
 DefaultDirName={pf}\ImprudenceExperimental
 DefaultGroupName=Imprudence Viewer Experimental
 VersionInfoProductName=Imprudence Viewer Experimental
-OutputBaseFilename=Imprudence-1.4.0-Experimental-2011.04.19-Setup
+OutputBaseFilename=Imprudence-1.4.0-beta-1.5-windows-test
 VersionInfoVersion=1.4.0
 VersionInfoTextVersion=1.4.0
 VersionInfoProductVersion=1.4.0
diff --git a/linden/indra/newview/viewerinfo.cpp b/linden/indra/newview/viewerinfo.cpp
index 66cac52..53adccf 100644
--- a/linden/indra/newview/viewerinfo.cpp
+++ b/linden/indra/newview/viewerinfo.cpp
@@ -35,8 +35,8 @@ namespace ViewerInfo
 	const S32         MAJOR = 1;
 	const S32         MINOR = 4;
 	const S32         PATCH = 0;
-	const S32         RLEAS = 1; // increment for each beta/RC/release
-	const std::string EXTRA = "beta 1";
+	const S32         RLEAS = 2; // increment for each beta/RC/release
+	const std::string EXTRA = "beta 1.5 Windows Test";
 
 	// Mac OS X bundle identifier. Should match the one in Info.plist.
 	const std::string BUNDLE_ID = "org.imprudenceviewer.viewer";
-- 
cgit v1.1


From 1a315c3bbf3edbe4528e47ed4ac83d468b1dde5c Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Tue, 12 Jul 2011 20:36:05 -0700
Subject: Always return when an export fails

---
 linden/indra/newview/primbackup.cpp                           | 11 ++++++++---
 .../skins/default/xui/en-us/floater_hardware_settings.xml     |  2 +-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/linden/indra/newview/primbackup.cpp b/linden/indra/newview/primbackup.cpp
index 6d9d73f..9c3ab7f 100644
--- a/linden/indra/newview/primbackup.cpp
+++ b/linden/indra/newview/primbackup.cpp
@@ -472,6 +472,10 @@ void PrimBackup::exportWorker(void *userdata)
 					llwarns << "Incorrect permission to export" << llendl;
 					PrimBackup::getInstance()->mExportState = EXPORT_FAILED;
 					LLSelectMgr::getInstance()->getSelection()->unref();
+					gIdleCallbacks.deleteFunction(exportWorker);
+					LLNotifications::instance().add("ExportFailed");
+					PrimBackup::getInstance()->close();
+					return;
 				}
 			}
 			break;
@@ -581,10 +585,7 @@ void PrimBackup::exportWorker(void *userdata)
 			break;
 
 		case EXPORT_FAILED:
-			gIdleCallbacks.deleteFunction(exportWorker);
 			llwarns << "Export process aborted." << llendl;
-			LLNotifications::instance().add("ExportFailed");
-			PrimBackup::getInstance()->close();
 			break;
 	}
 }
@@ -682,6 +683,10 @@ LLSD PrimBackup::primsToLLSD(LLViewerObject::child_list_t child_list, bool is_at
 			{
 				llwarns << "Incorrect permission to export a sculpt texture." << llendl;
 				PrimBackup::getInstance()->mExportState = EXPORT_FAILED;
+				gIdleCallbacks.deleteFunction(exportWorker);
+				LLNotifications::instance().add("ExportFailed");
+				PrimBackup::getInstance()->close();
+				return LLSD();
 			}
 		}
 
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_hardware_settings.xml b/linden/indra/newview/skins/default/xui/en-us/floater_hardware_settings.xml
index 24a895b..3309c11 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_hardware_settings.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_hardware_settings.xml
@@ -40,7 +40,7 @@
     </combo_item>
   </combo_box>
 	<spinner bottom_delta="-21" control_name="RenderGamma" decimal_digits="2" enabled="true"
-	     follows="left|top" height="16" increment="0.01"
+	     follows="left|top" height="16" increment="0.01" tool_top="Disable basic shaders to set gamma" 
 	     initial_val="1" label="Gamma:" label_width="138" left="10" max_val="2"
 	     min_val="0.0" mouse_opaque="true" name="gamma" width="202" />
 	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-- 
cgit v1.1


From 4cc444e981e72f0bfa21729d833054edcab88b28 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Fri, 15 Jul 2011 01:19:47 -0700
Subject: Support modulo in llcalcparser

---
 linden/indra/llmath/llcalcparser.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/linden/indra/llmath/llcalcparser.h b/linden/indra/llmath/llcalcparser.h
index d8acc1f..90059b6 100644
--- a/linden/indra/llmath/llcalcparser.h
+++ b/linden/indra/llmath/llcalcparser.h
@@ -132,7 +132,8 @@ struct LLCalcParser : grammar<LLCalcParser>
 			term =
 				power[term.value = arg1] >>
 				*(('*' >> assert_syntax(power[term.value *= arg1])) |
-				  ('/' >> assert_syntax(power[term.value /= arg1]))
+				  ('/' >> assert_syntax(power[term.value /= arg1]))	|
+				  ('%' >> assert_syntax(power[term.value = bind(&fmodf)(term.value, arg1)]))
 				)
 			;
 			
-- 
cgit v1.1