From 98fd90ddd6595f2ee7e626c14117f51def621ec5 Mon Sep 17 00:00:00 2001
From: Josh Bell <josh@lindenlab.com>
Date: Thu, 14 Feb 2008 01:45:59 +0000
Subject: svn merge -r 79730:79944
 svn+ssh://svn.lindenlab.com/svn/linden/branches/parcel_media/sl-parcelmedia-6
 --> release

QAR-275 Parcel Media

Sam made me do it.
---
 indra/newview/llpanelland.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/indra/newview/llpanelland.cpp b/indra/newview/llpanelland.cpp
index d86f81d21d..45e78f257f 100644
--- a/indra/newview/llpanelland.cpp
+++ b/indra/newview/llpanelland.cpp
@@ -253,5 +253,5 @@ void LLPanelLandInfo::onClickAbout(void*)
 		gParcelMgr->selectParcelInRectangle();
 	}
 
-	LLFloaterLand::show();
+	LLFloaterLand::showInstance();
 }
-- 
cgit v1.3