livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

EXP-1941: Backed out changeset: 2f6546ac7e5e

meow-7.2.2
Todd Stinson 2012-06-12 18:27:05 -07:00
parent 5a76b1dc2f
commit d42d78a58a
6 changed files with 0 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
indra/newview/app_settings/settings.xml
View File

@ -13505,16 +13505,5 @@
<key>Value</key>
<integer>0</integer>
</map>
<key>AdultCheckEnablePurchse</key>
<map>
<key>Comment</key>
<string>Hack to allow QA testing of purchasing land regardless of maturity rating.</string>
<key>Persist</key>
<integer>0</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
</map>
</llsd>

11
indra/newview/llfloaterbuycontents.cpp
View File

@ -51,9 +51,6 @@
#include "llviewerregion.h"
#include "lluictrlfactory.h"
#include "llviewerwindow.h"
#ifndef STINSON_ADULT_CHECK_HACK
#include "llviewercontrol.h"
#endif // STINSON_ADULT_CHECK_HACK
LLFloaterBuyContents::LLFloaterBuyContents(const LLSD& key)
: LLFloater(key)
@ -67,11 +64,7 @@ BOOL LLFloaterBuyContents::postBuild()
getChild<LLUICtrl>("buy_btn")->setCommitCallback( boost::bind(&LLFloaterBuyContents::onClickBuy, this));
getChildView("item_list")->setEnabled(FALSE);
#ifndef STINSON_ADULT_CHECK_HACK
getChildView("buy_btn")->setEnabled(gSavedSettings.getBOOL("AdultCheckEnablePurchse"));
#else // STINSON_ADULT_CHECK_HACK
getChildView("buy_btn")->setEnabled(FALSE);
#endif // STINSON_ADULT_CHECK_HACK
getChildView("wear_check")->setEnabled(FALSE);
setDefaultBtn("cancel_btn"); // to avoid accidental buy (SL-43130)
@ -170,11 +163,7 @@ void LLFloaterBuyContents::inventoryChanged(LLViewerObject* obj,
}
// default to turning off the buy button.
#ifndef STINSON_ADULT_CHECK_HACK
getChildView("buy_btn")->setEnabled(gSavedSettings.getBOOL("AdultCheckEnablePurchse"));
#else // STINSON_ADULT_CHECK_HACK
getChildView("buy_btn")->setEnabled(FALSE);
#endif // STINSON_ADULT_CHECK_HACK
LLUUID owner_id;
BOOL is_group_owned;

7
indra/newview/llfloaterbuycurrency.cpp
View File

@ -41,9 +41,6 @@
#include "llweb.h"
#include "llwindow.h"
#include "llappviewer.h"
#ifndef STINSON_ADULT_CHECK_HACK
#include "llviewercontrol.h"
#endif // STINSON_ADULT_CHECK_HACK
static const S32 STANDARD_BUY_AMOUNT = 2000;
static const S32 MINIMUM_BALANCE_AMOUNT = 0;
@ -159,11 +156,7 @@ void LLFloaterBuyCurrencyUI::draw()
}
// disable the Buy button when we are not able to buy
#ifndef STINSON_ADULT_CHECK_HACK
getChildView("buy_btn")->setEnabled(gSavedSettings.getBOOL("AdultCheckEnablePurchse") || mManager.canBuy());
#else // STINSON_ADULT_CHECK_HACK
getChildView("buy_btn")->setEnabled(mManager.canBuy());
#endif // STINSON_ADULT_CHECK_HACK
LLFloater::draw();
}

4
indra/newview/llfloaterbuyland.cpp
View File

@ -1305,11 +1305,7 @@ void LLFloaterBuyLandUI::refreshUI()
agrees_to_covenant = check->get();
}
#ifndef STINSON_ADULT_CHECK_HACK
getChildView("buy_btn")->setEnabled(gSavedSettings.getBOOL("AdultCheckEnablePurchse") || (mCanBuy && mSiteValid && willHaveEnough && !mTransaction && agrees_to_covenant));
#else // STINSON_ADULT_CHECK_HACK
getChildView("buy_btn")->setEnabled(mCanBuy && mSiteValid && willHaveEnough && !mTransaction && agrees_to_covenant);
#endif // STINSON_ADULT_CHECK_HACK
}
void LLFloaterBuyLandUI::startBuyPreConfirm()

4
indra/newview/llsidepaneltaskinfo.cpp
View File

@ -251,11 +251,7 @@ void LLSidepanelTaskInfo::disableAll()
mOpenBtn->setEnabled(FALSE);
mPayBtn->setEnabled(FALSE);
#ifndef STINSON_ADULT_CHECK_HACK
mBuyBtn->setEnabled(gSavedSettings.getBOOL("AdultCheckEnablePurchse"));
#else // STINSON_ADULT_CHECK_HACK
mBuyBtn->setEnabled(FALSE);
#endif // STINSON_ADULT_CHECK_HACK
}
void LLSidepanelTaskInfo::refresh()

19
indra/newview/llviewermenu.cpp
View File

@ -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()