diff options
Diffstat (limited to 'indra/newview')
| -rwxr-xr-x | indra/newview/llnetmap.cpp | 6 | ||||
| -rwxr-xr-x | indra/newview/llpanelprofile.cpp | 2 | ||||
| -rwxr-xr-x | indra/newview/llviewermenu.cpp | 2 | ||||
| -rwxr-xr-x | indra/newview/skins/default/xui/en/notifications.xml | 5 | ||||
| -rwxr-xr-x | indra/newview/skins/default/xui/en/panel_preferences_general.xml | 14 |
5 files changed, 22 insertions, 7 deletions
diff --git a/indra/newview/llnetmap.cpp b/indra/newview/llnetmap.cpp index d7e7f13e87..5fc73c67d1 100755 --- a/indra/newview/llnetmap.cpp +++ b/indra/newview/llnetmap.cpp @@ -96,13 +96,13 @@ LLNetMap::LLNetMap (const Params & p) mToolTipMsg(), mPopupMenu(NULL) { + mScale = gSavedSettings.getF32("MiniMapScale"); + mPixelsPerMeter = mScale / REGION_WIDTH_METERS; mDotRadius = llmax(DOT_SCALE * mPixelsPerMeter, MIN_DOT_RADIUS); - setScale(gSavedSettings.getF32("MiniMapScale")); } LLNetMap::~LLNetMap() { - gSavedSettings.setF32("MiniMapScale", mScale); } BOOL LLNetMap::postBuild() @@ -137,6 +137,8 @@ void LLNetMap::setScale( F32 scale ) mPixelsPerMeter = mScale / REGION_WIDTH_METERS; mDotRadius = llmax(DOT_SCALE * mPixelsPerMeter, MIN_DOT_RADIUS); + gSavedSettings.setF32("MiniMapScale", mScale); + mUpdateNow = true; } diff --git a/indra/newview/llpanelprofile.cpp b/indra/newview/llpanelprofile.cpp index f91c4110c0..e795e7eedb 100755 --- a/indra/newview/llpanelprofile.cpp +++ b/indra/newview/llpanelprofile.cpp @@ -168,7 +168,7 @@ public: { if (params.size() > 2) { - const std::string object_name = params[2].asString(); + const std::string object_name = LLURI::unescape(params[2].asString()); LLMute mute(avatar_id, object_name, LLMute::OBJECT); LLMuteList::getInstance()->add(mute); LLPanelBlockedList::showPanelAndSelect(mute.mID); diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index 3096d8c7ce..7e8bd9a4e0 100755 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -2831,6 +2831,8 @@ BOOL enable_object_build(void*) bool enable_object_edit() { + if (!isAgentAvatarValid()) return false; + // *HACK: The new "prelude" Help Islands have a build sandbox area, // so users need the Edit and Create pie menu options when they are // there. Eventually this needs to be replaced with code that only diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 24131495c3..506b110afe 100755 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -2481,8 +2481,9 @@ This is usually a temporary failure. Please customize and save the wearable agai icon="alertmodal.tga" name="YouHaveBeenLoggedOut" type="alertmodal"> -Darn. You have been logged out of [SECOND_LIFE] - [MESSAGE] +Darn. You have been logged out of [SECOND_LIFE]. + +[MESSAGE] <usetemplate name="okcancelbuttons" notext="Quit" diff --git a/indra/newview/skins/default/xui/en/panel_preferences_general.xml b/indra/newview/skins/default/xui/en/panel_preferences_general.xml index f6665a1d5d..9da044ab64 100755 --- a/indra/newview/skins/default/xui/en/panel_preferences_general.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_general.xml @@ -39,7 +39,12 @@ enabled="true" label="English" name="English" - value="en" /> + value="en" /> + <combo_box.item + enabled="true" + label="Dansk (Danish) - Beta" + name="Danish" + value="da" /> <combo_box.item enabled="true" label="Deutsch (German) - Beta" @@ -59,7 +64,12 @@ enabled="true" label="Italiano (Italian) - Beta" name="Italian" - value="it" /> + value="it" /> + <combo_box.item + enabled="true" + label="Polski (Polish) - Beta" + name="Polish" + value="pl" /> <combo_box.item enabled="true" label="Português (Portuguese) - Beta" |