From 997fb0cbf21cc6b2f2ff8c8381de488eafff4c8d Mon Sep 17 00:00:00 2001
From: Aimee Trescothick
Date: Mon, 22 Sep 2008 02:01:57 -0500
Subject: VWR-8430: Usability improvements to the land tools floater.

---
 linden/indra/newview/llpanelland.cpp | 26 +++++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

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

diff --git a/linden/indra/newview/llpanelland.cpp b/linden/indra/newview/llpanelland.cpp
index be05703..1a7892d 100644
--- a/linden/indra/newview/llpanelland.cpp
+++ b/linden/indra/newview/llpanelland.cpp
@@ -37,10 +37,13 @@
 
 #include "llagent.h"
 #include "llbutton.h"
+#include "llcheckboxctrl.h"
 #include "llfloaterland.h"
 #include "lltextbox.h"
+#include "llviewercontrol.h"
 #include "llviewerparcelmgr.h"
 #include "llviewerregion.h"
+#include "llviewerwindow.h"
 #include "roles_constants.h"
 
 #include "lluictrlfactory.h"
@@ -65,6 +68,10 @@ BOOL	LLPanelLandInfo::postBuild()
 	childSetAction("button subdivide land",onClickDivide,this);
 	childSetAction("button join land",onClickJoin,this);
 	childSetAction("button about land",onClickAbout,this);
+	childSetAction("button show owners help", onShowOwnersHelp, this);
+
+	mCheckShowOwners = getChild<LLCheckBoxCtrl>("checkbox show owners");
+	childSetValue("checkbox show owners", gSavedSettings.getBOOL("ShowParcelOwners"));
 
 	return TRUE;
 }
@@ -72,7 +79,8 @@ BOOL	LLPanelLandInfo::postBuild()
 // Methods
 //
 LLPanelLandInfo::LLPanelLandInfo(const std::string& name)
-:	LLPanel(name)
+:	LLPanel(name),
+	mCheckShowOwners(NULL)
 {
 	if (!sInstance)
 	{
@@ -255,3 +263,19 @@ void LLPanelLandInfo::onClickAbout(void*)
 
 	LLFloaterLand::showInstance();
 }
+
+void LLPanelLandInfo::onShowOwnersHelp(void* user_data)
+{
+	LLPanelLandInfo* self = static_cast<LLPanelLandInfo*>(user_data);
+
+	const char* xml_alert = "ShowOwnersHelp";
+	LLAlertDialog* dialogp = gViewerWindow->alertXml(xml_alert);
+	if (dialogp)
+	{
+		LLFloater* root_floater = gFloaterView->getParentFloater(self);
+		if (root_floater)
+		{
+			root_floater->addDependentFloater(dialogp);
+		}
+	}	
+}
-- 
cgit v1.1