aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llfloaterregioninfo.h
diff options
context:
space:
mode:
authorDavid Seikel2011-02-10 22:49:30 +1000
committerDavid Seikel2011-02-10 22:49:30 +1000
commit10a79156a44bcd3a84488e083cc6e46b1320856e (patch)
tree324954db2cf0a896d4daf81cfd5c6c0fcdd829cf /linden/indra/newview/llfloaterregioninfo.h
parentFor meta7 - while LL reserves the first 5 estate numbers for it's own use, we... (diff)
downloadmeta-impy-10a79156a44bcd3a84488e083cc6e46b1320856e.zip
meta-impy-10a79156a44bcd3a84488e083cc6e46b1320856e.tar.gz
meta-impy-10a79156a44bcd3a84488e083cc6e46b1320856e.tar.bz2
meta-impy-10a79156a44bcd3a84488e083cc6e46b1320856e.tar.xz
Remove special handling of linden estates. We don't have them in meta, and that sort of policy should be server side anyway.
It's good to remove useless code. As usual I found three ways of recognising linden estates being used in the code, makes it hard to find them all. Might be some left over.
Diffstat (limited to '')
-rw-r--r--linden/indra/newview/llfloaterregioninfo.h7
1 files changed, 0 insertions, 7 deletions
diff --git a/linden/indra/newview/llfloaterregioninfo.h b/linden/indra/newview/llfloaterregioninfo.h
index ae0c993..f5e3d03 100644
--- a/linden/indra/newview/llfloaterregioninfo.h
+++ b/linden/indra/newview/llfloaterregioninfo.h
@@ -344,7 +344,6 @@ public:
344 344
345 U32 getEstateID() const { return mEstateID; } 345 U32 getEstateID() const { return mEstateID; }
346 void setEstateID(U32 estate_id) { mEstateID = estate_id; } 346 void setEstateID(U32 estate_id) { mEstateID = estate_id; }
347 static bool isLindenEstate();
348 347
349 const std::string getOwnerName() const; 348 const std::string getOwnerName() const;
350 void setOwnerName(const std::string& name); 349 void setOwnerName(const std::string& name);
@@ -352,10 +351,6 @@ public:
352 const std::string getAbuseEmailAddress() const; 351 const std::string getAbuseEmailAddress() const;
353 void setAbuseEmailAddress(const std::string& address); 352 void setAbuseEmailAddress(const std::string& address);
354 353
355 // If visible from mainland, allowed agent and allowed groups
356 // are ignored, so must disable UI.
357 void setAccessAllowedEnabled(bool enable_agent, bool enable_group, bool enable_ban);
358
359 // this must have the same function signature as 354 // this must have the same function signature as
360 // llmessage/llcachename.h:LLCacheNameCallback 355 // llmessage/llcachename.h:LLCacheNameCallback
361 static void callbackCacheName( 356 static void callbackCacheName(
@@ -367,8 +362,6 @@ public:
367 362
368protected: 363protected:
369 virtual BOOL sendUpdate(); 364 virtual BOOL sendUpdate();
370 // confirmation dialog callback
371 bool callbackChangeLindenEstate(const LLSD& notification, const LLSD& response);
372 365
373 void commitEstateInfoDataserver(); 366 void commitEstateInfoDataserver();
374 bool commitEstateInfoCaps(); 367 bool commitEstateInfoCaps();