From ade6bbb06c6a842f39a3fe32decf7c66682df092 Mon Sep 17 00:00:00 2001
From: Steven Bennetts <steve@lindenlab.com>
Date: Sun, 21 Jun 2009 17:16:27 +0000
Subject: merge -r 124105-124625 skinning-13 -> viewer-2.0.0-3

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

(limited to 'indra/newview/llviewermessage.cpp')

diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index a62e59bc10..a05bd30600 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -4395,8 +4395,8 @@ void handle_show_mean_events(void *)
 	{
 		return;
 	}
-
-	LLFloaterBump::showInstance();
+	LLFloaterReg::showInstance("bumps");
+	//LLFloaterBump::showInstance();
 }
 
 void mean_name_callback(const LLUUID &id, const std::string& first, const std::string& last, BOOL always_false)
-- 
cgit v1.2.3