diff options
author | Merov Linden <merov@lindenlab.com> | 2012-06-07 22:30:54 -0700 |
---|---|---|
committer | Merov Linden <merov@lindenlab.com> | 2012-06-07 22:30:54 -0700 |
commit | bc54f1bb89452467ca8b652e4b961444d9c4be8d (patch) | |
tree | b5aac588bc7ec1506456eaf5967e9a7930b42fc0 /indra/newview/llfloaterregioninfo.h | |
parent | 05d721cecfa0c20a6fd8498a18f36cde7014248e (diff) | |
parent | a519e34f02b4b2663fe082ba9ad12f1b423669cb (diff) |
Merge : pull from lindenlab/viewer-release
Diffstat (limited to 'indra/newview/llfloaterregioninfo.h')
-rw-r--r-- | indra/newview/llfloaterregioninfo.h | 3 |
1 files changed, 3 insertions, 0 deletions
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); |