From 47b77c7f7a777ae533863c3c7b4f68d518117c32 Mon Sep 17 00:00:00 2001 From: Richard Linden Date: Tue, 8 Mar 2011 11:17:34 -0800 Subject: updated list of visible notifications to spec --- indra/newview/skins/minimal/xui/en/notification_visibility.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/newview/skins/minimal/xui/en/notification_visibility.xml b/indra/newview/skins/minimal/xui/en/notification_visibility.xml index e05430636c..631cf5d42c 100644 --- a/indra/newview/skins/minimal/xui/en/notification_visibility.xml +++ b/indra/newview/skins/minimal/xui/en/notification_visibility.xml @@ -11,7 +11,7 @@ - + -- cgit v1.2.3 From 3732ac46e691f27d181c07b7c511c3c433f9c665 Mon Sep 17 00:00:00 2001 From: Richard Linden Date: Tue, 8 Mar 2011 12:18:57 -0800 Subject: SOCIAL-647 FIX Gear menu for your own avatar is empty in mini-inspector in minimal s --- .../default/xui/en/menu_inspect_self_gear.xml | 242 ++++++++++++++++++--- .../minimal/xui/en/menu_inspect_self_gear.xml | 219 ++++++++++++++++++- 2 files changed, 432 insertions(+), 29 deletions(-) diff --git a/indra/newview/skins/default/xui/en/menu_inspect_self_gear.xml b/indra/newview/skins/default/xui/en/menu_inspect_self_gear.xml index 50ad3f834e..81b88cfd54 100644 --- a/indra/newview/skins/default/xui/en/menu_inspect_self_gear.xml +++ b/indra/newview/skins/default/xui/en/menu_inspect_self_gear.xml @@ -1,66 +1,252 @@ - + + layout="topleft" + name="Self Pie"> + layout="topleft" + name="Sit Down Here"> - + layout="topleft" + name="Stand Up"> - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + label="Change Outfit" + layout="topleft" + name="Chenge Outfit"> - + + function="EditOutfit" /> + + + + + + label="My Friends" + layout="topleft" + name="Friends..."> + function="SideTray.PanelPeopleTab" + parameter="friends_panel" /> + layout="topleft" + name="Groups..."> + label="My Profile" + layout="topleft" + name="Profile..."> + + + - + diff --git a/indra/newview/skins/minimal/xui/en/menu_inspect_self_gear.xml b/indra/newview/skins/minimal/xui/en/menu_inspect_self_gear.xml index 28c4762eaa..be51e3e664 100644 --- a/indra/newview/skins/minimal/xui/en/menu_inspect_self_gear.xml +++ b/indra/newview/skins/minimal/xui/en/menu_inspect_self_gear.xml @@ -1,2 +1,219 @@  - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- cgit v1.2.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(-) 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.2.3 From c87e895304f25ea7e77d45ac2ce31164b86ee529 Mon Sep 17 00:00:00 2001 From: Richard Linden Date: Tue, 8 Mar 2011 15:12:42 -0800 Subject: SOCIAL-647 FIX Gear menu for your own avatar is empty in mini-inspector in minimal s --- indra/newview/skins/default/xui/en/menu_inspect_self_gear.xml | 2 +- indra/newview/skins/minimal/xui/en/menu_inspect_self_gear.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/indra/newview/skins/default/xui/en/menu_inspect_self_gear.xml b/indra/newview/skins/default/xui/en/menu_inspect_self_gear.xml index 81b88cfd54..5e7b16ed4a 100644 --- a/indra/newview/skins/default/xui/en/menu_inspect_self_gear.xml +++ b/indra/newview/skins/default/xui/en/menu_inspect_self_gear.xml @@ -249,4 +249,4 @@ - + diff --git a/indra/newview/skins/minimal/xui/en/menu_inspect_self_gear.xml b/indra/newview/skins/minimal/xui/en/menu_inspect_self_gear.xml index be51e3e664..ed3b75342f 100644 --- a/indra/newview/skins/minimal/xui/en/menu_inspect_self_gear.xml +++ b/indra/newview/skins/minimal/xui/en/menu_inspect_self_gear.xml @@ -216,4 +216,4 @@ - + -- cgit v1.2.3 From 858b7d36ab1a29c9ed30efefe895f10f9fa65310 Mon Sep 17 00:00:00 2001 From: Richard Linden Date: Tue, 8 Mar 2011 16:30:58 -0800 Subject: updated how to url --- indra/newview/app_settings/settings_minimal.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/newview/app_settings/settings_minimal.xml b/indra/newview/app_settings/settings_minimal.xml index e676f41250..77a3f2a1bb 100644 --- a/indra/newview/app_settings/settings_minimal.xml +++ b/indra/newview/app_settings/settings_minimal.xml @@ -61,7 +61,7 @@ Type String Value - http://interest.secondlife.com/static/viewer/howto/index.html + http://common-flash-secondlife-com.s3.amazonaws.com/viewer/v2.6/damballah/howto/index.html PreferredMaturity -- cgit v1.2.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(-) 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.2.3