From a43c997d0a7209da7e1b3d42b3e3998498741764 Mon Sep 17 00:00:00 2001
From: Richard Nelson <none@none>
Date: Mon, 14 Jun 2010 17:55:50 -0700
Subject: re-disabled old style properties floater

---
 indra/newview/llpanelobjectinventory.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/indra/newview/llpanelobjectinventory.cpp b/indra/newview/llpanelobjectinventory.cpp
index 1d726ba06c..da809b7baa 100644
--- a/indra/newview/llpanelobjectinventory.cpp
+++ b/indra/newview/llpanelobjectinventory.cpp
@@ -179,12 +179,13 @@ void LLTaskInvFVBridge::showProperties()
 	show_item_profile(mUUID);
 
 	// Disable old properties floater; this is replaced by the sidepanel.
-	
+	/*
 	LLFloaterProperties* floater = LLFloaterReg::showTypedInstance<LLFloaterProperties>("properties", mUUID);
 	if (floater)
 	{
 		floater->setObjectID(mPanel->getTaskUUID());
 	}
+	*/
 	
 }
 
-- 
cgit v1.2.3