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

RLVa enabled/disabled notification now localizable 

Removed RLVa menu functions registered twice
Ansariel 2011-12-14 17:07:21 +01:00
parent d82eb65399
commit fff779ba8b
4 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
indra/newview/llviewermenu.cpp
View File

@ -9507,14 +9507,6 @@ void initialize_menus()
view_listener_t::addMenu(new LLCheckSessionsSettings(), "CheckSessionSettings");
view_listener_t::addMenu(new LLChangeMode(), "ChangeMode");
// [RLVa:KB] - Checked: 2010-04-23 (RLVa-1.2.0g) | Added: RLVa-1.2.0
commit.add("RLV.ToggleEnabled", boost::bind(&rlvMenuToggleEnabled));
enable.add("RLV.CheckEnabled", boost::bind(&rlvMenuCheckEnabled));
if (rlv_handler_t::isEnabled())
{
enable.add("RLV.EnableIfNot", boost::bind(&rlvMenuEnableIfNot, _2));
}
// [/RLVa:KB]
commit.add("Destination.show", boost::bind(&toggle_destination_and_avatar_picker, 0));
commit.add("Avatar.show", boost::bind(&toggle_destination_and_avatar_picker, 1));

4
indra/newview/rlvcommon.cpp
View File

@ -20,6 +20,7 @@
#include "llavatarnamecache.h"
#include "llinstantmessage.h"
#include "llnotificationsutil.h"
#include "lltrans.h"
#include "lluictrlfactory.h"
#include "llversionviewer.h"
#include "llviewerparcelmgr.h"
@ -454,8 +455,7 @@ bool rlvMenuToggleEnabled()
gSavedSettings.setBOOL(RLV_SETTING_MAIN, !rlv_handler_t::isEnabled());
LLSD args;
args["MESSAGE"] =
llformat("RestrainedLove Support will be %s after you restart", (rlv_handler_t::isEnabled()) ? "disabled" : "enabled" );
args["MESSAGE"] = (rlv_handler_t::isEnabled() ? LLTrans::getString("RlvDisabled") : LLTrans::getString("RlvEnabled"));
LLNotificationsUtil::add("GenericAlert", args);
return true;

7
indra/newview/skins/default/xui/de/strings.xml
View File

@ -4839,4 +4839,11 @@ Setzen Sie den Editorpfad in Anführungszeichen
<string name="ParticleHiding">
Partikel werden ausgeblendet
</string>
<string name="RlvEnabled">
RestrainedLove-Unterstützung ist beim nächsten Start eingeschaltet.
</string>
<string name="RlvDisabled">
RestrainedLove-Unterstützung ist beim nächsten Start ausgeschaltet.
</string>
</strings>

2
indra/newview/skins/default/xui/en/strings.xml
View File

@ -3722,4 +3722,6 @@ Try enclosing path to the editor with double quotes.
<string name="SanityCheckBetween">The settings control &quot;[CONTROL_NAME]&quot; should be between [VALUE_1] and [VALUE_2].</string>
<string name="SanityCheckNotBetween">The settings control &quot;[CONTROL_NAME]&quot; should not be between [VALUE_1] and [VALUE_2].</string>
<string name="RlvEnabled">RestrainedLove Support will be enabled after you restart.</string>
<string name="RlvDisabled">RestrainedLove Support will be disabled after you restart.</string>
</strings>