From 668307e4e3b59ac4f4f955aa0d36183c361352b8 Mon Sep 17 00:00:00 2001 From: Robin Cornelius Date: Wed, 23 Feb 2011 15:50:55 -0500 Subject: STORM-1019 Add ability to display beacons for Media on a Prim objects Changes merged into viewer 2 by Jonathan Yap --- doc/contributions.txt | 2 ++ 1 file changed, 2 insertions(+) (limited to 'doc') diff --git a/doc/contributions.txt b/doc/contributions.txt index 5d59627a92..d6ac7b4b3a 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -396,6 +396,7 @@ Jonathan Yap VWR-17801 VWR-24347 STORM-975 + STORM-1019 Kage Pixel VWR-11 Ken March @@ -624,6 +625,7 @@ Robin Cornelius SNOW-747 STORM-422 STORM-960 + STORM-1019 VWR-2488 VWR-9557 VWR-10579 -- cgit v1.3 From 65bdb537531141bcfb00163888540624a600a17b Mon Sep 17 00:00:00 2001 From: Jonathan Yap Date: Thu, 10 Mar 2011 06:44:03 -0500 Subject: STORM-1064 People sidebar panel elements have inconsistent widths and map is slightly too tall --- doc/contributions.txt | 1 + .../newview/skins/default/xui/en/panel_people.xml | 26 +++++++++++----------- 2 files changed, 14 insertions(+), 13 deletions(-) (limited to 'doc') diff --git a/doc/contributions.txt b/doc/contributions.txt index e94acb566a..c44e3fe5d8 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -407,6 +407,7 @@ Jonathan Yap VWR-17801 VWR-24347 STORM-990 + STORM-1064 Kage Pixel VWR-11 Ken March diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml index 43431ea7c1..1a00416b2a 100644 --- a/indra/newview/skins/default/xui/en/panel_people.xml +++ b/indra/newview/skins/default/xui/en/panel_people.xml @@ -76,7 +76,7 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M follows="all" height="383" layout="topleft" - left="5" + left="3" name="tabs" tab_group="1" tab_min_width="70" @@ -84,7 +84,7 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M tab_position="top" top_pad="10" halign="center" - width="317"> + width="319"> + top="5"/> + width="306" /> @@ -251,7 +251,7 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M top_pad="1" left="0" name="bottom_panel" - width="305"> + width="308"> + width="210"> + width="210" /> @@ -506,7 +506,7 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M height="27" label="bottom_panel" layout="topleft" - left="0" + left="3" name="bottom_panel" top_pad="0" width="313"> @@ -544,7 +544,7 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M layout="topleft" left_pad="1" name="dummy_icon" - width="241" + width="244" /> -- cgit v1.3 From d9015a836f59c228818dc85e37ef4807b2d1b181 Mon Sep 17 00:00:00 2001 From: Jonathan Yap Date: Wed, 16 Mar 2011 18:32:28 -0400 Subject: STORM-1077 Change "Voice Enabled/Disabled" to "Speak Button" --- doc/contributions.txt | 1 + indra/newview/app_settings/ignorable_dialogs.xml | 14 ++++++++++++-- indra/newview/llbottomtray.cpp | 9 ++++++++- indra/newview/llfirstuse.cpp | 6 ++++++ indra/newview/llfirstuse.h | 3 +++ indra/newview/skins/default/xui/en/menu_bottomtray.xml | 2 +- indra/newview/skins/default/xui/en/notifications.xml | 14 ++++++++++++++ 7 files changed, 45 insertions(+), 4 deletions(-) (limited to 'doc') diff --git a/doc/contributions.txt b/doc/contributions.txt index 4c2a836b4c..59de5ebde3 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -412,6 +412,7 @@ Jonathan Yap STORM-975 STORM-990 STORM-1020 + STORM-1077 Kage Pixel VWR-11 Ken March diff --git a/indra/newview/app_settings/ignorable_dialogs.xml b/indra/newview/app_settings/ignorable_dialogs.xml index 89fd4e5935..f6f4d5faa4 100644 --- a/indra/newview/app_settings/ignorable_dialogs.xml +++ b/indra/newview/app_settings/ignorable_dialogs.xml @@ -122,7 +122,17 @@ Value 1 - + FirstSpeak + + Comment + Shows hint for Speak button + Persist + 1 + Type + Boolean + Value + 1 + FirstSit Comment @@ -132,7 +142,7 @@ Type Boolean Value - 1 + 0 AboutDirectX9 diff --git a/indra/newview/llbottomtray.cpp b/indra/newview/llbottomtray.cpp index d8ec4b605c..2dfd2ba492 100644 --- a/indra/newview/llbottomtray.cpp +++ b/indra/newview/llbottomtray.cpp @@ -52,6 +52,7 @@ #include "llviewerwindow.h" #include "llsdserialize.h" +#include "llfirstuse.h" // Distance from mouse down on which drag'n'drop should be started. #define DRAG_START_DISTANCE 3 @@ -378,7 +379,12 @@ void LLBottomTray::onChange(EStatusType status, const std::string &channelURI, b // skipped to avoid button blinking if (status != STATUS_JOINING && status!= STATUS_LEFT_CHANNEL) { - mSpeakBtn->setFlyoutBtnEnabled(LLVoiceClient::getInstance()->voiceEnabled() && LLVoiceClient::getInstance()->isVoiceWorking()); + bool voice_status = LLVoiceClient::getInstance()->voiceEnabled() && LLVoiceClient::getInstance()->isVoiceWorking(); + mSpeakBtn->setFlyoutBtnEnabled(voice_status); + if (voice_status) + { + LLFirstUse::speak(true); + } } } @@ -562,6 +568,7 @@ BOOL LLBottomTray::postBuild() mSpeakPanel = getChild("speak_panel"); mSpeakBtn = getChild("talk"); + LLHints::registerHintTarget("speak_btn", mSpeakBtn->getHandle()); // Both parts of speak button should be initially disabled because // it takes some time between logging in to world and connecting to voice channel. diff --git a/indra/newview/llfirstuse.cpp b/indra/newview/llfirstuse.cpp index 4d252dc662..dd6d7f1b33 100644 --- a/indra/newview/llfirstuse.cpp +++ b/indra/newview/llfirstuse.cpp @@ -78,6 +78,12 @@ void LLFirstUse::otherAvatarChatFirst(bool enable) firstUseNotification("FirstOtherChatBeforeUser", enable, "HintChat", LLSD(), LLSD().with("target", "chat_bar").with("direction", "top_right").with("distance", 24)); } +// static +void LLFirstUse::speak(bool enable) +{ + firstUseNotification("FirstSpeak", enable, "HintSpeak", LLSD(), LLSD().with("target", "speak_btn").with("direction", "top")); +} + // static void LLFirstUse::sit(bool enable) { diff --git a/indra/newview/llfirstuse.h b/indra/newview/llfirstuse.h index 489f58626a..dff5483354 100644 --- a/indra/newview/llfirstuse.h +++ b/indra/newview/llfirstuse.h @@ -68,6 +68,8 @@ object or from inventory. 13. First time you open the debug menus (ctrl-alt-shift D) 14. First time you create/edit a sculpted prim. + +15. Explanation of Speak&flyout buttons. */ class LLNotification; @@ -85,6 +87,7 @@ public: //static void resetFirstUse(); static void otherAvatarChatFirst(bool enable = true); + static void speak(bool enable = true); static void sit(bool enable = true); static void notUsingDestinationGuide(bool enable = true); static void notUsingAvatarPicker(bool enable = true); diff --git a/indra/newview/skins/default/xui/en/menu_bottomtray.xml b/indra/newview/skins/default/xui/en/menu_bottomtray.xml index 1b55fa4fd3..63bfd39e29 100644 --- a/indra/newview/skins/default/xui/en/menu_bottomtray.xml +++ b/indra/newview/skins/default/xui/en/menu_bottomtray.xml @@ -9,7 +9,7 @@ visible="false" width="128"> + +Click the Speak button to turn your microphone off and on. + +Your microphone is on by default. + +Click on the up arrow to see the voice control panel. + +Hiding the Speak button will disable the voice feature. + + Date: Fri, 18 Mar 2011 08:05:36 -0400 Subject: OPEN-1: OPEN-37: Needed changes in autobuild.xml for OpenSource Developers to be able to use VS2010 Autobuild --- autobuild.xml | 133 +++++++++++++++++++++++++++++++++++++++++++++----- doc/contributions.txt | 2 + 2 files changed, 124 insertions(+), 11 deletions(-) (limited to 'doc') diff --git a/autobuild.xml b/autobuild.xml index ba70320d0c..f133c8d07c 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -1764,10 +1764,15 @@ name Release + VCexpressRelWithDebInfo configure + arguments + + ../indra + command cmake options @@ -1781,6 +1786,53 @@ name VCexpressRelWithDebInfo + + + VC10msbuildRelWithDebInfo + + configure + + arguments + + ../indra + + command + cmake + options + + -DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo + -DUNATTENDED:BOOL=OFF + -DWORD_SIZE:STRING=32 + -DROOT_PROJECT_NAME:STRING=SecondLife + + + name + VC10msbuildRelWithDebInfo + + + + VC10msbuildRelease + + configure + + arguments + + ../indra + + command + cmake + options + + -DCMAKE_BUILD_TYPE:STRING=Release + -DUNATTENDED:BOOL=OFF + -DWORD_SIZE:STRING=32 + -DROOT_PROJECT_NAME:STRING=SecondLife + + + name + VC10msbuildRelease + + name common @@ -2724,10 +2776,15 @@ name Release + VCexpressRelWithDebInfo build + arguments + + "RelWithDebInfo|Win32" + command vcbuild.exe options @@ -2738,30 +2795,84 @@ configure - arguments + options + + -G + "Visual Studio 8 2005" + -DSTANDALONE:BOOL=FALSE + -DINSTALL_PROPRIETARY=FALSE + -DFMOD=FALSE + + + name + VCexpressRelWithDebInfo + + + + VC10msbuildRelWithDebInfo + + build + + command + msbuild.exe + options - ..\indra - && - ..\indra\tools\vstool\VSTool.exe - --solution SecondLife.sln - --config - Release - --startup - secondlife-bin + /verbosity:minimal + /t:build + /p:Configuration=RelWithDebInfo + /p:Platform=Win32 + /p:"VCBuildAdditionalOptions= /useenv" + /p:"VCBuildAdditionalOptions= /incremental" + + + configure + + options + + -G + "Visual Studio 10" + -DSTANDALONE:BOOL=FALSE + -DINSTALL_PROPRIETARY=FALSE + -DFMOD=FALSE + + name + VC10msbuildRelWithDebInfo + + + + VC10msbuildRelease + + build + + command + msbuild.exe + options + + SecondLife.sln + /t:build + /p:Configuration=Release + /p:Platform=Win32 + /p:"VCBuildAdditionalOptions= /useenv" + /p:"VCBuildAdditionalOptions= /incremental" + + + configure + options -G - "Visual Studio 8 2005" + "Visual Studio 10" -DSTANDALONE:BOOL=FALSE -DINSTALL_PROPRIETARY=FALSE -DFMOD=FALSE name - VCexpressRelWithDebInfo + VC10msbuildRelease + name windows diff --git a/doc/contributions.txt b/doc/contributions.txt index a947b922ab..9caed38d30 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -833,6 +833,8 @@ Whoops Babii Wilton Lundquist VWR-7682 WolfPup Lowenhar + OPEN-1 + OPEN-37 SNOW-622 SNOW-772 STORM-102 -- cgit v1.3 From 819c7f0dd21b8b819cdc70686682e31cadf155d6 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Sun, 20 Mar 2011 07:48:29 -0400 Subject: document contributions from Nicky Perian --- doc/contributions.txt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'doc') diff --git a/doc/contributions.txt b/doc/contributions.txt index d6c0bc3ad5..998fed9cfb 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -1,8 +1,7 @@ Linden Lab would like to acknowledge source code contributions from the following residents. The Second Life resident name is given below, along with the issue identifier corresponding to the patches we've -received from them. To see more about these contributions, visit the -browsable version: http://wiki.secondlife.com/wiki/Source_contributions +received from them. Able Whitman VWR-650 @@ -577,6 +576,9 @@ Nicholaz Beresford VWR-2412 VWR-2682 VWR-2684 +Nicky Perian + OPEN-1 + OPEN-1087 Nounouch Hapmouche VWR-238 Patric Mills -- cgit v1.3 From be545aa51b67a9ab9d33c0c9b9b50486ed679bb8 Mon Sep 17 00:00:00 2001 From: Merov Linden Date: Wed, 23 Mar 2011 20:40:35 -0700 Subject: STORM-1090 : add attribution for the fix to Nicky --- doc/contributions.txt | 1 + 1 file changed, 1 insertion(+) (limited to 'doc') diff --git a/doc/contributions.txt b/doc/contributions.txt index 998fed9cfb..212d6fdc57 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -579,6 +579,7 @@ Nicholaz Beresford Nicky Perian OPEN-1 OPEN-1087 + STORM-1090 Nounouch Hapmouche VWR-238 Patric Mills -- cgit v1.3