From d32c1c28b4e2add4e51361d13356b6638c6f0817 Mon Sep 17 00:00:00 2001 From: Richard Linden Date: Wed, 1 Feb 2012 16:39:27 -0800 Subject: cleaned up linden_common.h, removing stuff that is mostly unused --- indra/newview/llfloaterregioninfo.h | 1 + 1 file changed, 1 insertion(+) (limited to 'indra/newview/llfloaterregioninfo.h') diff --git a/indra/newview/llfloaterregioninfo.h b/indra/newview/llfloaterregioninfo.h index c402de66e8..ae45949b4a 100644 --- a/indra/newview/llfloaterregioninfo.h +++ b/indra/newview/llfloaterregioninfo.h @@ -33,6 +33,7 @@ #include "llfloater.h" #include "llhost.h" #include "llpanel.h" +#include "llextendedstatus.h" #include "llenvmanager.h" // for LLEnvironmentSettings -- cgit v1.2.3 From 67ccb0670f35a35d7de204d239e17ffa56cc94b3 Mon Sep 17 00:00:00 2001 From: paulgproductengine Date: Mon, 20 Feb 2012 20:11:08 +0200 Subject: EXP-1904 FIXED (Estate tab in Region/Estate floater does not display estate name or owner name) - Added updating for Estate name and Estate owner name --- indra/newview/llfloaterregioninfo.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'indra/newview/llfloaterregioninfo.h') diff --git a/indra/newview/llfloaterregioninfo.h b/indra/newview/llfloaterregioninfo.h index ae45949b4a..e36ef4604b 100644 --- a/indra/newview/llfloaterregioninfo.h +++ b/indra/newview/llfloaterregioninfo.h @@ -294,6 +294,9 @@ public: void updateControls(LLViewerRegion* region); + static void updateEstateName(const std::string& name); + static void updateEstateOwnerName(const std::string& name); + virtual bool refreshFromRegion(LLViewerRegion* region); virtual bool estateUpdate(LLMessageSystem* msg); -- cgit v1.2.3