From d16ff5cb5cf8ebf30552f7a98b33c7ffdecf765e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Liru=20F=C3=A6rs?= <lirusaito@gmail.com>
Date: Thu, 10 Oct 2019 02:49:17 -0400
Subject: [PATCH] Bunch of excess clean up from while I was working on things

---
 indra/newview/llfloaterland.cpp      | 43 ----------------------------
 indra/newview/llfloaterland.h        |  4 ---
 indra/newview/llpanelpermissions.cpp |  2 +-
 indra/newview/llviewermessage.cpp    |  2 +-
 4 files changed, 2 insertions(+), 49 deletions(-)

diff --git a/indra/newview/llfloaterland.cpp b/indra/newview/llfloaterland.cpp
index fee645546..0a155db3d 100644
--- a/indra/newview/llfloaterland.cpp
+++ b/indra/newview/llfloaterland.cpp
@@ -857,13 +857,6 @@ void LLPanelLandGeneral::refreshNames()
 	}
 }
 
-
-// virtual
-void LLPanelLandGeneral::draw()
-{
-	LLPanel::draw();
-}
-
 void LLPanelLandGeneral::onClickSetGroup()
 {
 	LLFloater* parent_floater = gFloaterView->getParentFloater(this);
@@ -1144,7 +1137,6 @@ BOOL LLPanelLandObjects::postBuild()
 	mOwnerList = getChild<LLNameListCtrl>("owner list");
 	mOwnerList->sortByColumnIndex(3, FALSE);
 	mOwnerList->setCommitCallback(boost::bind(&LLPanelLandObjects::onCommitList,this));
-	mOwnerList->setDoubleClickCallback(boost::bind(&LLPanelLandObjects::onDoubleClickOwner, this));
 
 	return TRUE;
 }
@@ -1156,35 +1148,6 @@ BOOL LLPanelLandObjects::postBuild()
 LLPanelLandObjects::~LLPanelLandObjects()
 { }
 
-// static
-void LLPanelLandObjects::onDoubleClickOwner(void *userdata)
-{
-	LLPanelLandObjects *self = (LLPanelLandObjects *)userdata;
-
-	LLScrollListItem* item = self->mOwnerList->getFirstSelected();
-	if (item)
-	{
-		LLUUID owner_id = item->getUUID();
-		// Look up the selected name, for future dialog box use.
-		const LLScrollListCell* cell;
-		cell = item->getColumn(1);
-		if (!cell)
-		{
-			return;
-		}
-		// Is this a group?
-		BOOL is_group = cell->getValue().asString() == OWNER_GROUP;
-		if (is_group)
-		{
-			LLGroupActions::show(owner_id);
-		}
-		else
-		{
-			LLAvatarActions::showProfile(owner_id);
-		}
-	}
-}
-
 // public
 void LLPanelLandObjects::refresh()
 {
@@ -1298,12 +1261,6 @@ void LLPanelLandObjects::refresh()
 	}
 }
 
-// virtual
-void LLPanelLandObjects::draw()
-{
-	LLPanel::draw();
-}
-
 void send_other_clean_time_message(S32 parcel_local_id, S32 other_clean_time)
 {
 	LLMessageSystem *msg = gMessageSystem;
diff --git a/indra/newview/llfloaterland.h b/indra/newview/llfloaterland.h
index 1a99e6394..9bc8011bf 100644
--- a/indra/newview/llfloaterland.h
+++ b/indra/newview/llfloaterland.h
@@ -145,7 +145,6 @@ public:
 	virtual ~LLPanelLandGeneral();
 	/*virtual*/ void refresh();
 	void refreshNames();
-	virtual void draw();
 
 	void setGroup(const LLUUID& group_id);
 	void onClickSetGroup();
@@ -243,7 +242,6 @@ public:
 	LLPanelLandObjects(LLSafeHandle<LLParcelSelection>& parcelp);
 	virtual ~LLPanelLandObjects();
 	/*virtual*/ void refresh();
-	virtual void draw();
 
 	bool callbackReturnOwnerObjects(const LLSD& notification, const LLSD& response);
 	bool callbackReturnGroupObjects(const LLSD& notification, const LLSD& response);
@@ -261,8 +259,6 @@ public:
 	static void onClickReturnOwnerList(void*);
 	static void onClickRefresh(void*);
 
-	static void onDoubleClickOwner(void*);	
-
 	void onCommitList();
 	static void onLostFocus(LLFocusableElement* caller, void* user_data);
 	static void onCommitClean(LLUICtrl* caller, void* user_data);
diff --git a/indra/newview/llpanelpermissions.cpp b/indra/newview/llpanelpermissions.cpp
index cea17bbc5..637f72750 100644
--- a/indra/newview/llpanelpermissions.cpp
+++ b/indra/newview/llpanelpermissions.cpp
@@ -327,7 +327,7 @@ void LLPanelPermissions::refresh()
 	const LLFocusableElement* keyboard_focus_view = gFocusMgr.getKeyboardFocus();
 
 	S32 string_index = 0;
-	std::string MODIFY_INFO_STRINGS[] =
+	static std::string MODIFY_INFO_STRINGS[] =
 	{
 		getString("text modify info 1"),
 		getString("text modify info 2"),
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index 6ea9d1960..f2d83efa2 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -8607,7 +8607,7 @@ void process_covenant_reply(LLMessageSystem* msg, void**)
 	}
 	else
 	{
-		last_modified = LLTrans::getString("covenant_modified") + " " + formatted_time((time_t)covenant_timestamp);
+		last_modified = LLTrans::getString("covenant_modified") + ' ' + formatted_time((time_t)covenant_timestamp);
 	}
 
 	LLPanelEstateCovenant::updateLastModified(last_modified);