Merge pull request #1421 from secondlife/DRTVWR-600-maint-A

Drtvwr 600 maint a

1 files changed, 4 insertions, 2 deletions

diff --git a/indra/newview/lltoolmgr.cpp b/indra/newview/lltoolmgr.cpp
index 63545ee5b0..a4f43bde11 100644
--- a/indra/newview/lltoolmgr.cpp
+++ b/indra/newview/lltoolmgr.cpp
@@ -145,12 +145,13 @@ LLToolMgr::~LLToolMgr()
 
 bool LLToolMgr::usingTransientTool()
 {
-	return mTransientTool ? true : false;
+	return mTransientTool != nullptr;
 }
 
 void LLToolMgr::setCurrentToolset(LLToolset* current)
 {
-	if (!current) return;
+	if (!current)
+		return;
 
 	// switching toolsets?
 	if (current != mCurrentToolset)
@@ -164,6 +165,7 @@ void LLToolMgr::setCurrentToolset(LLToolset* current)
 		// select first tool of new toolset only if toolset changed
 		mCurrentToolset->selectFirstTool();
 	}
+
 	// update current tool based on new toolset
 	setCurrentTool( mCurrentToolset->getSelectedTool() );
 }