diff options
| author | Todd Stinson <stinson@lindenlab.com> | 2012-06-12 18:27:05 -0700 |
|---|---|---|
| committer | Todd Stinson <stinson@lindenlab.com> | 2012-06-12 18:27:05 -0700 |
| commit | d42d78a58a6b3bd40029629fbaa6b5925623efd3 (patch) | |
| tree | e66b557eff99cc7316951c202fd77d6e499fded5 /indra/newview/llviewermenu.cpp | |
| parent | 5a76b1dc2fcb5b81c0c8f2a6c1539a23441260f6 (diff) | |
EXP-1941: Backed out changeset: 2f6546ac7e5e
Diffstat (limited to 'indra/newview/llviewermenu.cpp')
| -rw-r--r-- | indra/newview/llviewermenu.cpp | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index 5b4d8dcf2c..602d0770b2 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -116,9 +116,6 @@ #include "lltoolgrab.h" #include "llwindow.h" #include "boost/unordered_map.hpp" -#ifndef STINSON_ADULT_CHECK_HACK -#include "llviewercontrol.h" -#endif // STINSON_ADULT_CHECK_HACK using namespace LLVOAvatarDefines; @@ -342,11 +339,7 @@ void LLMenuParcelObserver::changed() { gMenuHolder->childSetEnabled("Land Buy Pass", LLPanelLandGeneral::enableBuyPass(NULL)); -#ifndef STINSON_ADULT_CHECK_HACK - BOOL buyable = gSavedSettings.getBOOL("AdultCheckEnablePurchse") || enable_buy_land(NULL); -#else // STINSON_ADULT_CHECK_HACK BOOL buyable = enable_buy_land(NULL); -#endif // STINSON_ADULT_CHECK_HACK gMenuHolder->childSetEnabled("Land Buy", buyable); gMenuHolder->childSetEnabled("Buy Land...", buyable); } @@ -3244,12 +3237,6 @@ void append_aggregate(std::string& string, const LLAggregatePermissions& ag_perm bool enable_buy_object() { -#ifndef STINSON_ADULT_CHECK_HACK - if (gSavedSettings.getBOOL("AdultCheckEnablePurchse")) - { - return true; - } -#endif // STINSON_ADULT_CHECK_HACK // In order to buy, there must only be 1 purchaseable object in // the selection manger. if(LLSelectMgr::getInstance()->getSelection()->getRootObjectCount() != 1) return false; @@ -5966,12 +5953,6 @@ class LLWorldEnableBuyLand : public view_listener_t { bool handleEvent(const LLSD& userdata) { -#ifndef STINSON_ADULT_CHECK_HACK - if (gSavedSettings.getBOOL("AdultCheckEnablePurchse")) - { - return true; - } -#endif // STINSON_ADULT_CHECK_HACK bool new_value = LLViewerParcelMgr::getInstance()->canAgentBuyParcel( LLViewerParcelMgr::getInstance()->selectionEmpty() ? LLViewerParcelMgr::getInstance()->getAgentParcel() |