Merge with viewer-2.0.0-3 branch

1 files changed, 9 insertions, 3 deletions

diff --git a/indra/newview/lltoolcomp.cpp b/indra/newview/lltoolcomp.cpp
index b95b33439e..cb964082b8 100644
--- a/indra/newview/lltoolcomp.cpp
+++ b/indra/newview/lltoolcomp.cpp
@@ -65,6 +65,9 @@ const S32 HPAD = 4;
 extern LLControlGroup gSavedSettings;
 
 
+// we use this in various places instead of NULL
+static LLTool* sNullTool = new LLTool(std::string("null"), NULL); 
+
 //-----------------------------------------------------------------------
 // LLToolComposite
 
@@ -88,7 +91,9 @@ void LLToolComposite::setCurrentTool( LLTool* new_tool )
 
 LLToolComposite::LLToolComposite(const std::string& name)
 	: LLTool(name),
-	  mCur(NULL), mDefault(NULL), mSelected(FALSE),
+	  mCur(sNullTool), 
+	  mDefault(sNullTool), 
+	  mSelected(FALSE),
 	  mMouseDown(FALSE), mManip(NULL), mSelectRect(NULL)
 {
 }
@@ -637,7 +642,7 @@ LLToolCompGun::LLToolCompGun()
 {
 	mGun = new LLToolGun(this);
 	mGrab = new LLToolGrab(this);
-	mNull = new LLTool(std::string("null"), this);
+	mNull = sNullTool;
 
 	setCurrentTool(mGun);
 	mDefault = mGun;
@@ -652,7 +657,8 @@ LLToolCompGun::~LLToolCompGun()
 	delete mGrab;
 	mGrab = NULL;
 
-	delete mNull;
+	// don't delete a static object
+	// delete mNull;
 	mNull = NULL;
 }