From 78b7a9a88d19f901a2b90ec3f1211107ce63e283 Mon Sep 17 00:00:00 2001 From: Richard Linden Date: Mon, 24 Jan 2011 18:41:42 -0800 Subject: SOCIAL-473 FIX Add Kick, Freeze, Unfreeze and CSR to profile mini floater drop down Added Kick and CSR, made existing Freeze menu item use god mode freeze when in god mode (works across grid, not just with local avatars) --- indra/newview/llinspectavatar.cpp | 86 +++++++++++++++++++--- .../default/xui/en/menu_inspect_avatar_gear.xml | 20 ++++- 2 files changed, 93 insertions(+), 13 deletions(-) diff --git a/indra/newview/llinspectavatar.cpp b/indra/newview/llinspectavatar.cpp index 91ede6d221..4ad1934264 100644 --- a/indra/newview/llinspectavatar.cpp +++ b/indra/newview/llinspectavatar.cpp @@ -47,6 +47,7 @@ #include "llvoiceclient.h" #include "llviewerobjectlist.h" #include "lltransientfloatermgr.h" +#include "llnotificationsutil.h" // Linden libraries #include "llfloater.h" @@ -126,16 +127,20 @@ private: void onClickReport(); void onClickFreeze(); void onClickEject(); + void onClickKick(); + void onClickCSR(); void onClickZoomIn(); void onClickFindOnMap(); bool onVisibleFindOnMap(); - bool onVisibleFreezeEject(); + bool onVisibleEject(); + bool onVisibleFreeze(); bool onVisibleZoomIn(); void onClickMuteVolume(); void onVolumeChange(const LLSD& data); bool enableMute(); bool enableUnmute(); bool enableTeleportOffer(); + bool godModeEnabled(); // Is used to determine if "Add friend" option should be enabled in gear menu bool isNotFriend(); @@ -214,20 +219,21 @@ LLInspectAvatar::LLInspectAvatar(const LLSD& sd) mCommitCallbackRegistrar.add("InspectAvatar.Pay", boost::bind(&LLInspectAvatar::onClickPay, this)); mCommitCallbackRegistrar.add("InspectAvatar.Share", boost::bind(&LLInspectAvatar::onClickShare, this)); mCommitCallbackRegistrar.add("InspectAvatar.ToggleMute", boost::bind(&LLInspectAvatar::onToggleMute, this)); - mCommitCallbackRegistrar.add("InspectAvatar.Freeze", - boost::bind(&LLInspectAvatar::onClickFreeze, this)); - mCommitCallbackRegistrar.add("InspectAvatar.Eject", - boost::bind(&LLInspectAvatar::onClickEject, this)); + mCommitCallbackRegistrar.add("InspectAvatar.Freeze", boost::bind(&LLInspectAvatar::onClickFreeze, this)); + mCommitCallbackRegistrar.add("InspectAvatar.Eject", boost::bind(&LLInspectAvatar::onClickEject, this)); + mCommitCallbackRegistrar.add("InspectAvatar.Kick", boost::bind(&LLInspectAvatar::onClickKick, this)); + mCommitCallbackRegistrar.add("InspectAvatar.CSR", boost::bind(&LLInspectAvatar::onClickCSR, this)); mCommitCallbackRegistrar.add("InspectAvatar.Report", boost::bind(&LLInspectAvatar::onClickReport, this)); mCommitCallbackRegistrar.add("InspectAvatar.FindOnMap", boost::bind(&LLInspectAvatar::onClickFindOnMap, this)); mCommitCallbackRegistrar.add("InspectAvatar.ZoomIn", boost::bind(&LLInspectAvatar::onClickZoomIn, this)); mCommitCallbackRegistrar.add("InspectAvatar.DisableVoice", boost::bind(&LLInspectAvatar::toggleSelectedVoice, this, false)); mCommitCallbackRegistrar.add("InspectAvatar.EnableVoice", boost::bind(&LLInspectAvatar::toggleSelectedVoice, this, true)); + + mEnableCallbackRegistrar.add("InspectAvatar.EnableGod", boost::bind(&LLInspectAvatar::godModeEnabled, this)); mEnableCallbackRegistrar.add("InspectAvatar.VisibleFindOnMap", boost::bind(&LLInspectAvatar::onVisibleFindOnMap, this)); - mEnableCallbackRegistrar.add("InspectAvatar.VisibleFreezeEject", - boost::bind(&LLInspectAvatar::onVisibleFreezeEject, this)); - mEnableCallbackRegistrar.add("InspectAvatar.VisibleZoomIn", - boost::bind(&LLInspectAvatar::onVisibleZoomIn, this)); + mEnableCallbackRegistrar.add("InspectAvatar.VisibleEject", boost::bind(&LLInspectAvatar::onVisibleEject, this)); + mEnableCallbackRegistrar.add("InspectAvatar.VisibleFreeze", boost::bind(&LLInspectAvatar::onVisibleFreeze, this)); + mEnableCallbackRegistrar.add("InspectAvatar.VisibleZoomIn", boost::bind(&LLInspectAvatar::onVisibleZoomIn, this)); mEnableCallbackRegistrar.add("InspectAvatar.Gear.Enable", boost::bind(&LLInspectAvatar::isNotFriend, this)); mEnableCallbackRegistrar.add("InspectAvatar.Gear.EnableCall", boost::bind(&LLAvatarActions::canCall)); mEnableCallbackRegistrar.add("InspectAvatar.Gear.EnableTeleportOffer", boost::bind(&LLInspectAvatar::enableTeleportOffer, this)); @@ -656,11 +662,18 @@ bool LLInspectAvatar::onVisibleFindOnMap() return gAgent.isGodlike() || is_agent_mappable(mAvatarID); } -bool LLInspectAvatar::onVisibleFreezeEject() +bool LLInspectAvatar::onVisibleEject() { return enable_freeze_eject( LLSD(mAvatarID) ); } +bool LLInspectAvatar::onVisibleFreeze() +{ + // either user is a god and can do long distance freeze + // or check for target proximity and permissions + return gAgent.isGodlike() || enable_freeze_eject(LLSD(mAvatarID)); +} + bool LLInspectAvatar::onVisibleZoomIn() { return gObjectList.findObject(mAvatarID); @@ -725,9 +738,41 @@ void LLInspectAvatar::onClickReport() closeFloater(); } +bool godlike_freeze(const LLSD& notification, const LLSD& response) +{ + LLUUID avatar_id = notification["payload"]["avatar_id"].asUUID(); + S32 option = LLNotificationsUtil::getSelectedOption(notification, response); + + switch (option) + { + case 0: + LLAvatarActions::freeze(avatar_id); + break; + case 1: + LLAvatarActions::unfreeze(avatar_id); + break; + default: + break; + } + + return false; +} + void LLInspectAvatar::onClickFreeze() { - handle_avatar_freeze( LLSD(mAvatarID) ); + if (gAgent.isGodlike()) + { + // use godlike freeze-at-a-distance, with confirmation + LLNotificationsUtil::add("FreezeAvatar", + LLSD(), + LLSD().with("avatar_id", mAvatarID), + godlike_freeze); + } + else + { + // use default "local" version of freezing that requires avatar to be in range + handle_avatar_freeze( LLSD(mAvatarID) ); + } closeFloater(); } @@ -737,6 +782,20 @@ void LLInspectAvatar::onClickEject() closeFloater(); } +void LLInspectAvatar::onClickKick() +{ + LLAvatarActions::kick(mAvatarID); + closeFloater(); +} + +void LLInspectAvatar::onClickCSR() +{ + std::string name; + gCacheName->getFullName(mAvatarID, name); + LLAvatarActions::csr(mAvatarID, name); + closeFloater(); +} + void LLInspectAvatar::onClickZoomIn() { handle_zoom_to_object(mAvatarID); @@ -785,6 +844,11 @@ bool LLInspectAvatar::enableTeleportOffer() return LLAvatarActions::canOfferTeleport(mAvatarID); } +bool LLInspectAvatar::godModeEnabled() +{ + return gAgent.isGodlike(); +} + ////////////////////////////////////////////////////////////////////////////// // LLInspectAvatarUtil ////////////////////////////////////////////////////////////////////////////// diff --git a/indra/newview/skins/default/xui/en/menu_inspect_avatar_gear.xml b/indra/newview/skins/default/xui/en/menu_inspect_avatar_gear.xml index 58d58a6ca9..76b188220d 100644 --- a/indra/newview/skins/default/xui/en/menu_inspect_avatar_gear.xml +++ b/indra/newview/skins/default/xui/en/menu_inspect_avatar_gear.xml @@ -78,7 +78,7 @@ + function="InspectAvatar.VisibleFreeze"/> + function="InspectAvatar.VisibleEject"/> + + + + + + + + Date: Wed, 26 Jan 2011 16:00:46 -0800 Subject: Added tag DRTVWR-33--2.5.0beta2 for changeset 54d772d8687c --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 0e0898afb0..1e2e10eb97 100644 --- a/.hgtags +++ b/.hgtags @@ -51,3 +51,4 @@ a82e5b1e22c7f90e3c7977d146b80588f004ed0d 2.5.0-start 345b17e7cf630db77e840b4fe3451bd476d750a3 2.5.0-beta1 345b17e7cf630db77e840b4fe3451bd476d750a3 76f586a8e22b 0000000000000000000000000000000000000000 76f586a8e22b +54d772d8687c69b1d773f6ce14bbc7bdc9d6c05f DRTVWR-33--2.5.0beta2 -- cgit v1.2.3 From 055d79417482776bb7b1bfffe7468e2fc5fd92e1 Mon Sep 17 00:00:00 2001 From: Dessie Linden Date: Thu, 27 Jan 2011 11:43:08 -0800 Subject: Removed DRTVWR from 2.5.0-beta2 tag --- .hgtags | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.hgtags b/.hgtags index 1e2e10eb97..5e831e278c 100644 --- a/.hgtags +++ b/.hgtags @@ -51,4 +51,4 @@ a82e5b1e22c7f90e3c7977d146b80588f004ed0d 2.5.0-start 345b17e7cf630db77e840b4fe3451bd476d750a3 2.5.0-beta1 345b17e7cf630db77e840b4fe3451bd476d750a3 76f586a8e22b 0000000000000000000000000000000000000000 76f586a8e22b -54d772d8687c69b1d773f6ce14bbc7bdc9d6c05f DRTVWR-33--2.5.0beta2 +54d772d8687c69b1d773f6ce14bbc7bdc9d6c05f 2.5.0-beta2 -- cgit v1.2.3 From 106c9124741afd50c3aaa5671743d5a939f1ad48 Mon Sep 17 00:00:00 2001 From: Eli Linden Date: Thu, 27 Jan 2011 13:33:26 -0800 Subject: STORM-634 FIX missing Danish translation --- indra/newview/skins/default/xui/da/panel_people.xml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/indra/newview/skins/default/xui/da/panel_people.xml b/indra/newview/skins/default/xui/da/panel_people.xml index 599686d360..b85a33279a 100644 --- a/indra/newview/skins/default/xui/da/panel_people.xml +++ b/indra/newview/skins/default/xui/da/panel_people.xml @@ -1,23 +1,23 @@ - - - - + + + + - Find venner via [secondlife:///app/search/people Search] eller højre-klik på en beboer og tilføj dem som venner. -Leder du efter nogen at være sammen med? Prøv [secondlife:///app/worldmap World Map]. + Find venner via [secondlife:///app/search/people Søg] eller højre-klik på en beboer og tilføj dem som venner. +Leder du efter nogen at være sammen med? Prøv [secondlife:///app/worldmap Verdenskort]. - Fandt du ikke det du søgte? Prøv [secondlife:///app/search/people/[SEARCH_TERM] Search]. + Fandt du ikke det du søgte? Prøv [secondlife:///app/search/people/[SEARCH_TERM] Søg]. - - + + -- cgit v1.2.3 From 5b4aa6914473d331626eedeaa0b8c7b05be79231 Mon Sep 17 00:00:00 2001 From: Dessie Linden Date: Thu, 27 Jan 2011 14:40:14 -0800 Subject: Added tag DRTVWR-5_2.2.0-beta1 for changeset 7076e22f9f43 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 5e831e278c..4b29436ec5 100644 --- a/.hgtags +++ b/.hgtags @@ -52,3 +52,4 @@ a82e5b1e22c7f90e3c7977d146b80588f004ed0d 2.5.0-start 345b17e7cf630db77e840b4fe3451bd476d750a3 76f586a8e22b 0000000000000000000000000000000000000000 76f586a8e22b 54d772d8687c69b1d773f6ce14bbc7bdc9d6c05f 2.5.0-beta2 +7076e22f9f43f479a4ea75eac447a36364bead5a DRTVWR-5_2.2.0-beta1 -- cgit v1.2.3 From fd1b76d889b670b606e1c9f1c46404bc07aaf504 Mon Sep 17 00:00:00 2001 From: Dessie Linden Date: Thu, 27 Jan 2011 14:41:21 -0800 Subject: Added tag DRTVWR-3_2.2.0-beta2 for changeset 9822eb3e25f7 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 4b29436ec5..11bab1793d 100644 --- a/.hgtags +++ b/.hgtags @@ -53,3 +53,4 @@ a82e5b1e22c7f90e3c7977d146b80588f004ed0d 2.5.0-start 0000000000000000000000000000000000000000 76f586a8e22b 54d772d8687c69b1d773f6ce14bbc7bdc9d6c05f 2.5.0-beta2 7076e22f9f43f479a4ea75eac447a36364bead5a DRTVWR-5_2.2.0-beta1 +9822eb3e25f7fe0c28ffd8aba45c507caa383cbc DRTVWR-3_2.2.0-beta2 -- cgit v1.2.3 From 678234b01c1378858b753c8662428095355547d8 Mon Sep 17 00:00:00 2001 From: Dessie Linden Date: Thu, 27 Jan 2011 14:41:46 -0800 Subject: Added tag DRTVWR-7_2.2.0-beta3 for changeset b0cd7e150009 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 11bab1793d..18140976c9 100644 --- a/.hgtags +++ b/.hgtags @@ -54,3 +54,4 @@ a82e5b1e22c7f90e3c7977d146b80588f004ed0d 2.5.0-start 54d772d8687c69b1d773f6ce14bbc7bdc9d6c05f 2.5.0-beta2 7076e22f9f43f479a4ea75eac447a36364bead5a DRTVWR-5_2.2.0-beta1 9822eb3e25f7fe0c28ffd8aba45c507caa383cbc DRTVWR-3_2.2.0-beta2 +b0cd7e150009809a0b5b0a9d5785cd4bb230413a DRTVWR-7_2.2.0-beta3 -- cgit v1.2.3 From 2b50e197aff420e2fcbeff94ee1baa4ce5c31d56 Mon Sep 17 00:00:00 2001 From: Dessie Linden Date: Thu, 27 Jan 2011 14:42:03 -0800 Subject: Added tag DRTVWR-8_2.2.0-release for changeset 1415e6538d54 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 18140976c9..614caa912f 100644 --- a/.hgtags +++ b/.hgtags @@ -55,3 +55,4 @@ a82e5b1e22c7f90e3c7977d146b80588f004ed0d 2.5.0-start 7076e22f9f43f479a4ea75eac447a36364bead5a DRTVWR-5_2.2.0-beta1 9822eb3e25f7fe0c28ffd8aba45c507caa383cbc DRTVWR-3_2.2.0-beta2 b0cd7e150009809a0b5b0a9d5785cd4bb230413a DRTVWR-7_2.2.0-beta3 +1415e6538d54fd5d568ee88343424d57c6803c2c DRTVWR-8_2.2.0-release -- cgit v1.2.3 From 8a930fd6eb3cc4bd8f6ece49f145981c4b21d5cc Mon Sep 17 00:00:00 2001 From: Dessie Linden Date: Thu, 27 Jan 2011 14:42:32 -0800 Subject: Added tag DRTVWR-14_2.3.0-beta1 for changeset a3c12342b1af --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 614caa912f..496527158e 100644 --- a/.hgtags +++ b/.hgtags @@ -56,3 +56,4 @@ a82e5b1e22c7f90e3c7977d146b80588f004ed0d 2.5.0-start 9822eb3e25f7fe0c28ffd8aba45c507caa383cbc DRTVWR-3_2.2.0-beta2 b0cd7e150009809a0b5b0a9d5785cd4bb230413a DRTVWR-7_2.2.0-beta3 1415e6538d54fd5d568ee88343424d57c6803c2c DRTVWR-8_2.2.0-release +a3c12342b1af0951b8aa3b828aacef17fcea8178 DRTVWR-14_2.3.0-beta1 -- cgit v1.2.3 From c4ab18dfc308e94ef31e102da6304b956f4473c1 Mon Sep 17 00:00:00 2001 From: Dessie Linden Date: Thu, 27 Jan 2011 14:43:10 -0800 Subject: Added tag DRTVWR-17_2.3.0-beta2 for changeset db0fe9bb6518 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 496527158e..f92c7f9075 100644 --- a/.hgtags +++ b/.hgtags @@ -57,3 +57,4 @@ a82e5b1e22c7f90e3c7977d146b80588f004ed0d 2.5.0-start b0cd7e150009809a0b5b0a9d5785cd4bb230413a DRTVWR-7_2.2.0-beta3 1415e6538d54fd5d568ee88343424d57c6803c2c DRTVWR-8_2.2.0-release a3c12342b1af0951b8aa3b828aacef17fcea8178 DRTVWR-14_2.3.0-beta1 +db0fe9bb65187f365e58a717dd23d0f4754a9c1d DRTVWR-17_2.3.0-beta2 -- cgit v1.2.3 From b017a54858b6174e4068407bedf969d253b63ed2 Mon Sep 17 00:00:00 2001 From: Dessie Linden Date: Thu, 27 Jan 2011 14:43:49 -0800 Subject: Added tag DRTVWR-20_2.3.0-beta3 for changeset 6ad3d6fa35a4 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index f92c7f9075..dd94e69458 100644 --- a/.hgtags +++ b/.hgtags @@ -58,3 +58,4 @@ b0cd7e150009809a0b5b0a9d5785cd4bb230413a DRTVWR-7_2.2.0-beta3 1415e6538d54fd5d568ee88343424d57c6803c2c DRTVWR-8_2.2.0-release a3c12342b1af0951b8aa3b828aacef17fcea8178 DRTVWR-14_2.3.0-beta1 db0fe9bb65187f365e58a717dd23d0f4754a9c1d DRTVWR-17_2.3.0-beta2 +6ad3d6fa35a4e320e9ce442fce2bf9c7fc852556 DRTVWR-20_2.3.0-beta3 -- cgit v1.2.3 From 75978a3c84bd47d2e5f65f5f83f4a5f09e2d5fd0 Mon Sep 17 00:00:00 2001 From: Dessie Linden Date: Thu, 27 Jan 2011 14:44:05 -0800 Subject: Added tag DRTVWR-13_2.3.0-release for changeset 6ad3d6fa35a4 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index dd94e69458..6ec535cb1b 100644 --- a/.hgtags +++ b/.hgtags @@ -59,3 +59,4 @@ b0cd7e150009809a0b5b0a9d5785cd4bb230413a DRTVWR-7_2.2.0-beta3 a3c12342b1af0951b8aa3b828aacef17fcea8178 DRTVWR-14_2.3.0-beta1 db0fe9bb65187f365e58a717dd23d0f4754a9c1d DRTVWR-17_2.3.0-beta2 6ad3d6fa35a4e320e9ce442fce2bf9c7fc852556 DRTVWR-20_2.3.0-beta3 +6ad3d6fa35a4e320e9ce442fce2bf9c7fc852556 DRTVWR-13_2.3.0-release -- cgit v1.2.3 From 9ff19020bbbdad7a1647b7c0d1268a4d3c697212 Mon Sep 17 00:00:00 2001 From: Dessie Linden Date: Thu, 27 Jan 2011 14:44:23 -0800 Subject: Added tag DRTVWR-26_2.4.0-beta1 for changeset 3bc1f50a72e1 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 6ec535cb1b..16a967bbe3 100644 --- a/.hgtags +++ b/.hgtags @@ -60,3 +60,4 @@ a3c12342b1af0951b8aa3b828aacef17fcea8178 DRTVWR-14_2.3.0-beta1 db0fe9bb65187f365e58a717dd23d0f4754a9c1d DRTVWR-17_2.3.0-beta2 6ad3d6fa35a4e320e9ce442fce2bf9c7fc852556 DRTVWR-20_2.3.0-beta3 6ad3d6fa35a4e320e9ce442fce2bf9c7fc852556 DRTVWR-13_2.3.0-release +3bc1f50a72e117f4d4ad8d555f0c785ea8cc201e DRTVWR-26_2.4.0-beta1 -- cgit v1.2.3 From 8f7bc74e0ef1b5e428cdc4bef0d075b0bd00bded Mon Sep 17 00:00:00 2001 From: Dessie Linden Date: Thu, 27 Jan 2011 14:44:40 -0800 Subject: Added tag DRTVWR-27_2.4.0-beta2 for changeset 25bd6007e3d2 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 16a967bbe3..4947c11ae0 100644 --- a/.hgtags +++ b/.hgtags @@ -61,3 +61,4 @@ db0fe9bb65187f365e58a717dd23d0f4754a9c1d DRTVWR-17_2.3.0-beta2 6ad3d6fa35a4e320e9ce442fce2bf9c7fc852556 DRTVWR-20_2.3.0-beta3 6ad3d6fa35a4e320e9ce442fce2bf9c7fc852556 DRTVWR-13_2.3.0-release 3bc1f50a72e117f4d4ad8d555f0c785ea8cc201e DRTVWR-26_2.4.0-beta1 +25bd6007e3d2fc15db9326ed4b18a24a5969a46a DRTVWR-27_2.4.0-beta2 -- cgit v1.2.3 From b356c9f0e5b3da0ab5e7f46425ea8d40cad076d2 Mon Sep 17 00:00:00 2001 From: Dessie Linden Date: Thu, 27 Jan 2011 14:44:57 -0800 Subject: Added tag DRTVWR-25_2.4.0-release for changeset 1ed382c6a08b --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 4947c11ae0..072d066e29 100644 --- a/.hgtags +++ b/.hgtags @@ -62,3 +62,4 @@ db0fe9bb65187f365e58a717dd23d0f4754a9c1d DRTVWR-17_2.3.0-beta2 6ad3d6fa35a4e320e9ce442fce2bf9c7fc852556 DRTVWR-13_2.3.0-release 3bc1f50a72e117f4d4ad8d555f0c785ea8cc201e DRTVWR-26_2.4.0-beta1 25bd6007e3d2fc15db9326ed4b18a24a5969a46a DRTVWR-27_2.4.0-beta2 +1ed382c6a08ba3850b6ce9061bc551ddece0ea07 DRTVWR-25_2.4.0-release -- cgit v1.2.3 From 17232a83b1ea13bd4c4ab39e166587c09d529e6a Mon Sep 17 00:00:00 2001 From: Dessie Linden Date: Thu, 27 Jan 2011 14:45:14 -0800 Subject: Added tag DRTVWR-32_2.5.0-beta1 for changeset 345b17e7cf63 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 072d066e29..a1b00f252c 100644 --- a/.hgtags +++ b/.hgtags @@ -63,3 +63,4 @@ db0fe9bb65187f365e58a717dd23d0f4754a9c1d DRTVWR-17_2.3.0-beta2 3bc1f50a72e117f4d4ad8d555f0c785ea8cc201e DRTVWR-26_2.4.0-beta1 25bd6007e3d2fc15db9326ed4b18a24a5969a46a DRTVWR-27_2.4.0-beta2 1ed382c6a08ba3850b6ce9061bc551ddece0ea07 DRTVWR-25_2.4.0-release +345b17e7cf630db77e840b4fe3451bd476d750a3 DRTVWR-32_2.5.0-beta1 -- cgit v1.2.3 From 7b7e9b0d0bd9c35acb346ae359f9a08a48b248a2 Mon Sep 17 00:00:00 2001 From: Dessie Linden Date: Thu, 27 Jan 2011 14:45:42 -0800 Subject: Added tag DRTVWR-33_2.5.0-beta2 for changeset 54d772d8687c --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index a1b00f252c..a3eee211fc 100644 --- a/.hgtags +++ b/.hgtags @@ -64,3 +64,4 @@ db0fe9bb65187f365e58a717dd23d0f4754a9c1d DRTVWR-17_2.3.0-beta2 25bd6007e3d2fc15db9326ed4b18a24a5969a46a DRTVWR-27_2.4.0-beta2 1ed382c6a08ba3850b6ce9061bc551ddece0ea07 DRTVWR-25_2.4.0-release 345b17e7cf630db77e840b4fe3451bd476d750a3 DRTVWR-32_2.5.0-beta1 +54d772d8687c69b1d773f6ce14bbc7bdc9d6c05f DRTVWR-33_2.5.0-beta2 -- cgit v1.2.3 From 38dceba9b4a1faa386d377a20080a590ea20cbdb Mon Sep 17 00:00:00 2001 From: callum Date: Fri, 28 Jan 2011 11:17:18 -0800 Subject: STORM-927 - FIX - [VWR-24426] SSL Handshake Failed Error when accessing web-based content on development viewers using recent Webkit 4.7 Also removed refs to debug vars used to specify location of pem file --- indra/newview/app_settings/settings.xml | 22 ---------------------- indra/newview/llviewermedia.cpp | 21 +++++++++++---------- 2 files changed, 11 insertions(+), 32 deletions(-) diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index ef6f8fd3ee..ca587302b2 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -697,28 +697,6 @@ Value 0 - BrowserUseDefaultCAFile - - Comment - Tell the built-in web browser to use the CA.pem file shipped with the client. - Persist - 1 - Type - Boolean - Value - 1 - - BrowserCAFilePath - - Comment - Tell the built-in web browser the path to an alternative CA.pem file (only used if BrowserUseDefaultCAFile is false). - Persist - 1 - Type - String - Value - - BlockAvatarAppearanceMessages Comment diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp index d3b6dcd86f..433151860c 100644 --- a/indra/newview/llviewermedia.cpp +++ b/indra/newview/llviewermedia.cpp @@ -1828,16 +1828,17 @@ bool LLViewerMediaImpl::initializePlugin(const std::string& media_type) media_source->ignore_ssl_cert_errors(true); } - // start by assuming the default CA file will be used - std::string ca_path = gDirUtilp->getExpandedFilename( LL_PATH_APP_SETTINGS, "lindenlab.pem" ); - - // default turned off so pick up the user specified path - if( ! gSavedSettings.getBOOL("BrowserUseDefaultCAFile")) - { - ca_path = gSavedSettings.getString("BrowserCAFilePath"); - } - // set the path to the CA.pem file - media_source->addCertificateFilePath( ca_path ); + // NOTE: Removed as per STORM-927 - SSL handshake failed - setting local self-signed certs like this + // seems to screw things up big time. For now, devs will need to add these certs locally and Qt will pick them up. +// // start by assuming the default CA file will be used +// std::string ca_path = gDirUtilp->getExpandedFilename( LL_PATH_APP_SETTINGS, "lindenlab.pem" ); +// // default turned off so pick up the user specified path +// if( ! gSavedSettings.getBOOL("BrowserUseDefaultCAFile")) +// { +// ca_path = gSavedSettings.getString("BrowserCAFilePath"); +// } +// // set the path to the CA.pem file +// media_source->addCertificateFilePath( ca_path ); media_source->proxy_setup(gSavedSettings.getBOOL("BrowserProxyEnabled"), gSavedSettings.getString("BrowserProxyAddress"), gSavedSettings.getS32("BrowserProxyPort")); -- cgit v1.2.3 From ac7d7fea8288b1d6f5dec65f9dee5053d097fff5 Mon Sep 17 00:00:00 2001 From: callum Date: Fri, 28 Jan 2011 11:18:11 -0800 Subject: SOCIAL-452 FIX Default size of Web content floater is wrong - needs to be optimized for Web profile display --- .../newview/skins/default/xui/en/floater_web_content.xml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/indra/newview/skins/default/xui/en/floater_web_content.xml b/indra/newview/skins/default/xui/en/floater_web_content.xml index 1c64a5eb44..456b2d4421 100644 --- a/indra/newview/skins/default/xui/en/floater_web_content.xml +++ b/indra/newview/skins/default/xui/en/floater_web_content.xml @@ -12,7 +12,7 @@ auto_tile="true" title="" initial_mime_type="text/html" - width="735"> + width="780"> + width="770"> + width="770">