Merge remote-tracking branch 'upstream/master'

2011-11-08 05:22:47 -05:00
parent 844e38702a 8421661a89
commit 6aa7f219cd
25 changed files with 209 additions and 96 deletions
--- a/indra/newview/lltoolcomp.cpp
+++ b/indra/newview/lltoolcomp.cpp
@@ -78,6 +78,8 @@ void LLToolComposite::setCurrentTool( LLTool* new_tool )
 {
 	if( mCur != new_tool )
 	{
+		if(new_tool)
+			lldebugs << "Current Tool: " << new_tool->getName() << llendl;
 		if( mSelected )
 		{
 			mCur->handleDeselect();