From 5aa43e4f3e30d81fb518783189b3258e67b4620a Mon Sep 17 00:00:00 2001 From: Richard Linden Date: Tue, 22 Feb 2011 19:30:50 -0800 Subject: SOCIAL-545 WIP Figure out how to configure skylight-specific settings while retaining relevant user settings (login account name, etc.) converted settings_file.xml to use param block descriptions for easier modification added session settings file and user session settings file for per-session config overrides --- indra/newview/app_settings/settings.xml | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) (limited to 'indra/newview/app_settings/settings.xml') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 6630d8f400..1bcc988e5c 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -11473,7 +11473,7 @@ Type F32 Value - 3.0 + 3 InterpolationPhaseOut @@ -11484,7 +11484,7 @@ Type F32 Value - 1.0 + 1 VerboseLogs @@ -12366,5 +12366,27 @@ Value name + SessionSettingsFile + + Comment + Settings that are a applied per session (not saved). + Persist + 0 + Type + String + Value + + + UserSessionSettingsFile + + Comment + User settings that are a applied per session (not saved). + Persist + 0 + Type + String + Value + + -- cgit v1.3 From f6f392babea8bbf748587c3a8ffe99e598b1a7df Mon Sep 17 00:00:00 2001 From: Richard Linden Date: Wed, 23 Feb 2011 16:36:55 -0800 Subject: SOCIAL-545 FIX Figure out how to configure skylight-specific settings sessionsettingsfile and usersessionsettingsfile are allowed to persist, so we can change them from the login screen --- indra/newview/app_settings/settings.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/newview/app_settings/settings.xml') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 1bcc988e5c..0d7437ed1c 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -12371,7 +12371,7 @@ Comment Settings that are a applied per session (not saved). Persist - 0 + 1 Type String Value @@ -12382,7 +12382,7 @@ Comment User settings that are a applied per session (not saved). Persist - 0 + 1 Type String Value -- cgit v1.3 From 8be54fc52ee5970d21388447fe699454f38baf20 Mon Sep 17 00:00:00 2001 From: Richard Linden Date: Thu, 24 Feb 2011 18:33:57 -0800 Subject: SOCIAL-551 WIP add buttons to open people and profile windows added option OpenSidePanelsInFloaters to always undock side panel content also set default configuration to basic --- indra/newview/app_settings/settings.xml | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'indra/newview/app_settings/settings.xml') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 0d7437ed1c..71ff7177ee 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -12375,7 +12375,7 @@ Type String Value - + settings_minimal.xml UserSessionSettingsFile @@ -12388,5 +12388,16 @@ Value + OpenSidePanelsInFloaters + + Comment + If true, will always open side panel contents in a floater. + Persist + 1 + Type + Boolean + Value + 0 + -- cgit v1.3 From fabf9607af47ead8530d0feff41effb9736d0120 Mon Sep 17 00:00:00 2001 From: Richard Linden Date: Fri, 25 Feb 2011 15:44:31 -0800 Subject: SOCIAL-548 FIX shorten delay for avatar inspector tooltips --- indra/newview/app_settings/settings.xml | 22 ++++++++++++++++++++++ indra/newview/app_settings/settings_minimal.xml | 11 +++++++++++ indra/newview/lltoolpie.cpp | 4 ++-- 3 files changed, 35 insertions(+), 2 deletions(-) (limited to 'indra/newview/app_settings/settings.xml') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 71ff7177ee..162c479398 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -12399,5 +12399,27 @@ Value 0 + AvatarInspectorTooltipDelay + + Comment + Seconds before displaying avatar inspector tooltip + Persist + 1 + Type + F32 + Value + 0.35 + + ObjectInspectorTooltipDelay + + Comment + Seconds before displaying object inspector tooltip + Persist + 1 + Type + F32 + Value + 0.35 + diff --git a/indra/newview/app_settings/settings_minimal.xml b/indra/newview/app_settings/settings_minimal.xml index 3130c7802c..2d70c79969 100644 --- a/indra/newview/app_settings/settings_minimal.xml +++ b/indra/newview/app_settings/settings_minimal.xml @@ -221,5 +221,16 @@ Value 1 + AvatarInspectorTooltipDelay + + Comment + Seconds before displaying avatar inspector tooltip + Persist + 1 + Type + F32 + Value + 0.1 + diff --git a/indra/newview/lltoolpie.cpp b/indra/newview/lltoolpie.cpp index 562b9219b4..19d7b70101 100644 --- a/indra/newview/lltoolpie.cpp +++ b/indra/newview/lltoolpie.cpp @@ -936,7 +936,7 @@ BOOL LLToolPie::handleTooltipObject( LLViewerObject* hover_object, std::string l p.click_callback(boost::bind(showAvatarInspector, hover_object->getID())); p.visible_time_near(6.f); p.visible_time_far(3.f); - p.delay_time(0.35f); + p.delay_time(gSavedSettings.getF32("AvatarInspectorTooltipDelay")); p.wrap(false); LLToolTipMgr::instance().show(p); @@ -1054,7 +1054,7 @@ BOOL LLToolPie::handleTooltipObject( LLViewerObject* hover_object, std::string l p.click_homepage_callback(boost::bind(VisitHomePage, mHoverPick)); p.visible_time_near(6.f); p.visible_time_far(3.f); - p.delay_time(0.35f); + p.delay_time(gSavedSettings.getF32("ObjectInspectorTooltipDelay")); p.wrap(false); LLToolTipMgr::instance().show(p); -- cgit v1.3 From f9301bb10f8845db45e1f8b2098d072b8db4d90a Mon Sep 17 00:00:00 2001 From: Richard Linden Date: Mon, 28 Feb 2011 17:37:09 -0800 Subject: SOCIAL-558 FIX clicking on slurl hyperlink should teleport instead of showing place panel --- indra/newview/app_settings/settings.xml | 11 +++++++++++ indra/newview/app_settings/settings_minimal.xml | 11 +++++++++++ indra/newview/llurldispatcher.cpp | 2 +- 3 files changed, 23 insertions(+), 1 deletion(-) (limited to 'indra/newview/app_settings/settings.xml') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 162c479398..1af7e31a34 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -12421,5 +12421,16 @@ Value 0.35 + SLURLTeleportDirectly + + Comment + Clicking on a slurl will teleport you directly instead of opening places panel + Persist + 1 + Type + Boolean + Value + 0 + diff --git a/indra/newview/app_settings/settings_minimal.xml b/indra/newview/app_settings/settings_minimal.xml index b4df5ffec8..64e1563e3c 100644 --- a/indra/newview/app_settings/settings_minimal.xml +++ b/indra/newview/app_settings/settings_minimal.xml @@ -237,5 +237,16 @@ Value 0 + SLURLTeleportDirectly + + Comment + Clicking on a slurl will teleport you directly instead of opening places panel + Persist + 1 + Type + Boolean + Value + 1 + diff --git a/indra/newview/llurldispatcher.cpp b/indra/newview/llurldispatcher.cpp index bd4d3c2b78..ebbb045f0a 100644 --- a/indra/newview/llurldispatcher.cpp +++ b/indra/newview/llurldispatcher.cpp @@ -180,7 +180,7 @@ bool LLURLDispatcherImpl::dispatchRegion(const LLSLURL& slurl, bool right_mouse) LLWorldMapMessage::getInstance()->sendNamedRegionRequest(slurl.getRegion(), LLURLDispatcherImpl::regionNameCallback, slurl.getSLURLString(), - false); // don't teleport + LLUI::sSettingGroups["config"]->getBOOL("SLURLTeleportDirectly")); // don't teleport return true; } -- cgit v1.3 From 903b3ab35d67eec1b780b0e9f7407f7c47544ea9 Mon Sep 17 00:00:00 2001 From: Richard Linden Date: Mon, 28 Feb 2011 17:38:35 -0800 Subject: SOCIAL-601 FIX avatar picker hint --- indra/newview/app_settings/settings.xml | 11 ----------- indra/newview/llfirstuse.cpp | 7 ------- indra/newview/llfirstuse.h | 1 - indra/newview/llviewermenu.cpp | 1 - indra/newview/llviewerwindow.cpp | 4 ---- indra/newview/skins/default/xui/en/notifications.xml | 8 -------- 6 files changed, 32 deletions(-) (limited to 'indra/newview/app_settings/settings.xml') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 1af7e31a34..ee1d5b140f 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -12333,17 +12333,6 @@ Value 1200.0 - AvatarPickerHintTimeout - - Comment - Number of seconds to wait before telling resident about avatar picker. - Persist - 1 - Type - F32 - Value - 600.0 - SidePanelHintTimeout Comment diff --git a/indra/newview/llfirstuse.cpp b/indra/newview/llfirstuse.cpp index 4d252dc662..9391944d3f 100644 --- a/indra/newview/llfirstuse.cpp +++ b/indra/newview/llfirstuse.cpp @@ -104,13 +104,6 @@ void LLFirstUse::notUsingDestinationGuide(bool enable) firstUseNotification("FirstNotUseDestinationGuide", enable, "HintDestinationGuide", LLSD(), LLSD().with("target", "dest_guide_btn").with("direction", "top")); } -void LLFirstUse::notUsingAvatarPicker(bool enable) -{ - // not doing this yet - firstUseNotification("FirstNotUseAvatarPicker", enable, "HintAvatarPicker", LLSD(), LLSD().with("target", "avatar_picker_btn").with("direction", "top")); -} - - // static void LLFirstUse::notUsingSidePanel(bool enable) { diff --git a/indra/newview/llfirstuse.h b/indra/newview/llfirstuse.h index 489f58626a..17250586c0 100644 --- a/indra/newview/llfirstuse.h +++ b/indra/newview/llfirstuse.h @@ -87,7 +87,6 @@ public: static void otherAvatarChatFirst(bool enable = true); static void sit(bool enable = true); static void notUsingDestinationGuide(bool enable = true); - static void notUsingAvatarPicker(bool enable = true); static void notUsingSidePanel(bool enable = true); static void notMoving(bool enable = true); static void viewPopup(bool enable = true); diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index 82df525a4f..4f7a34e625 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -862,7 +862,6 @@ void toggle_destination_and_avatar_picker(const LLSD& show) container->setVisible(true); destinations->setVisible(false); avatar_picker->setVisible(true); - LLFirstUse::notUsingAvatarPicker(false); break; default: container->setVisible(false); diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp index 1ce1135b1e..d9c51d03f7 100644 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -2561,10 +2561,6 @@ void LLViewerWindow::updateUI() { LLFirstUse::notUsingDestinationGuide(); } - if (gLoggedInTime.getElapsedTimeF32() > gSavedSettings.getF32("AvatarPickerHintTimeout")) - { - LLFirstUse::notUsingAvatarPicker(); - } if (gLoggedInTime.getElapsedTimeF32() > gSavedSettings.getF32("SidePanelHintTimeout")) { LLFirstUse::notUsingSidePanel(); diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 8d7e62a47a..12f4a11372 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -6849,14 +6849,6 @@ Mute everyone? The Destination Guide contains thousands of new places to discover. Select a location and choose Teleport to start exploring. - - Would you like to try a new look? Click the button below to see more Avatars. - - Date: Mon, 28 Feb 2011 22:06:21 -0800 Subject: SOCIAL-608 WIP Classified link is available in Basic mode --- indra/newview/app_settings/settings.xml | 33 +++++++++++++++++ indra/newview/app_settings/settings_minimal.xml | 33 +++++++++++++++++ indra/newview/llgroupactions.cpp | 6 ++++ indra/newview/llpanelpicks.cpp | 12 +++++++ indra/newview/llsidetray.cpp | 2 +- .../newview/skins/default/xui/en/notifications.xml | 41 +++++++++++++++++++++- 6 files changed, 125 insertions(+), 2 deletions(-) (limited to 'indra/newview/app_settings/settings.xml') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index ee1d5b140f..011a57c656 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -12421,5 +12421,38 @@ Value 0 + EnableClassifieds + + Comment + Enable creation of new classified ads + Persist + 1 + Type + Boolean + Value + 1 + + EnableGroupInfo + + Comment + Enable viewing and editing of group info. + Persist + 1 + Type + Boolean + Value + 1 + + EnablePicks + + Comment + Enable editing of picks + Persist + 1 + Type + Boolean + Value + 1 + diff --git a/indra/newview/app_settings/settings_minimal.xml b/indra/newview/app_settings/settings_minimal.xml index 64e1563e3c..61ae22cb60 100644 --- a/indra/newview/app_settings/settings_minimal.xml +++ b/indra/newview/app_settings/settings_minimal.xml @@ -248,5 +248,38 @@ Value 1 + EnableClassifieds + + Comment + Enable creation of new classified ads + Persist + 1 + Type + Boolean + Value + 0 + + EnableGroupInfo + + Comment + Enable viewing and editing of group info. + Persist + 1 + Type + Boolean + Value + 0 + + EnablePicks + + Comment + Enable editing of picks + Persist + 1 + Type + Boolean + Value + 0 + diff --git a/indra/newview/llgroupactions.cpp b/indra/newview/llgroupactions.cpp index 5393678a6b..7b7780cba8 100644 --- a/indra/newview/llgroupactions.cpp +++ b/indra/newview/llgroupactions.cpp @@ -53,6 +53,12 @@ public: bool handle(const LLSD& tokens, const LLSD& query_map, LLMediaCtrl* web) { + if (!LLUI::sSettingGroups["config"]->getBOOL("EnableGroupInfo")) + { + LLNotificationsUtil::add("NoGroupInfo"); + return false; + } + if (tokens.size() < 1) { return false; diff --git a/indra/newview/llpanelpicks.cpp b/indra/newview/llpanelpicks.cpp index c4f3866cad..72db138ef0 100755 --- a/indra/newview/llpanelpicks.cpp +++ b/indra/newview/llpanelpicks.cpp @@ -83,6 +83,12 @@ public: bool handle(const LLSD& params, const LLSD& query_map, LLMediaCtrl* web) { + if (!LLUI::sSettingGroups["config"]->getBOOL("EnablePicks")) + { + LLNotificationsUtil::add("NoPicks"); + return false; + } + // handle app/classified/create urls first if (params.size() == 1 && params[0].asString() == "create") { @@ -189,6 +195,12 @@ public: bool handle(const LLSD& params, const LLSD& query_map, LLMediaCtrl* web) { + if (!LLUI::sSettingGroups["config"]->getBOOL("EnableClassifieds")) + { + LLNotificationsUtil::add("NoClassifieds"); + return false; + } + // handle app/classified/create urls first if (params.size() == 1 && params[0].asString() == "create") { diff --git a/indra/newview/llsidetray.cpp b/indra/newview/llsidetray.cpp index 1fc34bd681..bfdb47dc52 100644 --- a/indra/newview/llsidetray.cpp +++ b/indra/newview/llsidetray.cpp @@ -631,7 +631,7 @@ LLPanel* LLSideTray::openChildPanel(LLSideTrayTab* tab, const std::string& panel bool tab_attached = isTabAttached(tab_name); - if (tab_attached && gSavedSettings.getBOOL("OpenSidePanelsInFloaters")) + if (tab_attached && LLUI::sSettingGroups["config"]->getBOOL("OpenSidePanelsInFloaters")) { tab->toggleTabDocked(); tab_attached = false; diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 12f4a11372..b010f4f99f 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -6952,7 +6952,46 @@ The site at '<nolink>[HOST_NAME]</nolink>' in realm ' yestext="Quit" notext="Don't Quit"/> - + + + fail + Creation and editing of Classifieds is only available in Standard mode. Would you like to logout and change modes? + + + + + fail + Group info and editing is only available in Standard mode. Would you like to logout and change modes? + + + + + fail + Creation and editing of Picks is only available in Standard mode. Would you like to logout and change modes? + + + - Your CPU speed does not meet the minimum requirements. -- cgit v1.3 From a10cdd9d57db3a1f44a22d987e2349d2bb0f4808 Mon Sep 17 00:00:00 2001 From: Richard Linden Date: Tue, 1 Mar 2011 11:20:40 -0800 Subject: updated destination guide and avatar picker urls --- indra/newview/app_settings/settings.xml | 6 +++--- indra/newview/app_settings/settings_minimal.xml | 22 ---------------------- 2 files changed, 3 insertions(+), 25 deletions(-) (limited to 'indra/newview/app_settings/settings.xml') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 011a57c656..b71b9d06ff 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -617,7 +617,7 @@ Type String Value - http://interest.secondlife.com/viewer/avatar + http://lecs-static-secondlife-com.s3.amazonaws.com/viewer/avatars.html AvatarBakedTextureUploadTimeout @@ -2566,7 +2566,7 @@ Type String Value - http://www.secondlife.com + http://lecs-static-secondlife-com.s3.amazonaws.com/viewer/guide.html DisableCameraConstraints @@ -12364,7 +12364,7 @@ Type String Value - settings_minimal.xml + UserSessionSettingsFile diff --git a/indra/newview/app_settings/settings_minimal.xml b/indra/newview/app_settings/settings_minimal.xml index 61ae22cb60..12727b0b96 100644 --- a/indra/newview/app_settings/settings_minimal.xml +++ b/indra/newview/app_settings/settings_minimal.xml @@ -27,15 +27,6 @@ Value 0 - DestinationGuideURL - - Comment - Destination guide contents - Type - String - Value - http://pdp48.lindenlab.com:8001/viewer/guide/ - EnableGrab Comment @@ -188,19 +179,6 @@ Value 0 - AvatarPickerURL - - Comment - Avatar picker contents - Persist - 1 - Type - String - Value - - http://pdp48.lindenlab.com:8001/static/viewer/avatar/index.html - - OpenSidePanelsInFloaters Comment -- cgit v1.3 From bebdf803c4b43078bd09d174d6a19e7baba4e0ef Mon Sep 17 00:00:00 2001 From: Richard Linden Date: Tue, 1 Mar 2011 18:26:57 -0800 Subject: remove [GRID] string replacement as it didn't work --- indra/newview/app_settings/settings.xml | 4 ++-- indra/newview/llviewernetwork.cpp | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'indra/newview/app_settings/settings.xml') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 6d988e16e4..4fbef050ff 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -617,7 +617,7 @@ Type String Value - http://lecs-static-secondlife-com.s3.amazonaws.com/viewer/[GRID]/avatars.html + http://lecs-static-secondlife-com.s3.amazonaws.com/viewer/agni/avatars.html AvatarBakedTextureUploadTimeout @@ -2566,7 +2566,7 @@ Type String Value - http://lecs-static-secondlife-com.s3.amazonaws.com/viewer/[GRID]/guide.html + http://lecs-static-secondlife-com.s3.amazonaws.com/viewer/agni/guide.html DisableCameraConstraints diff --git a/indra/newview/llviewernetwork.cpp b/indra/newview/llviewernetwork.cpp index a72dcc8885..a59afdc28a 100644 --- a/indra/newview/llviewernetwork.cpp +++ b/indra/newview/llviewernetwork.cpp @@ -506,7 +506,6 @@ void LLGridManager::setGridChoice(const std::string& grid) } mGrid = grid; gSavedSettings.setString("CurrentGrid", grid); - LLTrans::setDefaultArg("GRID", mGrid); updateIsInProductionGrid(); } -- cgit v1.3 From 0e87f37161a7b8c5df4f27b0f3a491c3b6546f66 Mon Sep 17 00:00:00 2001 From: Richard Linden Date: Wed, 2 Mar 2011 21:29:36 -0800 Subject: SOCIAL-623 FIX World map accessible from classified and picks in web profile in minimal skin --- indra/newview/app_settings/settings.xml | 17 ++++++++++++++--- indra/newview/app_settings/settings_minimal.xml | 22 ++++++++++++++++++++++ indra/newview/llfloaterworldmap.cpp | 6 ++++++ .../newview/skins/default/xui/en/notifications.xml | 14 ++++++++++++++ 4 files changed, 56 insertions(+), 3 deletions(-) (limited to 'indra/newview/app_settings/settings.xml') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 4fbef050ff..a2459890a1 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -12435,7 +12435,7 @@ EnableClassifieds Comment - Enable creation of new classified ads + Enable creation of new classified ads from web link Persist 1 Type @@ -12446,7 +12446,7 @@ EnableGroupInfo Comment - Enable viewing and editing of group info. + Enable viewing and editing of group info from web link Persist 1 Type @@ -12457,7 +12457,18 @@ EnablePicks Comment - Enable editing of picks + Enable editing of picks from web link + Persist + 1 + Type + Boolean + Value + 1 + + EnableWorldMap + + Comment + Enable opening world map from web link Persist 1 Type diff --git a/indra/newview/app_settings/settings_minimal.xml b/indra/newview/app_settings/settings_minimal.xml index cd0fe9e892..d505d59ec9 100644 --- a/indra/newview/app_settings/settings_minimal.xml +++ b/indra/newview/app_settings/settings_minimal.xml @@ -259,6 +259,17 @@ Value 0 + EnableWorldMap + + Comment + Enable opening world map from web link + Persist + 1 + Type + Boolean + Value + 0 + DoubleClickShowWorldMap Comment @@ -270,5 +281,16 @@ Value 0 + EnableGroupChatPopups + + Comment + Enable Incoming Group Chat Popups + Persist + 1 + Type + Boolean + Value + 0 + diff --git a/indra/newview/llfloaterworldmap.cpp b/indra/newview/llfloaterworldmap.cpp index 017cd2fc49..e6d91a658d 100755 --- a/indra/newview/llfloaterworldmap.cpp +++ b/indra/newview/llfloaterworldmap.cpp @@ -110,6 +110,12 @@ public: bool handle(const LLSD& params, const LLSD& query_map, LLMediaCtrl* web) { + if (!LLUI::sSettingGroups["config"]->getBOOL("EnableWorldMap")) + { + LLNotificationsUtil::add("NoWorldMap", LLSD(), LLSD(), std::string("SwitchToStandardSkinAndQuit")); + return true; + } + if (params.size() == 0) { // support the secondlife:///app/worldmap SLapp diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index b0aacb67bf..50193a198b 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -7126,6 +7126,20 @@ The site at '<nolink>[HOST_NAME]</nolink>' in realm ' notext="Don't Quit"/> + + fail + confirm + Viewing of the world map is only available in Standard mode. Would you like to logout and change modes? + + + - Your CPU speed does not meet the minimum requirements. -- cgit v1.3 From 5e0b45ad6cac39476f78ffa8d486f06eee53797b Mon Sep 17 00:00:00 2001 From: Richard Linden Date: Thu, 3 Mar 2011 19:52:21 -0800 Subject: SOCIAL-629 FIX Search Floater accessible from typing a search term in location bar --- indra/newview/app_settings/settings.xml | 11 +++++++++++ indra/newview/app_settings/settings_minimal.xml | 11 +++++++++++ indra/newview/llnavigationbar.cpp | 19 ++++++++++--------- 3 files changed, 32 insertions(+), 9 deletions(-) (limited to 'indra/newview/app_settings/settings.xml') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index a2459890a1..3dedf0ddd7 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -12476,5 +12476,16 @@ Value 1 + SearchFromAddressBar + + Comment + Can enter search queries into navigation address bar + Persist + 1 + Type + Boolean + Value + 1 + diff --git a/indra/newview/app_settings/settings_minimal.xml b/indra/newview/app_settings/settings_minimal.xml index d505d59ec9..73c865bc9f 100644 --- a/indra/newview/app_settings/settings_minimal.xml +++ b/indra/newview/app_settings/settings_minimal.xml @@ -292,5 +292,16 @@ Value 0 + SearchFromAddressBar + + Comment + Can enter search queries into navigation address bar + Persist + 1 + Type + Boolean + Value + 0 + diff --git a/indra/newview/llnavigationbar.cpp b/indra/newview/llnavigationbar.cpp index e4f83ce6b9..3b160ddc8e 100644 --- a/indra/newview/llnavigationbar.cpp +++ b/indra/newview/llnavigationbar.cpp @@ -636,18 +636,19 @@ void LLNavigationBar::onRegionNameResponse( U64 region_handle, const std::string& url, const LLUUID& snapshot_id, bool teleport) { // Invalid location? - if (!region_handle) + if (region_handle) + { + // Teleport to the location. + LLVector3d region_pos = from_region_handle(region_handle); + LLVector3d global_pos = region_pos + (LLVector3d) local_coords; + + llinfos << "Teleporting to: " << LLSLURL(region_name, global_pos).getSLURLString() << llendl; + gAgent.teleportViaLocation(global_pos); + } + else if (gSavedSettings.getBOOL("SearchFromAddressBar")) { invokeSearch(typed_location); - return; } - - // Teleport to the location. - LLVector3d region_pos = from_region_handle(region_handle); - LLVector3d global_pos = region_pos + (LLVector3d) local_coords; - - llinfos << "Teleporting to: " << LLSLURL(region_name, global_pos).getSLURLString() << llendl; - gAgent.teleportViaLocation(global_pos); } void LLNavigationBar::showTeleportHistoryMenu(LLUICtrl* btn_ctrl) -- cgit v1.3 From f9d70c41c9b7e7c0bb1cca184e6b5e99fc75a656 Mon Sep 17 00:00:00 2001 From: Richard Linden Date: Tue, 8 Mar 2011 12:42:15 -0800 Subject: SOCIAL-652 FIX Decline notification shown to users in minimal skin when they click on free one click objects --- indra/newview/app_settings/settings.xml | 13 ++++++++++++- indra/newview/app_settings/settings_minimal.xml | 11 +++++++++++ indra/newview/llviewermessage.cpp | 9 ++++++--- 3 files changed, 29 insertions(+), 4 deletions(-) (limited to 'indra/newview/app_settings/settings.xml') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 3dedf0ddd7..a8e9ca3cc9 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -12487,5 +12487,16 @@ Value 1 - + LogInventoryDecline + + Comment + Log in system chat whenever an inventory offer is declined + Persist + 1 + Type + Boolean + Value + 1 + + diff --git a/indra/newview/app_settings/settings_minimal.xml b/indra/newview/app_settings/settings_minimal.xml index 6e0053a3a3..e676f41250 100644 --- a/indra/newview/app_settings/settings_minimal.xml +++ b/indra/newview/app_settings/settings_minimal.xml @@ -325,5 +325,16 @@ Value http://lecs-static-secondlife-com.s3.amazonaws.com/viewer/agni/avatars.html + LogInventoryDecline + + Comment + Log in system chat whenever an inventory offer is declined + Persist + 1 + Type + Boolean + Value + 0 + diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index 103989ee80..c2449907ac 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -1715,15 +1715,18 @@ bool LLOfferInfo::inventory_task_offer_callback(const LLSD& notification, const msg->addBinaryDataFast(_PREHASH_BinaryBucket, EMPTY_BINARY_BUCKET, EMPTY_BINARY_BUCKET_SIZE); // send the message msg->sendReliable(mHost); + + if (gSavedSettings.getBOOL("LogInventoryDecline")) { LLStringUtil::format_map_t log_message_args; log_message_args["DESC"] = mDesc; log_message_args["NAME"] = mFromName; log_message = LLTrans::getString("InvOfferDecline", log_message_args); + + LLSD args; + args["MESSAGE"] = log_message; + LLNotificationsUtil::add("SystemMessage", args); } - LLSD args; - args["MESSAGE"] = log_message; - LLNotificationsUtil::add("SystemMessage", args); if (busy && (!mFromGroup && !mFromObject)) { -- cgit v1.3 From f3e37e047206b909c212a02493be6972fba2c8aa Mon Sep 17 00:00:00 2001 From: Richard Linden Date: Tue, 8 Mar 2011 16:47:12 -0800 Subject: SOCIAL-588 WIP All avatar changes using avatar picker are not completed and incorrect avatar can be worn disable AIS For minimal skin --- indra/newview/app_settings/settings.xml | 11 +++++++++++ indra/newview/app_settings/settings_minimal.xml | 11 +++++++++++ indra/newview/llinventorymodelbackgroundfetch.cpp | 2 +- 3 files changed, 23 insertions(+), 1 deletion(-) (limited to 'indra/newview/app_settings/settings.xml') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index a8e9ca3cc9..94a49f2cef 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -12498,5 +12498,16 @@ Value 1 + UseHTTPInventory + + Comment + Allow use of http inventory transfers instead of UDP + Persist + 1 + Type + Boolean + Value + 1 + diff --git a/indra/newview/app_settings/settings_minimal.xml b/indra/newview/app_settings/settings_minimal.xml index 77a3f2a1bb..b5fb85c929 100644 --- a/indra/newview/app_settings/settings_minimal.xml +++ b/indra/newview/app_settings/settings_minimal.xml @@ -336,5 +336,16 @@ Value 0 + UseHTTPInventory + + Comment + Allow use of http inventory transfers instead of UDP + Persist + 1 + Type + Boolean + Value + 0 + diff --git a/indra/newview/llinventorymodelbackgroundfetch.cpp b/indra/newview/llinventorymodelbackgroundfetch.cpp index 570e48d526..e31360fcbc 100644 --- a/indra/newview/llinventorymodelbackgroundfetch.cpp +++ b/indra/newview/llinventorymodelbackgroundfetch.cpp @@ -182,7 +182,7 @@ void LLInventoryModelBackgroundFetch::backgroundFetch() { // If we'll be using the capability, we'll be sending batches and the background thing isn't as important. std::string url = gAgent.getRegion()->getCapability("FetchInventoryDescendents2"); - if (!url.empty()) + if (gSavedSettings.getBOOL("UseHTTPInventory") && !url.empty()) { bulkFetch(url); return; -- cgit v1.3 From 24b254c3934ad13516b1c03bf9799397fb364a81 Mon Sep 17 00:00:00 2001 From: Richard Linden Date: Wed, 9 Mar 2011 09:56:59 -0800 Subject: updated destination and avatar urls --- indra/newview/app_settings/settings.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/newview/app_settings/settings.xml') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 3dedf0ddd7..3fc098f020 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -617,7 +617,7 @@ Type String Value - http://lecs-static-secondlife-com.s3.amazonaws.com/viewer/agni/avatars.html + AvatarBakedTextureUploadTimeout @@ -2566,7 +2566,7 @@ Type String Value - http://lecs-static-secondlife-com.s3.amazonaws.com/viewer/agni/guide.html + DisableCameraConstraints -- cgit v1.3 From 6158929e3ee87bc879c99d35963a151006394ed7 Mon Sep 17 00:00:00 2001 From: Leyla Farazha Date: Wed, 9 Mar 2011 11:51:07 -0800 Subject: SOCIAL-586 As a user I want to see my Aditi profile when logging into the Aditi grid --- indra/newview/app_settings/settings.xml | 11 +++++++++++ indra/newview/llpanelprofile.cpp | 12 +++++++++++- 2 files changed, 22 insertions(+), 1 deletion(-) (limited to 'indra/newview/app_settings/settings.xml') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 3dedf0ddd7..ced4c3a2eb 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -3899,6 +3899,17 @@ Value https://my.secondlife.com/[AGENT_NAME] + WebProfileNonProductionURL + + Comment + URL for Web Profiles on Non-Production grids + Persist + 0 + Type + String + Value + https://my-demo.secondlife.com/[AGENT_NAME] + HighResSnapshot Comment diff --git a/indra/newview/llpanelprofile.cpp b/indra/newview/llpanelprofile.cpp index 4f13c0c022..42c8f1d727 100755 --- a/indra/newview/llpanelprofile.cpp +++ b/indra/newview/llpanelprofile.cpp @@ -34,13 +34,23 @@ #include "llpanelpicks.h" #include "lltabcontainer.h" #include "llviewercontrol.h" +#include "llviewernetwork.h" static const std::string PANEL_PICKS = "panel_picks"; static const std::string PANEL_PROFILE = "panel_profile"; std::string getProfileURL(const std::string& agent_name) { - std::string url = gSavedSettings.getString("WebProfileURL"); + std::string url; + + if (LLGridManager::getInstance()->isInProductionGrid()) + { + url = gSavedSettings.getString("WebProfileURL"); + } + else + { + url = gSavedSettings.getString("WebProfileNonProductionURL"); + } LLSD subs; subs["AGENT_NAME"] = agent_name; url = LLWeb::expandURLSubstitutions(url,subs); -- cgit v1.3 From a4d2e10c375ae3c35f5426c0bd45e650197ad189 Mon Sep 17 00:00:00 2001 From: Richard Linden Date: Thu, 10 Mar 2011 14:27:50 -0800 Subject: SOCIAL-530 WIP When double clicking a nearby location I want my avatar to walk to that spot added setting to toggle click to walk --- indra/newview/app_settings/settings.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'indra/newview/app_settings/settings.xml') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index ea8b1c681d..88620e4193 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -12531,5 +12531,16 @@ Value 1 + ClickToWalk + + Comment + Click in world to walk to location + Persist + 1 + Type + Boolean + Value + 0 + -- cgit v1.3 From bc2aca863f5d27f551e48a2de8f879360a3a96ab Mon Sep 17 00:00:00 2001 From: leyla Date: Mon, 14 Mar 2011 11:23:15 -0700 Subject: SOCIAL-687 Call, Map, Share, and Pay options available in web profile for users in minimal skin --- indra/newview/app_settings/settings.xml | 33 +++++++++++++++++ indra/newview/app_settings/settings_minimal.xml | 33 +++++++++++++++++ indra/newview/llfloaterworldmap.cpp | 6 ++++ indra/newview/llpanelprofile.cpp | 7 ++++ indra/newview/llshareavatarhandler.cpp | 8 +++++ indra/newview/llvoicecallhandler.cpp | 8 +++++ .../newview/skins/default/xui/en/notifications.xml | 42 ++++++++++++++++++++++ 7 files changed, 137 insertions(+) (limited to 'indra/newview/app_settings/settings.xml') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 3dedf0ddd7..42fd9929ae 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -12476,6 +12476,39 @@ Value 1 + EnableAvatarPay + + Comment + Enable paying other avatars from web link + Persist + 1 + Type + Boolean + Value + 1 + + EnableVoiceCall + + Comment + Enable voice calls from web link + Persist + 1 + Type + Boolean + Value + 1 + + EnableAvatarShare + + Comment + Enable sharing from web link + Persist + 1 + Type + Boolean + Value + 1 + SearchFromAddressBar Comment diff --git a/indra/newview/app_settings/settings_minimal.xml b/indra/newview/app_settings/settings_minimal.xml index 73c865bc9f..4770c7d7e6 100644 --- a/indra/newview/app_settings/settings_minimal.xml +++ b/indra/newview/app_settings/settings_minimal.xml @@ -270,6 +270,39 @@ Value 0 + EnableAvatarPay + + Comment + Enable paying other avatars from web link + Persist + 1 + Type + Boolean + Value + 0 + + EnableVoiceCall + + Comment + Enable voice calls from web link + Persist + 1 + Type + Boolean + Value + 0 + + EnableAvatarShare + + Comment + Enable sharing from web link + Persist + 1 + Type + Boolean + Value + 0 + DoubleClickShowWorldMap Comment diff --git a/indra/newview/llfloaterworldmap.cpp b/indra/newview/llfloaterworldmap.cpp index e6d91a658d..03cf0332a9 100755 --- a/indra/newview/llfloaterworldmap.cpp +++ b/indra/newview/llfloaterworldmap.cpp @@ -148,6 +148,12 @@ public: bool handle(const LLSD& params, const LLSD& query_map, LLMediaCtrl* web) { + if (!LLUI::sSettingGroups["config"]->getBOOL("EnableWorldMap")) + { + LLNotificationsUtil::add("NoWorldMap", LLSD(), LLSD(), std::string("SwitchToStandardSkinAndQuit")); + return true; + } + //Make sure we have some parameters if (params.size() == 0) { diff --git a/indra/newview/llpanelprofile.cpp b/indra/newview/llpanelprofile.cpp index 4f13c0c022..cead6c24cd 100755 --- a/indra/newview/llpanelprofile.cpp +++ b/indra/newview/llpanelprofile.cpp @@ -31,6 +31,7 @@ #include "llavataractions.h" #include "llfloaterreg.h" #include "llcommandhandler.h" +#include "llnotificationsutil.h" #include "llpanelpicks.h" #include "lltabcontainer.h" #include "llviewercontrol.h" @@ -105,6 +106,12 @@ public: if (verb == "pay") { + if (!LLUI::sSettingGroups["config"]->getBOOL("EnableAvatarPay")) + { + LLNotificationsUtil::add("NoAvatarPay", LLSD(), LLSD(), std::string("SwitchToStandardSkinAndQuit")); + return true; + } + LLAvatarActions::pay(avatar_id); return true; } diff --git a/indra/newview/llshareavatarhandler.cpp b/indra/newview/llshareavatarhandler.cpp index 34194970b8..6b4f1d3dc6 100644 --- a/indra/newview/llshareavatarhandler.cpp +++ b/indra/newview/llshareavatarhandler.cpp @@ -27,6 +27,8 @@ #include "llviewerprecompiledheaders.h" #include "llcommandhandler.h" #include "llavataractions.h" +#include "llnotificationsutil.h" +#include "llui.h" class LLShareWithAvatarHandler : public LLCommandHandler { @@ -38,6 +40,12 @@ public: bool handle(const LLSD& params, const LLSD& query_map, LLMediaCtrl* web) { + if (!LLUI::sSettingGroups["config"]->getBOOL("EnableAvatarShare")) + { + LLNotificationsUtil::add("NoAvatarShare", LLSD(), LLSD(), std::string("SwitchToStandardSkinAndQuit")); + return true; + } + //Make sure we have some parameters if (params.size() == 0) { diff --git a/indra/newview/llvoicecallhandler.cpp b/indra/newview/llvoicecallhandler.cpp index 274bd75208..2050dab689 100644 --- a/indra/newview/llvoicecallhandler.cpp +++ b/indra/newview/llvoicecallhandler.cpp @@ -27,6 +27,8 @@ #include "llviewerprecompiledheaders.h" #include "llcommandhandler.h" #include "llavataractions.h" +#include "llnotificationsutil.h" +#include "llui.h" class LLVoiceCallAvatarHandler : public LLCommandHandler { @@ -38,6 +40,12 @@ public: bool handle(const LLSD& params, const LLSD& query_map, LLMediaCtrl* web) { + if (!LLUI::sSettingGroups["config"]->getBOOL("EnableVoiceCall")) + { + LLNotificationsUtil::add("NoVoiceCall", LLSD(), LLSD(), std::string("SwitchToStandardSkinAndQuit")); + return true; + } + //Make sure we have some parameters if (params.size() == 0) { diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 50193a198b..8e7da11c25 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -7139,6 +7139,48 @@ The site at '<nolink>[HOST_NAME]</nolink>' in realm ' yestext="Quit" notext="Don't Quit"/> + + + fail + confirm + Voice calls are only available in Standard mode. Would you like to logout and change modes? + + + + + fail + confirm + Sharing is only available in Standard mode. Would you like to logout and change modes? + + + + + fail + confirm + Paying other residents is only available in Standard mode. Would you like to logout and change modes? + + - Your CPU speed does not meet the minimum requirements. -- cgit v1.3 From 6336022ada7811e9f36844d5f7ff660cb712fdfe Mon Sep 17 00:00:00 2001 From: Richard Linden Date: Mon, 14 Mar 2011 17:49:11 -0700 Subject: SOCIAL-661 FIX Receiving Inventory notification in Basic Mode SOCIAL-654 FIX Items purchased on Marketplace.secondlife.com while logged into Minimal skin are declined and not present in inventory --- indra/newview/app_settings/settings.xml | 11 ++++++ indra/newview/app_settings/settings_minimal.xml | 11 ++++++ indra/newview/llviewermessage.cpp | 19 ++++++---- .../minimal/xui/en/notification_visibility.xml | 2 - .../newview/skins/minimal/xui/en/notifications.xml | 44 ++++++++++++++++++++++ 5 files changed, 77 insertions(+), 10 deletions(-) create mode 100644 indra/newview/skins/minimal/xui/en/notifications.xml (limited to 'indra/newview/app_settings/settings.xml') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 058ececc6b..6a89f5681d 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -12575,5 +12575,16 @@ Value 0 + ShowOfferedInventory + + Comment + Show inventory window with last inventory offer selected when receiving inventory from other users. + Persist + 1 + Type + Boolean + Value + 1 + diff --git a/indra/newview/app_settings/settings_minimal.xml b/indra/newview/app_settings/settings_minimal.xml index 7c578664e3..03656f2a53 100644 --- a/indra/newview/app_settings/settings_minimal.xml +++ b/indra/newview/app_settings/settings_minimal.xml @@ -391,5 +391,16 @@ Value 1 + ShowOfferedInventory + + Comment + Show inventory window with last inventory offer selected when receiving inventory from other users. + Persist + 1 + Type + Boolean + Value + 0 + diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index 2758250175..3584074ec1 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -1463,15 +1463,18 @@ bool LLOfferInfo::inventory_offer_callback(const LLSD& notification, const LLSD& // This is an offer from an agent. In this case, the back // end has already copied the items into your inventory, // so we can fetch it out of our inventory. - LLOpenAgentOffer* open_agent_offer = new LLOpenAgentOffer(mObjectID, from_string); - open_agent_offer->startFetch(); - if(catp || (itemp && itemp->isFinished())) + if (gSavedSettings.getBOOL("ShowOfferedInventory")) { - open_agent_offer->done(); - } - else - { - opener = open_agent_offer; + LLOpenAgentOffer* open_agent_offer = new LLOpenAgentOffer(mObjectID, from_string); + open_agent_offer->startFetch(); + if(catp || (itemp && itemp->isFinished())) + { + open_agent_offer->done(); + } + else + { + opener = open_agent_offer; + } } } break; diff --git a/indra/newview/skins/minimal/xui/en/notification_visibility.xml b/indra/newview/skins/minimal/xui/en/notification_visibility.xml index 9d4836d328..616b544847 100644 --- a/indra/newview/skins/minimal/xui/en/notification_visibility.xml +++ b/indra/newview/skins/minimal/xui/en/notification_visibility.xml @@ -1,7 +1,5 @@ - - diff --git a/indra/newview/skins/minimal/xui/en/notifications.xml b/indra/newview/skins/minimal/xui/en/notifications.xml new file mode 100644 index 0000000000..84da9472cc --- /dev/null +++ b/indra/newview/skins/minimal/xui/en/notifications.xml @@ -0,0 +1,44 @@ + + + + [NAME_SLURL] is offering you [ITEM_SLURL]. Using this item requires you to switch to Advanced mode where you will find the item in your Inventory. To switch to Advanced mode, quit and restart this application and change the mode setting on the login screen. +
+