aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llfloatercustomize.cpp
diff options
context:
space:
mode:
authorJacek Antonelli2008-08-15 23:45:16 -0500
committerJacek Antonelli2008-08-15 23:45:16 -0500
commit3f27ba891ac4d032753b219b4b96d1ffbc9fb488 (patch)
tree504932ee91a0356fba7ea48798887c96867e492f /linden/indra/newview/llfloatercustomize.cpp
parentSecond Life viewer sources 1.18.4.3 (diff)
downloadmeta-impy-3f27ba891ac4d032753b219b4b96d1ffbc9fb488.zip
meta-impy-3f27ba891ac4d032753b219b4b96d1ffbc9fb488.tar.gz
meta-impy-3f27ba891ac4d032753b219b4b96d1ffbc9fb488.tar.bz2
meta-impy-3f27ba891ac4d032753b219b4b96d1ffbc9fb488.tar.xz
Second Life viewer sources 1.18.5.0-RC
Diffstat (limited to '')
-rw-r--r--linden/indra/newview/llfloatercustomize.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/linden/indra/newview/llfloatercustomize.cpp b/linden/indra/newview/llfloatercustomize.cpp
index 5351aa5..fb6efe2 100644
--- a/linden/indra/newview/llfloatercustomize.cpp
+++ b/linden/indra/newview/llfloatercustomize.cpp
@@ -217,7 +217,7 @@ public:
217 LLString name = LLString("checkbox_") + LLWearable::typeToTypeLabel( (EWearableType)i ); 217 LLString name = LLString("checkbox_") + LLWearable::typeToTypeLabel( (EWearableType)i );
218 mCheckBoxList.push_back(std::make_pair(name,i)); 218 mCheckBoxList.push_back(std::make_pair(name,i));
219 // Hide teen items 219 // Hide teen items
220 if (gAgent.mAccess < SIM_ACCESS_MATURE && 220 if (gAgent.isTeen() &&
221 !edit_wearable_for_teens((EWearableType)i)) 221 !edit_wearable_for_teens((EWearableType)i))
222 { 222 {
223 // hide wearable checkboxes that don't apply to this account 223 // hide wearable checkboxes that don't apply to this account
@@ -462,7 +462,7 @@ BOOL LLPanelEditWearable::postBuild()
462 // If PG, can't take off underclothing or shirt 462 // If PG, can't take off underclothing or shirt
463 mCanTakeOff = 463 mCanTakeOff =
464 LLWearable::typeToAssetType( mType ) == LLAssetType::AT_CLOTHING && 464 LLWearable::typeToAssetType( mType ) == LLAssetType::AT_CLOTHING &&
465 !( gAgent.mAccess < SIM_ACCESS_MATURE && (mType == WT_UNDERSHIRT || mType == WT_UNDERPANTS) ); 465 !( gAgent.isTeen() && (mType == WT_UNDERSHIRT || mType == WT_UNDERPANTS) );
466 childSetVisible("Take Off", mCanTakeOff); 466 childSetVisible("Take Off", mCanTakeOff);
467 childSetAction("Take Off", LLPanelEditWearable::onBtnTakeOff, this ); 467 childSetAction("Take Off", LLPanelEditWearable::onBtnTakeOff, this );
468 468
@@ -1606,8 +1606,8 @@ BOOL LLFloaterCustomize::postBuild()
1606 childSetTabChangeCallback("customize tab container", "Underpants", onTabChanged, (void*)WT_UNDERPANTS ); 1606 childSetTabChangeCallback("customize tab container", "Underpants", onTabChanged, (void*)WT_UNDERPANTS );
1607 childSetTabChangeCallback("customize tab container", "Skirt", onTabChanged, (void*)WT_SKIRT ); 1607 childSetTabChangeCallback("customize tab container", "Skirt", onTabChanged, (void*)WT_SKIRT );
1608 1608
1609 // Remove underware panels for teens 1609 // Remove underwear panels for teens
1610 if (gAgent.mAccess < SIM_ACCESS_MATURE) 1610 if (gAgent.isTeen())
1611 { 1611 {
1612 LLTabContainerCommon* tab_container = LLUICtrlFactory::getTabContainerByName(this, "customize tab container"); 1612 LLTabContainerCommon* tab_container = LLUICtrlFactory::getTabContainerByName(this, "customize tab container");
1613 if (tab_container) 1613 if (tab_container)
@@ -1693,7 +1693,7 @@ void LLFloaterCustomize::onBtnMakeOutfit( void* userdata )
1693 { 1693 {
1694 BOOL enabled = (gAgent.getWearable( (EWearableType) i ) != NULL); 1694 BOOL enabled = (gAgent.getWearable( (EWearableType) i ) != NULL);
1695 BOOL selected = (enabled && (WT_SHIRT <= i) && (i < WT_COUNT)); // only select clothing by default 1695 BOOL selected = (enabled && (WT_SHIRT <= i) && (i < WT_COUNT)); // only select clothing by default
1696 if (gAgent.mAccess < SIM_ACCESS_MATURE 1696 if (gAgent.isTeen()
1697 && !edit_wearable_for_teens((EWearableType)i)) 1697 && !edit_wearable_for_teens((EWearableType)i))
1698 { 1698 {
1699 dialog->setWearableToInclude( i, FALSE, FALSE ); 1699 dialog->setWearableToInclude( i, FALSE, FALSE );
@@ -1730,7 +1730,7 @@ void* LLFloaterCustomize::createWearablePanel(void* userdata)
1730 WearablePanelData* data = (WearablePanelData*)userdata; 1730 WearablePanelData* data = (WearablePanelData*)userdata;
1731 EWearableType type = data->mType; 1731 EWearableType type = data->mType;
1732 LLPanelEditWearable* panel; 1732 LLPanelEditWearable* panel;
1733 if ((gAgent.mAccess < SIM_ACCESS_MATURE && !edit_wearable_for_teens(data->mType) )) 1733 if ((gAgent.isTeen() && !edit_wearable_for_teens(data->mType) ))
1734 { 1734 {
1735 panel = NULL; 1735 panel = NULL;
1736 } 1736 }