Merge remote-tracking branch 'lirusaito/master'

2013-07-16 16:26:53 +02:00
parent 1c2cdd4166 bc753455df
commit dc24e1b038
116 changed files with 4032 additions and 3805 deletions
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -2058,7 +2058,7 @@ class LLObjectInspect : public view_listener_t
 {
 	bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
 	{
-		LLFloaterInspect::show();
+		LLFloaterInspect::showInstance();
 		return true;
 	}
 };