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

Removing some code that allowed the viewer to toggle the user's maturity access level. But only toggling it in the viewer leads to some really bad discontinuities with the server's actual access level for the user.

master
Todd Stinson 2012-05-23 19:29:17 -07:00
parent e76d7d73c5
commit 7fc6d3d79b
7 changed files with 9 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
indra/newview/llagent.cpp
View File

@ -2481,11 +2481,6 @@ bool LLAgent::isAdult() const
return mAgentAccess->isAdult();
}
void LLAgent::setTeen(bool teen)
{
mAgentAccess->setTeen(teen);
}
//static
int LLAgent::convertTextToMaturity(char text)
{

1
indra/newview/llagent.h
View File

@ -688,7 +688,6 @@ public:
bool isTeen() const;
bool isMature() const;
bool isAdult() const;
void setTeen(bool teen);
void setMaturity(char text);
static int convertTextToMaturity(char text);

12
indra/newview/llagentaccess.cpp
View File

@ -132,18 +132,6 @@ bool LLAgentAccess::isAdult() const
return mAccess >= SIM_ACCESS_ADULT;
}
void LLAgentAccess::setTeen(bool teen)
{
if (teen)
{
mAccess = SIM_ACCESS_PG;
}
else
{
mAccess = SIM_ACCESS_MATURE;
}
}
//static
int LLAgentAccess::convertTextToMaturity(char text)
{

1
indra/newview/llagentaccess.h
View File

@ -59,7 +59,6 @@ public:
bool isMature() const;
bool isAdult() const;
void setTeen(bool teen);
void setMaturity(char text);
static int convertTextToMaturity(char text);

28
indra/newview/llviewermenu.cpp
View File

@ -297,7 +297,6 @@ BOOL enable_buy_land(void*);
void handle_test_male(void *);
void handle_test_female(void *);
void handle_toggle_pg(void*);
void handle_dump_attachments(void *);
void handle_dump_avatar_local_textures(void*);
void handle_debug_avatar_textures(void*);
@ -1588,23 +1587,6 @@ class LLAdvancedTestFemale : public view_listener_t
}
};
///////////////
// TOGGLE PG //
///////////////
class LLAdvancedTogglePG : public view_listener_t
{
bool handleEvent(const LLSD& userdata)
{
handle_toggle_pg(NULL);
return true;
}
};
class LLAdvancedForceParamsToDefault : public view_listener_t
{
bool handleEvent(const LLSD& userdata)
@ -6639,15 +6621,6 @@ void handle_test_female(void*)
//gGestureList.requestResetFromServer( FALSE );
}
void handle_toggle_pg(void*)
{
gAgent.setTeen( !gAgent.isTeen() );
LLFloaterWorldMap::reloadIcons(NULL);
llinfos << "PG status set to " << (S32)gAgent.isTeen() << llendl;
}
void handle_dump_attachments(void*)
{
if(!isAgentAvatarValid()) return;
@ -8208,7 +8181,6 @@ void initialize_menus()
view_listener_t::addMenu(new LLAdvancedTestMale(), "Advanced.TestMale");
view_listener_t::addMenu(new LLAdvancedTestFemale(), "Advanced.TestFemale");
view_listener_t::addMenu(new LLAdvancedTogglePG(), "Advanced.TogglePG");
// Advanced > Character (toplevel)
view_listener_t::addMenu(new LLAdvancedForceParamsToDefault(), "Advanced.ForceParamsToDefault");

6
indra/newview/skins/default/xui/en/menu_viewer.xml
View File

@ -3098,12 +3098,6 @@
<menu_item_call.on_click
function="Advanced.TestFemale" />
</menu_item_call>
<menu_item_call
label="Toggle PG"
name="Toggle PG">
<menu_item_call.on_click
function="Advanced.TogglePG" />
</menu_item_call>
<menu_item_check
label="Allow Select Avatar"
name="Allow Select Avatar">

30
indra/newview/tests/llagentaccess_test.cpp
View File

@ -111,18 +111,6 @@ namespace tut
ensure("1 isMature", !aa.isMature());
ensure("1 isAdult", !aa.isAdult());
// this is kinda bad -- setting this forces maturity to MATURE but !teen != Mature anymore
aa.setTeen(false);
ensure("2 isTeen", !aa.isTeen());
ensure("2 isMature", aa.isMature());
ensure("2 isAdult", !aa.isAdult());
// have to flip it back and make sure it still works
aa.setTeen(true);
ensure("3 isTeen", aa.isTeen());
ensure("3 isMature", !aa.isMature());
ensure("3 isAdult", !aa.isAdult());
// check the conversion routine
ensure_equals("1 conversion", SIM_ACCESS_PG, aa.convertTextToMaturity('P'));
ensure_equals("2 conversion", SIM_ACCESS_MATURE, aa.convertTextToMaturity('M'));
@ -131,21 +119,21 @@ namespace tut
// now try the other method of setting it - PG
aa.setMaturity('P');
ensure("4 isTeen", aa.isTeen());
ensure("4 isMature", !aa.isMature());
ensure("4 isAdult", !aa.isAdult());
ensure("2 isTeen", aa.isTeen());
ensure("2 isMature", !aa.isMature());
ensure("2 isAdult", !aa.isAdult());
// Mature
aa.setMaturity('M');
ensure("5 isTeen", !aa.isTeen());
ensure("5 isMature", aa.isMature());
ensure("5 isAdult", !aa.isAdult());
ensure("3 isTeen", !aa.isTeen());
ensure("3 isMature", aa.isMature());
ensure("3 isAdult", !aa.isAdult());
// Adult
aa.setMaturity('A');
ensure("6 isTeen", !aa.isTeen());
ensure("6 isMature", aa.isMature());
ensure("6 isAdult", aa.isAdult());
ensure("4 isTeen", !aa.isTeen());
ensure("4 isMature", aa.isMature());
ensure("4 isAdult", aa.isAdult());
}