From cf9d9237bed3ddf063b2744a009e8e8de55388fe Mon Sep 17 00:00:00 2001 From: Tofu Linden Date: Wed, 4 Nov 2009 18:30:59 +0000 Subject: more splitting of code. --- indra/newview/CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index e138b431c5..b989f0c230 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -386,6 +386,7 @@ set(viewer_SOURCE_FILES llsurfacepatch.cpp llsyswellitem.cpp llsyswellwindow.cpp + lltalkbutton.cpp llteleporthistory.cpp llteleporthistorystorage.cpp lltexglobalcolor.cpp @@ -872,6 +873,7 @@ set(viewer_HEADER_FILES llsyswellitem.h llsyswellwindow.h lltable.h + lltalkbutton.h llteleporthistory.h llteleporthistorystorage.h lltexglobalcolor.h -- cgit v1.3 From 7573cb61126ef7db439b9c4b690fd77d21aabbc9 Mon Sep 17 00:00:00 2001 From: Tofu Linden Date: Wed, 4 Nov 2009 18:34:11 +0000 Subject: split code. --- indra/newview/llchiclet.cpp | 153 +------------------------------------------- 1 file changed, 3 insertions(+), 150 deletions(-) diff --git a/indra/newview/llchiclet.cpp b/indra/newview/llchiclet.cpp index bad61101c1..a3c0a17186 100644 --- a/indra/newview/llchiclet.cpp +++ b/indra/newview/llchiclet.cpp @@ -51,10 +51,9 @@ #include "lltransientfloatermgr.h" static LLDefaultChildRegistry::Register t1("chiclet_panel"); -static LLDefaultChildRegistry::Register t2("chiclet_talk"); -static LLDefaultChildRegistry::Register t3("chiclet_notification"); -static LLDefaultChildRegistry::Register t4("chiclet_im_p2p"); -static LLDefaultChildRegistry::Register t5("chiclet_im_group"); +static LLDefaultChildRegistry::Register t2("chiclet_notification"); +static LLDefaultChildRegistry::Register t3("chiclet_im_p2p"); +static LLDefaultChildRegistry::Register t4("chiclet_im_group"); S32 LLNotificationChiclet::mUreadSystemNotifications = 0; @@ -1250,152 +1249,6 @@ bool LLChicletPanel::isAnyIMFloaterDoked() ////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////// -// *TODO Vadim: Move this out of llchiclet.cpp. - -LLTalkButton::Params::Params() - : speak_button("speak_button") - , show_button("show_button") - , monitor("monitor") -{ - // *TODO Vadim: move hardcoded labels (!) and other params to XUI. - speak_button.name("left"); - speak_button.label("Speak"); - speak_button.label_selected("Speak"); - speak_button.font(LLFontGL::getFontSansSerifSmall()); - speak_button.tab_stop(false); - speak_button.is_toggle(true); - speak_button.picture_style(true); - // Use default button art. JC - //speak_button.image_selected(LLUI::getUIImage("SegmentedBtn_Left_Selected")); - //speak_button.image_unselected(LLUI::getUIImage("SegmentedBtn_Left_Off")); - - show_button.name("right"); - show_button.label(LLStringUtil::null); - show_button.rect(LLRect(0, 0, 20, 0)); - show_button.tab_stop(false); - show_button.is_toggle(true); - show_button.picture_style(true); - show_button.image_selected(LLUI::getUIImage("ComboButton_Selected")); - show_button.image_unselected(LLUI::getUIImage("ComboButton_Off")); - - monitor.name("monitor"); - // *TODO: Make this data driven. - monitor.rect(LLRect(0, 18, 18, 0)); -} - -LLTalkButton::LLTalkButton(const Params& p) -: LLUICtrl(p) -, mPrivateCallPanel(NULL) -, mOutputMonitor(NULL) -, mSpeakBtn(NULL) -, mShowBtn(NULL) -{ - LLRect rect = p.rect(); - LLRect speak_rect(0, rect.getHeight(), rect.getWidth(), 0); - LLRect show_rect = p.show_button.rect(); - show_rect.set(0, rect.getHeight(), show_rect.getWidth(), 0); - - speak_rect.mRight -= show_rect.getWidth(); - show_rect.mLeft = speak_rect.getWidth(); - show_rect.mRight = rect.getWidth(); - - LLButton::Params speak_params = p.speak_button; - speak_params.rect(speak_rect); - mSpeakBtn = LLUICtrlFactory::create(speak_params); - addChild(mSpeakBtn); - LLTransientFloaterMgr::getInstance()->addControlView(mSpeakBtn); - - mSpeakBtn->setClickedCallback(boost::bind(&LLTalkButton::onClick_SpeakBtn, this)); - mSpeakBtn->setToggleState(FALSE); - - LLButton::Params show_params = p.show_button; - show_params.rect(show_rect); - mShowBtn = LLUICtrlFactory::create(show_params); - addChild(mShowBtn); - LLTransientFloaterMgr::getInstance()->addControlView(mShowBtn); - - mShowBtn->setClickedCallback(boost::bind(&LLTalkButton::onClick_ShowBtn, this)); - mShowBtn->setToggleState(FALSE); - - static const S32 MONITOR_RIGHT_PAD = 2; - - LLRect monitor_rect = p.monitor.rect(); - S32 monitor_height = monitor_rect.getHeight(); - monitor_rect.mLeft = speak_rect.getWidth() - monitor_rect.getWidth() - MONITOR_RIGHT_PAD; - monitor_rect.mRight = speak_rect.getWidth() - MONITOR_RIGHT_PAD; - monitor_rect.mBottom = (rect.getHeight() / 2) - (monitor_height / 2); - monitor_rect.mTop = monitor_rect.mBottom + monitor_height; - - LLOutputMonitorCtrl::Params monitor_params = p.monitor; - monitor_params.draw_border(false); - monitor_params.rect(monitor_rect); - monitor_params.auto_update(true); - monitor_params.speaker_id(gAgentID); - mOutputMonitor = LLUICtrlFactory::create(monitor_params); - mSpeakBtn->addChild(mOutputMonitor); - - // never show "muted" because you can't mute yourself - mOutputMonitor->setIsMuted(false); -} - -LLTalkButton::~LLTalkButton() -{ -} - -void LLTalkButton::setSpeakBtnToggleState(bool state) -{ - mSpeakBtn->setToggleState(state); -} - -void LLTalkButton::onClick_SpeakBtn() -{ - bool speaking = mSpeakBtn->getToggleState(); - gVoiceClient->setUserPTTState(speaking); -} - -void LLTalkButton::onClick_ShowBtn() -{ - if(!mShowBtn->getToggleState()) - { - mPrivateCallPanel->onClickClose(mPrivateCallPanel); - delete mPrivateCallPanel; - mPrivateCallPanel = NULL; - mShowBtn->setToggleState(FALSE); - return; - } - - S32 x = mSpeakBtn->getRect().mLeft; - S32 y = 0; - - localPointToScreen(x, y, &x, &y); - - mPrivateCallPanel = new LLVoiceControlPanel; - getRootView()->addChild(mPrivateCallPanel); - - y = LLBottomTray::getInstance()->getRect().getHeight() + mPrivateCallPanel->getRect().getHeight(); - - LLRect rect; - rect.setLeftTopAndSize(x, y, mPrivateCallPanel->getRect().getWidth(), mPrivateCallPanel->getRect().getHeight()); - mPrivateCallPanel->setRect(rect); - - - LLAvatarListItem* item = new LLAvatarListItem(); - item->showLastInteractionTime(false); - item->showInfoBtn(true); - item->showSpeakingIndicator(true); - item->reshape(mPrivateCallPanel->getRect().getWidth(), item->getRect().getHeight(), FALSE); - - mPrivateCallPanel->addItem(item); - mPrivateCallPanel->setVisible(TRUE); - mPrivateCallPanel->setFrontmost(TRUE); - - mShowBtn->setToggleState(TRUE); -} - -////////////////////////////////////////////////////////////////////////// -////////////////////////////////////////////////////////////////////////// -////////////////////////////////////////////////////////////////////////// - LLChicletNotificationCounterCtrl::LLChicletNotificationCounterCtrl(const Params& p) : LLTextBox(p) , mCounter(0) -- cgit v1.3 From 5eaf4731770419fa4b32efb498d641a7d9d2f521 Mon Sep 17 00:00:00 2001 From: Tofu Linden Date: Wed, 4 Nov 2009 18:37:05 +0000 Subject: more refactoring/paring/splitting.... --- indra/newview/llnearbychatbar.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/indra/newview/llnearbychatbar.h b/indra/newview/llnearbychatbar.h index 06204e6367..3fa1d3ea8a 100644 --- a/indra/newview/llnearbychatbar.h +++ b/indra/newview/llnearbychatbar.h @@ -37,11 +37,14 @@ #include "llcombobox.h" #include "llgesturemgr.h" #include "llchat.h" -#include "llchiclet.h" #include "llvoiceclient.h" #include "lloutputmonitorctrl.h" #include "llspeakers.h" + +class LLTalkButton; + + class LLGestureComboBox : public LLComboBox , public LLGestureManagerObserver -- cgit v1.3 From c9ac2b54b94b4b4bb30e9f0750601b6289a802a0 Mon Sep 17 00:00:00 2001 From: Tofu Linden Date: Wed, 4 Nov 2009 19:24:09 +0000 Subject: fix up the refactoring... --- indra/newview/llnearbychatbar.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/indra/newview/llnearbychatbar.cpp b/indra/newview/llnearbychatbar.cpp index 32dc5e5927..730939861b 100644 --- a/indra/newview/llnearbychatbar.cpp +++ b/indra/newview/llnearbychatbar.cpp @@ -36,6 +36,7 @@ #include "lltrans.h" #include "llnearbychatbar.h" +#include "lltalkbutton.h" #include "llbottomtray.h" #include "llagent.h" #include "llgesturemgr.h" -- cgit v1.3 From fe7750152b69aa89731ca95ac59ef402b6df137d Mon Sep 17 00:00:00 2001 From: "Brad Payne (Vir Linden)" Date: Wed, 4 Nov 2009 14:49:48 -0500 Subject: Added placeholder art for missing icons. --- indra/newview/skins/default/textures/icons/Inv_Alpha.png | Bin 0 -> 253 bytes indra/newview/skins/default/textures/icons/Inv_Tattoo.png | Bin 0 -> 253 bytes 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 indra/newview/skins/default/textures/icons/Inv_Alpha.png create mode 100644 indra/newview/skins/default/textures/icons/Inv_Tattoo.png diff --git a/indra/newview/skins/default/textures/icons/Inv_Alpha.png b/indra/newview/skins/default/textures/icons/Inv_Alpha.png new file mode 100644 index 0000000000..e8d246c6fa Binary files /dev/null and b/indra/newview/skins/default/textures/icons/Inv_Alpha.png differ diff --git a/indra/newview/skins/default/textures/icons/Inv_Tattoo.png b/indra/newview/skins/default/textures/icons/Inv_Tattoo.png new file mode 100644 index 0000000000..e8d246c6fa Binary files /dev/null and b/indra/newview/skins/default/textures/icons/Inv_Tattoo.png differ -- cgit v1.3 From 98a24938b3cd95f7c93283b91dc95582925265f5 Mon Sep 17 00:00:00 2001 From: "Brad Payne (Vir Linden)" Date: Wed, 4 Nov 2009 15:28:07 -0500 Subject: LLAppearanceManager::wearItem() - always check for extra links of same type, even if requested object is already linked. --- indra/newview/llappearancemgr.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp index 382947e464..033df053ad 100644 --- a/indra/newview/llappearancemgr.cpp +++ b/indra/newview/llappearancemgr.cpp @@ -1103,14 +1103,16 @@ void LLAppearanceManager::wearItem( LLInventoryItem* item, bool do_update ) bool linked_already = false; for (S32 i=0; igetLinkedUUID() == item->getLinkedUUID()) { linked_already = true; - break; } - // Are of same type but are not the same - new item will replace old. - if (areMatchingWearables(vitem,inv_item)) + // Are these links to different items of the same wearable + // type? If so, new item will replace old. + // MULTI-WEARABLES: revisit if more than one per type is allowed. + else if (areMatchingWearables(vitem,inv_item)) { gAgentWearables.removeWearable(inv_item->getWearableType(),true,0); gInventory.purgeObject(inv_item->getUUID()); -- cgit v1.3 From 179f18d1ab5cc93509339684029cf7e4fe0b3eaa Mon Sep 17 00:00:00 2001 From: Tofu Linden Date: Wed, 4 Nov 2009 20:34:11 +0000 Subject: LLTalkButton -> LLSpeakButton, 'cos that's what it is. --- indra/newview/CMakeLists.txt | 4 +- indra/newview/llbottomtray.cpp | 2 +- indra/newview/llbottomtray.h | 4 +- indra/newview/llchiclet.h | 36 ------- indra/newview/llnearbychatbar.cpp | 10 +- indra/newview/llnearbychatbar.h | 4 +- indra/newview/llspeakbutton.cpp | 196 ++++++++++++++++++++++++++++++++++++++ indra/newview/llspeakbutton.h | 81 ++++++++++++++++ 8 files changed, 289 insertions(+), 48 deletions(-) create mode 100644 indra/newview/llspeakbutton.cpp create mode 100644 indra/newview/llspeakbutton.h diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index b989f0c230..03bf41b118 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -376,6 +376,7 @@ set(viewer_SOURCE_FILES llsky.cpp llslurl.cpp llspatialpartition.cpp + llspeakbutton.cpp llspeakers.cpp llsplitbutton.cpp llsprite.cpp @@ -386,7 +387,6 @@ set(viewer_SOURCE_FILES llsurfacepatch.cpp llsyswellitem.cpp llsyswellwindow.cpp - lltalkbutton.cpp llteleporthistory.cpp llteleporthistorystorage.cpp lltexglobalcolor.cpp @@ -862,6 +862,7 @@ set(viewer_HEADER_FILES llsky.h llslurl.h llspatialpartition.h + llspeakbutton.h llspeakers.h llsplitbutton.h llsprite.h @@ -873,7 +874,6 @@ set(viewer_HEADER_FILES llsyswellitem.h llsyswellwindow.h lltable.h - lltalkbutton.h llteleporthistory.h llteleporthistorystorage.h lltexglobalcolor.h diff --git a/indra/newview/llbottomtray.cpp b/indra/newview/llbottomtray.cpp index ddcee5f453..a17ba79078 100644 --- a/indra/newview/llbottomtray.cpp +++ b/indra/newview/llbottomtray.cpp @@ -47,7 +47,7 @@ LLBottomTray::LLBottomTray(const LLSD&) : mChicletPanel(NULL), mSysWell(NULL), - mTalkBtn(NULL), + mSpeakBtn(NULL), mNearbyChatBar(NULL), mToolbarStack(NULL) diff --git a/indra/newview/llbottomtray.h b/indra/newview/llbottomtray.h index a28f1e42ec..02588a1975 100644 --- a/indra/newview/llbottomtray.h +++ b/indra/newview/llbottomtray.h @@ -43,7 +43,7 @@ class LLChicletPanel; class LLLineEditor; class LLLayoutStack; class LLNotificationChiclet; -class LLTalkButton; +class LLSpeakButton; class LLNearbyChatBar; class LLIMChiclet; @@ -110,7 +110,7 @@ protected: LLChicletPanel* mChicletPanel; LLNotificationChiclet* mSysWell; - LLTalkButton* mTalkBtn; + LLSpeakButton* mSpeakBtn; LLNearbyChatBar* mNearbyChatBar; LLLayoutStack* mToolbarStack; LLMenuGL* mBottomTrayContextMenu; diff --git a/indra/newview/llchiclet.h b/indra/newview/llchiclet.h index 6eefd9829f..e84111c53a 100644 --- a/indra/newview/llchiclet.h +++ b/indra/newview/llchiclet.h @@ -833,42 +833,6 @@ protected: bool mShowControls; }; -/* - * Button displaying voice chat status. Displays voice chat options When clicked. -*/ -class LLTalkButton : public LLUICtrl -{ -public: - - struct Params : public LLInitParam::Block - { - Optional speak_button, - show_button; - - Optional monitor; - - Params(); - }; - - /*virtual*/ ~LLTalkButton(); - - void setSpeakBtnToggleState(bool state); - -protected: - friend class LLUICtrlFactory; - LLTalkButton(const Params& p); - - void onClick_SpeakBtn(); - - void onClick_ShowBtn(); - -private: - LLButton* mSpeakBtn; - LLButton* mShowBtn; - LLVoiceControlPanel* mPrivateCallPanel; - LLOutputMonitorCtrl* mOutputMonitor; -}; - template T* LLChicletPanel::createChiclet(const LLUUID& session_id, S32 index) { diff --git a/indra/newview/llnearbychatbar.cpp b/indra/newview/llnearbychatbar.cpp index 730939861b..7c26264c9d 100644 --- a/indra/newview/llnearbychatbar.cpp +++ b/indra/newview/llnearbychatbar.cpp @@ -36,7 +36,7 @@ #include "lltrans.h" #include "llnearbychatbar.h" -#include "lltalkbutton.h" +#include "llspeakbutton.h" #include "llbottomtray.h" #include "llagent.h" #include "llgesturemgr.h" @@ -229,11 +229,11 @@ BOOL LLNearbyChatBar::postBuild() mOutputMonitor = getChild("chat_zone_indicator"); mOutputMonitor->setVisible(FALSE); - mTalkBtn = getParent()->getChild("talk"); + mSpeakBtn = getParent()->getChild("talk"); // Speak button should be initially disabled because // it takes some time between logging in to world and connecting to voice channel. - mTalkBtn->setEnabled(FALSE); + mSpeakBtn->setEnabled(FALSE); // Registering Chat Bar to receive Voice client status change notifications. gVoiceClient->addObserver(this); @@ -692,7 +692,7 @@ LLWString LLNearbyChatBar::stripChannelNumber(const LLWString &mesg, S32* channe void LLNearbyChatBar::setPTTState(bool state) { - mTalkBtn->setSpeakBtnToggleState(state); + mSpeakBtn->setSpeakBtnToggleState(state); } void send_chat_from_viewer(const std::string& utf8_out_text, EChatType type, S32 channel) @@ -748,7 +748,7 @@ void LLNearbyChatBar::onChange(EStatusType status, const std::string &channelURI break; } - mTalkBtn->setEnabled(enable); + mSpeakBtn->setEnabled(enable); } // Creating the object registers with the dispatcher. diff --git a/indra/newview/llnearbychatbar.h b/indra/newview/llnearbychatbar.h index 3fa1d3ea8a..9645c6b468 100644 --- a/indra/newview/llnearbychatbar.h +++ b/indra/newview/llnearbychatbar.h @@ -42,7 +42,7 @@ #include "llspeakers.h" -class LLTalkButton; +class LLSpeakButton; class LLGestureComboBox @@ -128,7 +128,7 @@ protected: static S32 sLastSpecialChatChannel; LLLineEditor* mChatBox; - LLTalkButton* mTalkBtn; + LLSpeakButton* mSpeakBtn; LLOutputMonitorCtrl* mOutputMonitor; LLActiveSpeakerMgr mSpeakerMgr; }; diff --git a/indra/newview/llspeakbutton.cpp b/indra/newview/llspeakbutton.cpp new file mode 100644 index 0000000000..c03495ada7 --- /dev/null +++ b/indra/newview/llspeakbutton.cpp @@ -0,0 +1,196 @@ +/** +* @file llspeakbutton.cpp +* @brief LLSpeakButton class implementation +* +* $LicenseInfo:firstyear=2002&license=viewergpl$ +* +* Copyright (c) 2002-2009, Linden Research, Inc. +* +* Second Life Viewer Source Code +* The source code in this file ("Source Code") is provided by Linden Lab +* to you under the terms of the GNU General Public License, version 2.0 +* ("GPL"), unless you have obtained a separate licensing agreement +* ("Other License"), formally executed by you and Linden Lab. Terms of +* the GPL can be found in doc/GPL-license.txt in this distribution, or +* online at http://secondlifegrid.net/programs/open_source/licensing/gplv2 +* +* There are special exceptions to the terms and conditions of the GPL as +* it is applied to this Source Code. View the full text of the exception +* in the file doc/FLOSS-exception.txt in this software distribution, or +* online at +* http://secondlifegrid.net/programs/open_source/licensing/flossexception +* +* By copying, modifying or distributing this software, you acknowledge +* that you have read and understood your obligations described above, +* and agree to abide by those obligations. +* +* ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO +* WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY, +* COMPLETENESS OR PERFORMANCE. +* $/LicenseInfo$ +*/ + +#include "llviewerprecompiledheaders.h" // must be first include + +#include "llagent.h" +#include "llbottomtray.h" +#include "llfloaterreg.h" +#include "llvoiceclient.h" +#include "llvoicecontrolpanel.h" +#include "lltransientfloatermgr.h" + +#include "llavatariconctrl.h" +#include "llbutton.h" +#include "llpanel.h" +#include "lltextbox.h" +#include "lloutputmonitorctrl.h" +#include "llgroupmgr.h" + +#include "llspeakbutton.h" + +static LLDefaultChildRegistry::Register t1("chiclet_talk"); + +////////////////////////////////////////////////////////////////////////// +////////////////////////////////////////////////////////////////////////// +////////////////////////////////////////////////////////////////////////// + +LLSpeakButton::Params::Params() + : speak_button("speak_button") + , show_button("show_button") + , monitor("monitor") +{ + // *TODO Vadim: move hardcoded labels (!) and other params to XUI. + speak_button.name("left"); + speak_button.label("Speak"); + speak_button.label_selected("Speak"); + speak_button.font(LLFontGL::getFontSansSerifSmall()); + speak_button.tab_stop(false); + speak_button.is_toggle(true); + speak_button.picture_style(true); + // Use default button art. JC + //speak_button.image_selected(LLUI::getUIImage("SegmentedBtn_Left_Selected")); + //speak_button.image_unselected(LLUI::getUIImage("SegmentedBtn_Left_Off")); + + show_button.name("right"); + show_button.label(LLStringUtil::null); + show_button.rect(LLRect(0, 0, 20, 0)); + show_button.tab_stop(false); + show_button.is_toggle(true); + show_button.picture_style(true); + show_button.image_selected(LLUI::getUIImage("ComboButton_Selected")); + show_button.image_unselected(LLUI::getUIImage("ComboButton_Off")); + + monitor.name("monitor"); + // *TODO: Make this data driven. + monitor.rect(LLRect(0, 18, 18, 0)); +} + +LLSpeakButton::LLSpeakButton(const Params& p) +: LLUICtrl(p) +, mPrivateCallPanel(NULL) +, mOutputMonitor(NULL) +, mSpeakBtn(NULL) +, mShowBtn(NULL) +{ + LLRect rect = p.rect(); + LLRect speak_rect(0, rect.getHeight(), rect.getWidth(), 0); + LLRect show_rect = p.show_button.rect(); + show_rect.set(0, rect.getHeight(), show_rect.getWidth(), 0); + + speak_rect.mRight -= show_rect.getWidth(); + show_rect.mLeft = speak_rect.getWidth(); + show_rect.mRight = rect.getWidth(); + + LLButton::Params speak_params = p.speak_button; + speak_params.rect(speak_rect); + mSpeakBtn = LLUICtrlFactory::create(speak_params); + addChild(mSpeakBtn); + LLTransientFloaterMgr::getInstance()->addControlView(mSpeakBtn); + + mSpeakBtn->setClickedCallback(boost::bind(&LLSpeakButton::onClick_SpeakBtn, this)); + mSpeakBtn->setToggleState(FALSE); + + LLButton::Params show_params = p.show_button; + show_params.rect(show_rect); + mShowBtn = LLUICtrlFactory::create(show_params); + addChild(mShowBtn); + LLTransientFloaterMgr::getInstance()->addControlView(mShowBtn); + + mShowBtn->setClickedCallback(boost::bind(&LLSpeakButton::onClick_ShowBtn, this)); + mShowBtn->setToggleState(FALSE); + + static const S32 MONITOR_RIGHT_PAD = 2; + + LLRect monitor_rect = p.monitor.rect(); + S32 monitor_height = monitor_rect.getHeight(); + monitor_rect.mLeft = speak_rect.getWidth() - monitor_rect.getWidth() - MONITOR_RIGHT_PAD; + monitor_rect.mRight = speak_rect.getWidth() - MONITOR_RIGHT_PAD; + monitor_rect.mBottom = (rect.getHeight() / 2) - (monitor_height / 2); + monitor_rect.mTop = monitor_rect.mBottom + monitor_height; + + LLOutputMonitorCtrl::Params monitor_params = p.monitor; + monitor_params.draw_border(false); + monitor_params.rect(monitor_rect); + monitor_params.auto_update(true); + monitor_params.speaker_id(gAgentID); + mOutputMonitor = LLUICtrlFactory::create(monitor_params); + mSpeakBtn->addChild(mOutputMonitor); + + // never show "muted" because you can't mute yourself + mOutputMonitor->setIsMuted(false); +} + +LLSpeakButton::~LLSpeakButton() +{ +} + +void LLSpeakButton::setSpeakBtnToggleState(bool state) +{ + mSpeakBtn->setToggleState(state); +} + +void LLSpeakButton::onClick_SpeakBtn() +{ + bool speaking = mSpeakBtn->getToggleState(); + gVoiceClient->setUserPTTState(speaking); +} + +void LLSpeakButton::onClick_ShowBtn() +{ + if(!mShowBtn->getToggleState()) + { + mPrivateCallPanel->onClickClose(mPrivateCallPanel); + delete mPrivateCallPanel; + mPrivateCallPanel = NULL; + mShowBtn->setToggleState(FALSE); + return; + } + + S32 x = mSpeakBtn->getRect().mLeft; + S32 y = 0; + + localPointToScreen(x, y, &x, &y); + + mPrivateCallPanel = new LLVoiceControlPanel; + getRootView()->addChild(mPrivateCallPanel); + + y = LLBottomTray::getInstance()->getRect().getHeight() + mPrivateCallPanel->getRect().getHeight(); + + LLRect rect; + rect.setLeftTopAndSize(x, y, mPrivateCallPanel->getRect().getWidth(), mPrivateCallPanel->getRect().getHeight()); + mPrivateCallPanel->setRect(rect); + + + LLAvatarListItem* item = new LLAvatarListItem(); + item->showLastInteractionTime(false); + item->showInfoBtn(true); + item->showSpeakingIndicator(true); + item->reshape(mPrivateCallPanel->getRect().getWidth(), item->getRect().getHeight(), FALSE); + + mPrivateCallPanel->addItem(item); + mPrivateCallPanel->setVisible(TRUE); + mPrivateCallPanel->setFrontmost(TRUE); + + mShowBtn->setToggleState(TRUE); +} + diff --git a/indra/newview/llspeakbutton.h b/indra/newview/llspeakbutton.h new file mode 100644 index 0000000000..f1d15ebd70 --- /dev/null +++ b/indra/newview/llspeakbutton.h @@ -0,0 +1,81 @@ +/** +* @file llspeakbutton.h +* @brief LLSpeakButton class header file +* +* $LicenseInfo:firstyear=2002&license=viewergpl$ +* +* Copyright (c) 2002-2009, Linden Research, Inc. +* +* Second Life Viewer Source Code +* The source code in this file ("Source Code") is provided by Linden Lab +* to you under the terms of the GNU General Public License, version 2.0 +* ("GPL"), unless you have obtained a separate licensing agreement +* ("Other License"), formally executed by you and Linden Lab. Terms of +* the GPL can be found in doc/GPL-license.txt in this distribution, or +* online at http://secondlifegrid.net/programs/open_source/licensing/gplv2 +* +* There are special exceptions to the terms and conditions of the GPL as +* it is applied to this Source Code. View the full text of the exception +* in the file doc/FLOSS-exception.txt in this software distribution, or +* online at +* http://secondlifegrid.net/programs/open_source/licensing/flossexception +* +* By copying, modifying or distributing this software, you acknowledge +* that you have read and understood your obligations described above, +* and agree to abide by those obligations. +* +* ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO +* WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY, +* COMPLETENESS OR PERFORMANCE. +* $/LicenseInfo$ +*/ + +#ifndef LL_LLSPEAKBUTTON_H +#define LL_LLSPEAKBUTTON_H + +#include "llinitparam.h" +#include "lluictrl.h" + +class LLVoiceControlPanel; +class LLButton; +class LLOutputMonitorCtrl; + +/* + * Button displaying voice chat status. Displays voice chat options when + * clicked. +*/ +class LLSpeakButton : public LLUICtrl +{ +public: + + struct Params : public LLInitParam::Block + { + Optional + speak_button, + show_button; + + Optional monitor; + + Params(); + }; + + /*virtual*/ ~LLSpeakButton(); + + void setSpeakBtnToggleState(bool state); + +protected: + friend class LLUICtrlFactory; + LLSpeakButton(const Params& p); + + void onClick_SpeakBtn(); + + void onClick_ShowBtn(); + +private: + LLButton* mSpeakBtn; + LLButton* mShowBtn; + LLVoiceControlPanel* mPrivateCallPanel; + LLOutputMonitorCtrl* mOutputMonitor; +}; + +#endif // LL_LLSPEAKBUTTON_H -- cgit v1.3 From dc365be4d23d8070a4f9e670918dbe8ccbe8cc79 Mon Sep 17 00:00:00 2001 From: "Brad Payne (Vir Linden)" Date: Wed, 4 Nov 2009 18:03:04 -0500 Subject: For EXT-1985: Clothing previously taken off is re-worn when creating a new clothing item in appearance mode. General problem with failing to update the COF when clothing items were removed. Added hook in removeWearableFinal, which should guarantee that we're always removing clothing links when we need to. --- indra/newview/llagentwearables.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/indra/newview/llagentwearables.cpp b/indra/newview/llagentwearables.cpp index 4b3d27767c..7d215b5778 100644 --- a/indra/newview/llagentwearables.cpp +++ b/indra/newview/llagentwearables.cpp @@ -1393,6 +1393,7 @@ void LLAgentWearables::removeWearableFinal(const EWearableType type, bool do_rem const LLUUID &item_id = getWearableItemID(type,i); popWearable(type,i); gInventory.addChangedMask(LLInventoryObserver::LABEL, item_id); + LLAppearanceManager::removeItemLinks(item_id,false); //queryWearableCache(); // moved below if (old_wearable) @@ -1409,6 +1410,7 @@ void LLAgentWearables::removeWearableFinal(const EWearableType type, bool do_rem const LLUUID &item_id = getWearableItemID(type,index); popWearable(type, index); gInventory.addChangedMask(LLInventoryObserver::LABEL, item_id); + LLAppearanceManager::removeItemLinks(item_id,false); //queryWearableCache(); // moved below -- cgit v1.3 From 5c2d187d6fb296876c2c3cba5817c749598f4283 Mon Sep 17 00:00:00 2001 From: "Brad Payne (Vir Linden)" Date: Wed, 4 Nov 2009 18:58:27 -0500 Subject: Small cleanup in LLAgentWearables.cpp --- indra/newview/llagentwearables.cpp | 6 +-- indra/newview/llagentwearables.h | 6 +-- indra/newview/llviewermenu.cpp | 102 ++++--------------------------------- 3 files changed, 15 insertions(+), 99 deletions(-) diff --git a/indra/newview/llagentwearables.cpp b/indra/newview/llagentwearables.cpp index 7d215b5778..d8aca860d5 100644 --- a/indra/newview/llagentwearables.cpp +++ b/indra/newview/llagentwearables.cpp @@ -1724,10 +1724,8 @@ void LLAgentWearables::queryWearableCache() // MULTI_WEARABLE: need a way to specify by wearable rather than by type. // User has picked "remove from avatar" from a menu. // static -void LLAgentWearables::userRemoveWearable(void* userdata) +void LLAgentWearables::userRemoveWearable(EWearableType& type) { - EWearableType type = (EWearableType)(intptr_t)userdata; - if (!(type==WT_SHAPE || type==WT_SKIN || type==WT_HAIR)) //&& //!((!gAgent.isTeen()) && (type==WT_UNDERPANTS || type==WT_UNDERSHIRT))) { @@ -1737,7 +1735,7 @@ void LLAgentWearables::userRemoveWearable(void* userdata) } // static -void LLAgentWearables::userRemoveAllClothes(void* userdata) +void LLAgentWearables::userRemoveAllClothes() { // We have to do this up front to avoid having to deal with the case of multiple wearables being dirty. if (gFloaterCustomize) diff --git a/indra/newview/llagentwearables.h b/indra/newview/llagentwearables.h index 97de785c87..317f4a7e4f 100644 --- a/indra/newview/llagentwearables.h +++ b/indra/newview/llagentwearables.h @@ -191,9 +191,9 @@ public: //-------------------------------------------------------------------- public: // MULTI-WEARABLE: assuming one wearable per type. Need upstream changes. - static void userRemoveWearable(void* userdata); // userdata is EWearableType - static void userRemoveAllClothes(void* userdata); // userdata is NULL - + static void userRemoveWearable(EWearableType& type); + static void userRemoveAllClothes(); + typedef std::vector llvo_vec_t; static void userUpdateAttachments(LLInventoryModel::item_array_t& obj_item_array); diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index 23ceb1e72d..c85ed46cd6 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -7461,52 +7461,10 @@ class LLEditEnableTakeOff : public view_listener_t bool handleEvent(const LLSD& userdata) { std::string clothing = userdata.asString(); - bool new_value = false; - if (clothing == "shirt") - { - new_value = LLAgentWearables::selfHasWearable(WT_SHIRT); - } - if (clothing == "pants") - { - new_value = LLAgentWearables::selfHasWearable(WT_PANTS); - } - if (clothing == "shoes") - { - new_value = LLAgentWearables::selfHasWearable(WT_SHOES); - } - if (clothing == "socks") - { - new_value = LLAgentWearables::selfHasWearable(WT_SOCKS); - } - if (clothing == "jacket") - { - new_value = LLAgentWearables::selfHasWearable(WT_JACKET); - } - if (clothing == "gloves") - { - new_value = LLAgentWearables::selfHasWearable(WT_GLOVES); - } - if (clothing == "undershirt") - { - new_value = LLAgentWearables::selfHasWearable(WT_UNDERSHIRT); - } - if (clothing == "underpants") - { - new_value = LLAgentWearables::selfHasWearable(WT_UNDERPANTS); - } - if (clothing == "skirt") - { - new_value = LLAgentWearables::selfHasWearable(WT_SKIRT); - } - if (clothing == "alpha") - { - new_value = LLAgentWearables::selfHasWearable(WT_ALPHA); - } - if (clothing == "tattoo") - { - new_value = LLAgentWearables::selfHasWearable(WT_TATTOO); - } - return new_value; + EWearableType type = LLWearableDictionary::typeNameToType(clothing); + if (type >= WT_SHAPE && type < WT_COUNT) + return LLAgentWearables::selfHasWearable(type); + return false; } }; @@ -7515,53 +7473,13 @@ class LLEditTakeOff : public view_listener_t bool handleEvent(const LLSD& userdata) { std::string clothing = userdata.asString(); - if (clothing == "shirt") - { - LLAgentWearables::userRemoveWearable((void*)WT_SHIRT); - } - else if (clothing == "pants") - { - LLAgentWearables::userRemoveWearable((void*)WT_PANTS); - } - else if (clothing == "shoes") - { - LLAgentWearables::userRemoveWearable((void*)WT_SHOES); - } - else if (clothing == "socks") - { - LLAgentWearables::userRemoveWearable((void*)WT_SOCKS); - } - else if (clothing == "jacket") - { - LLAgentWearables::userRemoveWearable((void*)WT_JACKET); - } - else if (clothing == "gloves") - { - LLAgentWearables::userRemoveWearable((void*)WT_GLOVES); - } - else if (clothing == "undershirt") - { - LLAgentWearables::userRemoveWearable((void*)WT_UNDERSHIRT); - } - else if (clothing == "underpants") - { - LLAgentWearables::userRemoveWearable((void*)WT_UNDERPANTS); - } - else if (clothing == "skirt") - { - LLAgentWearables::userRemoveWearable((void*)WT_SKIRT); - } - else if (clothing == "alpha") - { - LLAgentWearables::userRemoveWearable((void*)WT_ALPHA); - } - else if (clothing == "tattoo") - { - LLAgentWearables::userRemoveWearable((void*)WT_TATTOO); - } - else if (clothing == "all") + if (clothing == "all") + LLAgentWearables::userRemoveAllClothes(); + else { - LLAgentWearables::userRemoveAllClothes(NULL); + EWearableType type = LLWearableDictionary::typeNameToType(clothing); + if (type >= WT_SHAPE && type < WT_COUNT) + LLAgentWearables::userRemoveWearable(type); } return true; } -- cgit v1.3 From 1f0848969c6464648c6c60b771037f7a9eb98cad Mon Sep 17 00:00:00 2001 From: richard Date: Wed, 4 Nov 2009 16:33:08 -0800 Subject: converted all floater titles to uppercase --- indra/newview/skins/default/xui/da/floater_about.xml | 2 +- indra/newview/skins/default/xui/da/floater_about_land.xml | 2 +- indra/newview/skins/default/xui/da/floater_auction.xml | 2 +- indra/newview/skins/default/xui/da/floater_avatar_picker.xml | 2 +- indra/newview/skins/default/xui/da/floater_avatar_textures.xml | 2 +- indra/newview/skins/default/xui/da/floater_beacons.xml | 2 +- indra/newview/skins/default/xui/da/floater_build_options.xml | 2 +- indra/newview/skins/default/xui/da/floater_bulk_perms.xml | 2 +- indra/newview/skins/default/xui/da/floater_bumps.xml | 2 +- indra/newview/skins/default/xui/da/floater_buy_contents.xml | 2 +- indra/newview/skins/default/xui/da/floater_buy_currency.xml | 2 +- indra/newview/skins/default/xui/da/floater_buy_land.xml | 2 +- indra/newview/skins/default/xui/da/floater_buy_object.xml | 2 +- indra/newview/skins/default/xui/da/floater_choose_group.xml | 2 +- indra/newview/skins/default/xui/da/floater_color_picker.xml | 2 +- indra/newview/skins/default/xui/da/floater_customize.xml | 2 +- indra/newview/skins/default/xui/da/floater_day_cycle_options.xml | 2 +- indra/newview/skins/default/xui/da/floater_device_settings.xml | 2 +- indra/newview/skins/default/xui/da/floater_env_settings.xml | 2 +- indra/newview/skins/default/xui/da/floater_font_test.xml | 2 +- indra/newview/skins/default/xui/da/floater_gesture.xml | 2 +- indra/newview/skins/default/xui/da/floater_hardware_settings.xml | 2 +- indra/newview/skins/default/xui/da/floater_hud.xml | 2 +- indra/newview/skins/default/xui/da/floater_inspect.xml | 2 +- indra/newview/skins/default/xui/da/floater_inventory.xml | 2 +- .../skins/default/xui/da/floater_inventory_item_properties.xml | 2 +- indra/newview/skins/default/xui/da/floater_inventory_view_finder.xml | 2 +- indra/newview/skins/default/xui/da/floater_joystick.xml | 2 +- indra/newview/skins/default/xui/da/floater_lagmeter.xml | 2 +- indra/newview/skins/default/xui/da/floater_land_holdings.xml | 2 +- indra/newview/skins/default/xui/da/floater_live_lsleditor.xml | 2 +- indra/newview/skins/default/xui/da/floater_lsl_guide.xml | 2 +- indra/newview/skins/default/xui/da/floater_media_browser.xml | 2 +- indra/newview/skins/default/xui/da/floater_mem_leaking.xml | 2 +- indra/newview/skins/default/xui/da/floater_mute_object.xml | 2 +- indra/newview/skins/default/xui/da/floater_my_friends.xml | 2 +- indra/newview/skins/default/xui/da/floater_openobject.xml | 2 +- indra/newview/skins/default/xui/da/floater_perm_prefs.xml | 2 +- indra/newview/skins/default/xui/da/floater_postcard.xml | 2 +- indra/newview/skins/default/xui/da/floater_preferences.xml | 2 +- indra/newview/skins/default/xui/da/floater_preview_classified.xml | 2 +- indra/newview/skins/default/xui/da/floater_preview_event.xml | 2 +- indra/newview/skins/default/xui/da/floater_preview_notecard.xml | 2 +- indra/newview/skins/default/xui/da/floater_region_info.xml | 2 +- indra/newview/skins/default/xui/da/floater_report_abuse.xml | 2 +- indra/newview/skins/default/xui/da/floater_script_debug.xml | 2 +- indra/newview/skins/default/xui/da/floater_script_preview.xml | 2 +- indra/newview/skins/default/xui/da/floater_script_queue.xml | 2 +- indra/newview/skins/default/xui/da/floater_script_search.xml | 2 +- indra/newview/skins/default/xui/da/floater_sell_land.xml | 2 +- indra/newview/skins/default/xui/da/floater_settings_debug.xml | 2 +- indra/newview/skins/default/xui/da/floater_snapshot.xml | 2 +- indra/newview/skins/default/xui/da/floater_sound_preview.xml | 2 +- indra/newview/skins/default/xui/da/floater_statistics.xml | 2 +- indra/newview/skins/default/xui/da/floater_telehub.xml | 2 +- indra/newview/skins/default/xui/da/floater_texture_ctrl.xml | 2 +- indra/newview/skins/default/xui/da/floater_tools.xml | 2 +- indra/newview/skins/default/xui/da/floater_top_objects.xml | 2 +- indra/newview/skins/default/xui/da/floater_water.xml | 2 +- indra/newview/skins/default/xui/da/floater_windlight_options.xml | 2 +- indra/newview/skins/default/xui/da/floater_world_map.xml | 2 +- indra/newview/skins/default/xui/de/floater_about.xml | 2 +- indra/newview/skins/default/xui/de/floater_about_land.xml | 2 +- indra/newview/skins/default/xui/de/floater_auction.xml | 2 +- indra/newview/skins/default/xui/de/floater_avatar_picker.xml | 2 +- indra/newview/skins/default/xui/de/floater_avatar_textures.xml | 2 +- indra/newview/skins/default/xui/de/floater_beacons.xml | 2 +- indra/newview/skins/default/xui/de/floater_build_options.xml | 2 +- indra/newview/skins/default/xui/de/floater_bulk_perms.xml | 2 +- indra/newview/skins/default/xui/de/floater_bumps.xml | 2 +- indra/newview/skins/default/xui/de/floater_buy_contents.xml | 2 +- indra/newview/skins/default/xui/de/floater_buy_currency.xml | 2 +- indra/newview/skins/default/xui/de/floater_buy_land.xml | 2 +- indra/newview/skins/default/xui/de/floater_buy_object.xml | 2 +- indra/newview/skins/default/xui/de/floater_choose_group.xml | 2 +- indra/newview/skins/default/xui/de/floater_color_picker.xml | 2 +- indra/newview/skins/default/xui/de/floater_customize.xml | 2 +- indra/newview/skins/default/xui/de/floater_day_cycle_options.xml | 2 +- indra/newview/skins/default/xui/de/floater_device_settings.xml | 2 +- indra/newview/skins/default/xui/de/floater_env_settings.xml | 2 +- indra/newview/skins/default/xui/de/floater_font_test.xml | 2 +- indra/newview/skins/default/xui/de/floater_gesture.xml | 2 +- indra/newview/skins/default/xui/de/floater_god_tools.xml | 2 +- indra/newview/skins/default/xui/de/floater_hardware_settings.xml | 2 +- indra/newview/skins/default/xui/de/floater_hud.xml | 2 +- indra/newview/skins/default/xui/de/floater_inspect.xml | 2 +- indra/newview/skins/default/xui/de/floater_inventory.xml | 2 +- .../skins/default/xui/de/floater_inventory_item_properties.xml | 2 +- indra/newview/skins/default/xui/de/floater_inventory_view_finder.xml | 2 +- indra/newview/skins/default/xui/de/floater_joystick.xml | 2 +- indra/newview/skins/default/xui/de/floater_lagmeter.xml | 2 +- indra/newview/skins/default/xui/de/floater_land_holdings.xml | 2 +- indra/newview/skins/default/xui/de/floater_live_lsleditor.xml | 2 +- indra/newview/skins/default/xui/de/floater_lsl_guide.xml | 2 +- indra/newview/skins/default/xui/de/floater_media_browser.xml | 2 +- indra/newview/skins/default/xui/de/floater_mem_leaking.xml | 2 +- indra/newview/skins/default/xui/de/floater_mute_object.xml | 2 +- indra/newview/skins/default/xui/de/floater_my_friends.xml | 2 +- indra/newview/skins/default/xui/de/floater_notification.xml | 2 +- indra/newview/skins/default/xui/de/floater_notifications_console.xml | 2 +- indra/newview/skins/default/xui/de/floater_openobject.xml | 2 +- indra/newview/skins/default/xui/de/floater_perm_prefs.xml | 2 +- indra/newview/skins/default/xui/de/floater_post_process.xml | 2 +- indra/newview/skins/default/xui/de/floater_postcard.xml | 2 +- indra/newview/skins/default/xui/de/floater_preferences.xml | 2 +- indra/newview/skins/default/xui/de/floater_preview_classified.xml | 2 +- indra/newview/skins/default/xui/de/floater_preview_event.xml | 2 +- indra/newview/skins/default/xui/de/floater_preview_notecard.xml | 2 +- indra/newview/skins/default/xui/de/floater_region_info.xml | 2 +- indra/newview/skins/default/xui/de/floater_report_abuse.xml | 2 +- indra/newview/skins/default/xui/de/floater_script_debug.xml | 2 +- indra/newview/skins/default/xui/de/floater_script_preview.xml | 2 +- indra/newview/skins/default/xui/de/floater_script_queue.xml | 2 +- indra/newview/skins/default/xui/de/floater_script_search.xml | 2 +- indra/newview/skins/default/xui/de/floater_sell_land.xml | 2 +- indra/newview/skins/default/xui/de/floater_settings_debug.xml | 2 +- indra/newview/skins/default/xui/de/floater_snapshot.xml | 2 +- indra/newview/skins/default/xui/de/floater_sound_preview.xml | 2 +- indra/newview/skins/default/xui/de/floater_statistics.xml | 2 +- indra/newview/skins/default/xui/de/floater_telehub.xml | 2 +- indra/newview/skins/default/xui/de/floater_texture_ctrl.xml | 2 +- indra/newview/skins/default/xui/de/floater_tools.xml | 2 +- indra/newview/skins/default/xui/de/floater_top_objects.xml | 2 +- indra/newview/skins/default/xui/de/floater_water.xml | 2 +- indra/newview/skins/default/xui/de/floater_windlight_options.xml | 2 +- indra/newview/skins/default/xui/de/floater_world_map.xml | 2 +- indra/newview/skins/default/xui/en/floater_aaa.xml | 2 +- indra/newview/skins/default/xui/en/floater_about.xml | 2 +- indra/newview/skins/default/xui/en/floater_about_land.xml | 4 ++-- indra/newview/skins/default/xui/en/floater_activeim.xml | 2 +- indra/newview/skins/default/xui/en/floater_auction.xml | 2 +- indra/newview/skins/default/xui/en/floater_avatar_picker.xml | 2 +- indra/newview/skins/default/xui/en/floater_avatar_textures.xml | 2 +- indra/newview/skins/default/xui/en/floater_beacons.xml | 2 +- indra/newview/skins/default/xui/en/floater_build_options.xml | 2 +- indra/newview/skins/default/xui/en/floater_bulk_perms.xml | 2 +- indra/newview/skins/default/xui/en/floater_bumps.xml | 2 +- indra/newview/skins/default/xui/en/floater_buy_contents.xml | 2 +- indra/newview/skins/default/xui/en/floater_buy_currency.xml | 2 +- indra/newview/skins/default/xui/en/floater_buy_land.xml | 2 +- indra/newview/skins/default/xui/en/floater_buy_object.xml | 2 +- indra/newview/skins/default/xui/en/floater_choose_group.xml | 2 +- indra/newview/skins/default/xui/en/floater_color_picker.xml | 2 +- indra/newview/skins/default/xui/en/floater_customize.xml | 2 +- indra/newview/skins/default/xui/en/floater_day_cycle_options.xml | 2 +- indra/newview/skins/default/xui/en/floater_device_settings.xml | 4 ++-- indra/newview/skins/default/xui/en/floater_env_settings.xml | 2 +- indra/newview/skins/default/xui/en/floater_font_test.xml | 2 +- indra/newview/skins/default/xui/en/floater_gesture.xml | 2 +- indra/newview/skins/default/xui/en/floater_god_tools.xml | 2 +- indra/newview/skins/default/xui/en/floater_hardware_settings.xml | 2 +- indra/newview/skins/default/xui/en/floater_help_browser.xml | 2 +- indra/newview/skins/default/xui/en/floater_hud.xml | 2 +- indra/newview/skins/default/xui/en/floater_incoming_call.xml | 2 +- indra/newview/skins/default/xui/en/floater_inspect.xml | 2 +- indra/newview/skins/default/xui/en/floater_inventory.xml | 2 +- .../skins/default/xui/en/floater_inventory_item_properties.xml | 2 +- indra/newview/skins/default/xui/en/floater_inventory_view_finder.xml | 2 +- indra/newview/skins/default/xui/en/floater_joystick.xml | 2 +- indra/newview/skins/default/xui/en/floater_lagmeter.xml | 2 +- indra/newview/skins/default/xui/en/floater_land_holdings.xml | 2 +- indra/newview/skins/default/xui/en/floater_live_lsleditor.xml | 4 ++-- indra/newview/skins/default/xui/en/floater_lsl_guide.xml | 2 +- indra/newview/skins/default/xui/en/floater_media_browser.xml | 2 +- indra/newview/skins/default/xui/en/floater_media_settings.xml | 2 +- indra/newview/skins/default/xui/en/floater_mem_leaking.xml | 2 +- indra/newview/skins/default/xui/en/floater_mute_object.xml | 4 ++-- indra/newview/skins/default/xui/en/floater_my_friends.xml | 2 +- indra/newview/skins/default/xui/en/floater_nearby_chat.xml | 2 +- indra/newview/skins/default/xui/en/floater_notification.xml | 2 +- indra/newview/skins/default/xui/en/floater_notifications_console.xml | 2 +- indra/newview/skins/default/xui/en/floater_openobject.xml | 2 +- indra/newview/skins/default/xui/en/floater_perm_prefs.xml | 2 +- indra/newview/skins/default/xui/en/floater_post_process.xml | 2 +- indra/newview/skins/default/xui/en/floater_postcard.xml | 2 +- indra/newview/skins/default/xui/en/floater_preferences.xml | 2 +- indra/newview/skins/default/xui/en/floater_preview_classified.xml | 2 +- indra/newview/skins/default/xui/en/floater_preview_event.xml | 4 ++-- indra/newview/skins/default/xui/en/floater_preview_gesture_info.xml | 4 ++-- .../newview/skins/default/xui/en/floater_preview_gesture_shortcut.xml | 4 ++-- indra/newview/skins/default/xui/en/floater_preview_gesture_steps.xml | 4 ++-- indra/newview/skins/default/xui/en/floater_preview_notecard.xml | 2 +- indra/newview/skins/default/xui/en/floater_region_info.xml | 2 +- indra/newview/skins/default/xui/en/floater_report_abuse.xml | 2 +- indra/newview/skins/default/xui/en/floater_script_debug_panel.xml | 4 ++-- indra/newview/skins/default/xui/en/floater_script_preview.xml | 2 +- indra/newview/skins/default/xui/en/floater_script_queue.xml | 2 +- indra/newview/skins/default/xui/en/floater_script_search.xml | 2 +- indra/newview/skins/default/xui/en/floater_search.xml | 2 +- indra/newview/skins/default/xui/en/floater_sell_land.xml | 2 +- indra/newview/skins/default/xui/en/floater_settings_debug.xml | 2 +- indra/newview/skins/default/xui/en/floater_snapshot.xml | 2 +- indra/newview/skins/default/xui/en/floater_sound_preview.xml | 2 +- indra/newview/skins/default/xui/en/floater_statistics.xml | 2 +- indra/newview/skins/default/xui/en/floater_stats.xml | 2 +- indra/newview/skins/default/xui/en/floater_telehub.xml | 2 +- indra/newview/skins/default/xui/en/floater_test_inspectors.xml | 2 +- indra/newview/skins/default/xui/en/floater_test_widgets.xml | 2 +- indra/newview/skins/default/xui/en/floater_texture_ctrl.xml | 2 +- indra/newview/skins/default/xui/en/floater_tools.xml | 2 +- indra/newview/skins/default/xui/en/floater_top_objects.xml | 2 +- indra/newview/skins/default/xui/en/floater_ui_preview.xml | 2 +- indra/newview/skins/default/xui/en/floater_water.xml | 2 +- indra/newview/skins/default/xui/en/floater_windlight_options.xml | 2 +- indra/newview/skins/default/xui/en/floater_world_map.xml | 2 +- indra/newview/skins/default/xui/es/floater_about.xml | 2 +- indra/newview/skins/default/xui/es/floater_about_land.xml | 2 +- indra/newview/skins/default/xui/es/floater_auction.xml | 2 +- indra/newview/skins/default/xui/es/floater_avatar_picker.xml | 2 +- indra/newview/skins/default/xui/es/floater_avatar_textures.xml | 2 +- indra/newview/skins/default/xui/es/floater_beacons.xml | 2 +- indra/newview/skins/default/xui/es/floater_build_options.xml | 2 +- indra/newview/skins/default/xui/es/floater_bulk_perms.xml | 2 +- indra/newview/skins/default/xui/es/floater_bumps.xml | 2 +- indra/newview/skins/default/xui/es/floater_buy_contents.xml | 2 +- indra/newview/skins/default/xui/es/floater_buy_currency.xml | 2 +- indra/newview/skins/default/xui/es/floater_buy_land.xml | 2 +- indra/newview/skins/default/xui/es/floater_buy_object.xml | 2 +- indra/newview/skins/default/xui/es/floater_choose_group.xml | 2 +- indra/newview/skins/default/xui/es/floater_color_picker.xml | 2 +- indra/newview/skins/default/xui/es/floater_customize.xml | 2 +- indra/newview/skins/default/xui/es/floater_day_cycle_options.xml | 2 +- indra/newview/skins/default/xui/es/floater_device_settings.xml | 2 +- indra/newview/skins/default/xui/es/floater_env_settings.xml | 2 +- indra/newview/skins/default/xui/es/floater_font_test.xml | 2 +- indra/newview/skins/default/xui/es/floater_gesture.xml | 2 +- indra/newview/skins/default/xui/es/floater_god_tools.xml | 2 +- indra/newview/skins/default/xui/es/floater_hardware_settings.xml | 2 +- indra/newview/skins/default/xui/es/floater_hud.xml | 2 +- indra/newview/skins/default/xui/es/floater_inspect.xml | 2 +- indra/newview/skins/default/xui/es/floater_inventory.xml | 2 +- .../skins/default/xui/es/floater_inventory_item_properties.xml | 2 +- indra/newview/skins/default/xui/es/floater_inventory_view_finder.xml | 2 +- indra/newview/skins/default/xui/es/floater_joystick.xml | 2 +- indra/newview/skins/default/xui/es/floater_lagmeter.xml | 2 +- indra/newview/skins/default/xui/es/floater_land_holdings.xml | 2 +- indra/newview/skins/default/xui/es/floater_live_lsleditor.xml | 2 +- indra/newview/skins/default/xui/es/floater_lsl_guide.xml | 2 +- indra/newview/skins/default/xui/es/floater_media_browser.xml | 2 +- indra/newview/skins/default/xui/es/floater_mem_leaking.xml | 2 +- indra/newview/skins/default/xui/es/floater_mute_object.xml | 2 +- indra/newview/skins/default/xui/es/floater_my_friends.xml | 2 +- indra/newview/skins/default/xui/es/floater_openobject.xml | 2 +- indra/newview/skins/default/xui/es/floater_perm_prefs.xml | 2 +- indra/newview/skins/default/xui/es/floater_post_process.xml | 2 +- indra/newview/skins/default/xui/es/floater_postcard.xml | 2 +- indra/newview/skins/default/xui/es/floater_preferences.xml | 2 +- indra/newview/skins/default/xui/es/floater_preview_classified.xml | 2 +- indra/newview/skins/default/xui/es/floater_preview_event.xml | 2 +- indra/newview/skins/default/xui/es/floater_preview_notecard.xml | 2 +- indra/newview/skins/default/xui/es/floater_region_info.xml | 2 +- indra/newview/skins/default/xui/es/floater_report_abuse.xml | 2 +- indra/newview/skins/default/xui/es/floater_script_debug.xml | 2 +- indra/newview/skins/default/xui/es/floater_script_preview.xml | 2 +- indra/newview/skins/default/xui/es/floater_script_queue.xml | 2 +- indra/newview/skins/default/xui/es/floater_script_search.xml | 2 +- indra/newview/skins/default/xui/es/floater_sell_land.xml | 2 +- indra/newview/skins/default/xui/es/floater_settings_debug.xml | 2 +- indra/newview/skins/default/xui/es/floater_snapshot.xml | 2 +- indra/newview/skins/default/xui/es/floater_sound_preview.xml | 2 +- indra/newview/skins/default/xui/es/floater_statistics.xml | 2 +- indra/newview/skins/default/xui/es/floater_telehub.xml | 2 +- indra/newview/skins/default/xui/es/floater_texture_ctrl.xml | 2 +- indra/newview/skins/default/xui/es/floater_tools.xml | 2 +- indra/newview/skins/default/xui/es/floater_top_objects.xml | 2 +- indra/newview/skins/default/xui/es/floater_water.xml | 2 +- indra/newview/skins/default/xui/es/floater_windlight_options.xml | 2 +- indra/newview/skins/default/xui/es/floater_world_map.xml | 2 +- indra/newview/skins/default/xui/fr/floater_about.xml | 2 +- indra/newview/skins/default/xui/fr/floater_about_land.xml | 2 +- indra/newview/skins/default/xui/fr/floater_auction.xml | 2 +- indra/newview/skins/default/xui/fr/floater_avatar_picker.xml | 2 +- indra/newview/skins/default/xui/fr/floater_avatar_textures.xml | 2 +- indra/newview/skins/default/xui/fr/floater_beacons.xml | 2 +- indra/newview/skins/default/xui/fr/floater_build_options.xml | 2 +- indra/newview/skins/default/xui/fr/floater_bulk_perms.xml | 2 +- indra/newview/skins/default/xui/fr/floater_bumps.xml | 2 +- indra/newview/skins/default/xui/fr/floater_buy_contents.xml | 2 +- indra/newview/skins/default/xui/fr/floater_buy_currency.xml | 2 +- indra/newview/skins/default/xui/fr/floater_buy_land.xml | 2 +- indra/newview/skins/default/xui/fr/floater_buy_object.xml | 2 +- indra/newview/skins/default/xui/fr/floater_choose_group.xml | 2 +- indra/newview/skins/default/xui/fr/floater_color_picker.xml | 2 +- indra/newview/skins/default/xui/fr/floater_customize.xml | 2 +- indra/newview/skins/default/xui/fr/floater_day_cycle_options.xml | 2 +- indra/newview/skins/default/xui/fr/floater_device_settings.xml | 2 +- indra/newview/skins/default/xui/fr/floater_env_settings.xml | 2 +- indra/newview/skins/default/xui/fr/floater_font_test.xml | 2 +- indra/newview/skins/default/xui/fr/floater_gesture.xml | 2 +- indra/newview/skins/default/xui/fr/floater_god_tools.xml | 2 +- indra/newview/skins/default/xui/fr/floater_hardware_settings.xml | 2 +- indra/newview/skins/default/xui/fr/floater_hud.xml | 2 +- indra/newview/skins/default/xui/fr/floater_inspect.xml | 2 +- indra/newview/skins/default/xui/fr/floater_inventory.xml | 2 +- .../skins/default/xui/fr/floater_inventory_item_properties.xml | 2 +- indra/newview/skins/default/xui/fr/floater_inventory_view_finder.xml | 2 +- indra/newview/skins/default/xui/fr/floater_joystick.xml | 2 +- indra/newview/skins/default/xui/fr/floater_lagmeter.xml | 2 +- indra/newview/skins/default/xui/fr/floater_land_holdings.xml | 2 +- indra/newview/skins/default/xui/fr/floater_live_lsleditor.xml | 2 +- indra/newview/skins/default/xui/fr/floater_lsl_guide.xml | 2 +- indra/newview/skins/default/xui/fr/floater_media_browser.xml | 2 +- indra/newview/skins/default/xui/fr/floater_mem_leaking.xml | 2 +- indra/newview/skins/default/xui/fr/floater_mute_object.xml | 2 +- indra/newview/skins/default/xui/fr/floater_my_friends.xml | 2 +- indra/newview/skins/default/xui/fr/floater_notification.xml | 2 +- indra/newview/skins/default/xui/fr/floater_notifications_console.xml | 2 +- indra/newview/skins/default/xui/fr/floater_openobject.xml | 2 +- indra/newview/skins/default/xui/fr/floater_perm_prefs.xml | 2 +- indra/newview/skins/default/xui/fr/floater_post_process.xml | 2 +- indra/newview/skins/default/xui/fr/floater_postcard.xml | 2 +- indra/newview/skins/default/xui/fr/floater_preferences.xml | 2 +- indra/newview/skins/default/xui/fr/floater_preview_classified.xml | 2 +- indra/newview/skins/default/xui/fr/floater_preview_event.xml | 2 +- indra/newview/skins/default/xui/fr/floater_preview_notecard.xml | 2 +- indra/newview/skins/default/xui/fr/floater_region_info.xml | 2 +- indra/newview/skins/default/xui/fr/floater_report_abuse.xml | 2 +- indra/newview/skins/default/xui/fr/floater_script_debug.xml | 2 +- indra/newview/skins/default/xui/fr/floater_script_preview.xml | 2 +- indra/newview/skins/default/xui/fr/floater_script_queue.xml | 2 +- indra/newview/skins/default/xui/fr/floater_script_search.xml | 2 +- indra/newview/skins/default/xui/fr/floater_sell_land.xml | 2 +- indra/newview/skins/default/xui/fr/floater_settings_debug.xml | 2 +- indra/newview/skins/default/xui/fr/floater_snapshot.xml | 2 +- indra/newview/skins/default/xui/fr/floater_sound_preview.xml | 2 +- indra/newview/skins/default/xui/fr/floater_statistics.xml | 2 +- indra/newview/skins/default/xui/fr/floater_telehub.xml | 2 +- indra/newview/skins/default/xui/fr/floater_texture_ctrl.xml | 2 +- indra/newview/skins/default/xui/fr/floater_tools.xml | 2 +- indra/newview/skins/default/xui/fr/floater_top_objects.xml | 2 +- indra/newview/skins/default/xui/fr/floater_water.xml | 2 +- indra/newview/skins/default/xui/fr/floater_windlight_options.xml | 2 +- indra/newview/skins/default/xui/fr/floater_world_map.xml | 2 +- indra/newview/skins/default/xui/it/floater_about.xml | 2 +- indra/newview/skins/default/xui/it/floater_about_land.xml | 2 +- indra/newview/skins/default/xui/it/floater_auction.xml | 2 +- indra/newview/skins/default/xui/it/floater_avatar_picker.xml | 2 +- indra/newview/skins/default/xui/it/floater_avatar_textures.xml | 2 +- indra/newview/skins/default/xui/it/floater_beacons.xml | 2 +- indra/newview/skins/default/xui/it/floater_build_options.xml | 2 +- indra/newview/skins/default/xui/it/floater_bulk_perms.xml | 2 +- indra/newview/skins/default/xui/it/floater_bumps.xml | 2 +- indra/newview/skins/default/xui/it/floater_buy_contents.xml | 2 +- indra/newview/skins/default/xui/it/floater_buy_currency.xml | 2 +- indra/newview/skins/default/xui/it/floater_buy_land.xml | 2 +- indra/newview/skins/default/xui/it/floater_buy_object.xml | 2 +- indra/newview/skins/default/xui/it/floater_choose_group.xml | 2 +- indra/newview/skins/default/xui/it/floater_color_picker.xml | 2 +- indra/newview/skins/default/xui/it/floater_customize.xml | 2 +- indra/newview/skins/default/xui/it/floater_day_cycle_options.xml | 2 +- indra/newview/skins/default/xui/it/floater_device_settings.xml | 2 +- indra/newview/skins/default/xui/it/floater_env_settings.xml | 2 +- indra/newview/skins/default/xui/it/floater_font_test.xml | 2 +- indra/newview/skins/default/xui/it/floater_gesture.xml | 2 +- indra/newview/skins/default/xui/it/floater_hardware_settings.xml | 2 +- indra/newview/skins/default/xui/it/floater_hud.xml | 2 +- indra/newview/skins/default/xui/it/floater_inspect.xml | 2 +- indra/newview/skins/default/xui/it/floater_inventory.xml | 2 +- .../skins/default/xui/it/floater_inventory_item_properties.xml | 2 +- indra/newview/skins/default/xui/it/floater_inventory_view_finder.xml | 2 +- indra/newview/skins/default/xui/it/floater_joystick.xml | 2 +- indra/newview/skins/default/xui/it/floater_lagmeter.xml | 2 +- indra/newview/skins/default/xui/it/floater_land_holdings.xml | 2 +- indra/newview/skins/default/xui/it/floater_live_lsleditor.xml | 2 +- indra/newview/skins/default/xui/it/floater_lsl_guide.xml | 2 +- indra/newview/skins/default/xui/it/floater_media_browser.xml | 2 +- indra/newview/skins/default/xui/it/floater_mem_leaking.xml | 2 +- indra/newview/skins/default/xui/it/floater_mute_object.xml | 2 +- indra/newview/skins/default/xui/it/floater_my_friends.xml | 2 +- indra/newview/skins/default/xui/it/floater_openobject.xml | 2 +- indra/newview/skins/default/xui/it/floater_perm_prefs.xml | 2 +- indra/newview/skins/default/xui/it/floater_post_process.xml | 2 +- indra/newview/skins/default/xui/it/floater_postcard.xml | 2 +- indra/newview/skins/default/xui/it/floater_preferences.xml | 2 +- indra/newview/skins/default/xui/it/floater_preview_classified.xml | 2 +- indra/newview/skins/default/xui/it/floater_preview_event.xml | 2 +- indra/newview/skins/default/xui/it/floater_preview_notecard.xml | 2 +- indra/newview/skins/default/xui/it/floater_region_info.xml | 2 +- indra/newview/skins/default/xui/it/floater_report_abuse.xml | 2 +- indra/newview/skins/default/xui/it/floater_script_debug.xml | 2 +- indra/newview/skins/default/xui/it/floater_script_preview.xml | 2 +- indra/newview/skins/default/xui/it/floater_script_queue.xml | 2 +- indra/newview/skins/default/xui/it/floater_script_search.xml | 2 +- indra/newview/skins/default/xui/it/floater_sell_land.xml | 2 +- indra/newview/skins/default/xui/it/floater_settings_debug.xml | 2 +- indra/newview/skins/default/xui/it/floater_snapshot.xml | 2 +- indra/newview/skins/default/xui/it/floater_sound_preview.xml | 2 +- indra/newview/skins/default/xui/it/floater_statistics.xml | 2 +- indra/newview/skins/default/xui/it/floater_telehub.xml | 2 +- indra/newview/skins/default/xui/it/floater_texture_ctrl.xml | 2 +- indra/newview/skins/default/xui/it/floater_tools.xml | 2 +- indra/newview/skins/default/xui/it/floater_top_objects.xml | 2 +- indra/newview/skins/default/xui/it/floater_water.xml | 2 +- indra/newview/skins/default/xui/it/floater_windlight_options.xml | 2 +- indra/newview/skins/default/xui/it/floater_world_map.xml | 2 +- indra/newview/skins/default/xui/ja/floater_about.xml | 2 +- indra/newview/skins/default/xui/ja/floater_device_settings.xml | 2 +- indra/newview/skins/default/xui/ja/floater_inventory_view_finder.xml | 2 +- indra/newview/skins/default/xui/ja/floater_lsl_guide.xml | 2 +- indra/newview/skins/default/xui/ja/floater_script_debug.xml | 2 +- indra/newview/skins/default/xui/ja/floater_sound_preview.xml | 2 +- indra/newview/skins/default/xui/nl/floater_about.xml | 2 +- indra/newview/skins/default/xui/nl/floater_about_land.xml | 2 +- indra/newview/skins/default/xui/nl/floater_auction.xml | 2 +- indra/newview/skins/default/xui/nl/floater_beacons.xml | 2 +- indra/newview/skins/default/xui/nl/floater_bulk_perms.xml | 2 +- indra/newview/skins/default/xui/nl/floater_bumps.xml | 2 +- indra/newview/skins/default/xui/nl/floater_buy_contents.xml | 2 +- indra/newview/skins/default/xui/nl/floater_buy_currency.xml | 2 +- indra/newview/skins/default/xui/nl/floater_buy_land.xml | 2 +- indra/newview/skins/default/xui/nl/floater_buy_object.xml | 2 +- indra/newview/skins/default/xui/nl/floater_choose_group.xml | 2 +- indra/newview/skins/default/xui/nl/floater_color_picker.xml | 2 +- indra/newview/skins/default/xui/nl/floater_customize.xml | 2 +- indra/newview/skins/default/xui/nl/floater_env_settings.xml | 2 +- indra/newview/skins/default/xui/nl/floater_font_test.xml | 2 +- indra/newview/skins/default/xui/nl/floater_gesture.xml | 2 +- indra/newview/skins/default/xui/nl/floater_hud.xml | 2 +- indra/newview/skins/default/xui/nl/floater_inspect.xml | 2 +- indra/newview/skins/default/xui/nl/floater_inventory.xml | 2 +- indra/newview/skins/default/xui/nl/floater_joystick.xml | 2 +- indra/newview/skins/default/xui/nl/floater_lagmeter.xml | 2 +- indra/newview/skins/default/xui/nl/floater_lsl_guide.xml | 2 +- indra/newview/skins/default/xui/nl/floater_mem_leaking.xml | 2 +- indra/newview/skins/default/xui/nl/floater_mute_object.xml | 2 +- indra/newview/skins/default/xui/nl/floater_my_friends.xml | 2 +- indra/newview/skins/default/xui/nl/floater_openobject.xml | 2 +- indra/newview/skins/default/xui/nl/floater_perm_prefs.xml | 2 +- indra/newview/skins/default/xui/nl/floater_post_process.xml | 2 +- indra/newview/skins/default/xui/nl/floater_postcard.xml | 2 +- indra/newview/skins/default/xui/nl/floater_preferences.xml | 2 +- indra/newview/skins/default/xui/nl/floater_region_info.xml | 2 +- indra/newview/skins/default/xui/nl/floater_report_abuse.xml | 2 +- indra/newview/skins/default/xui/nl/floater_script_debug.xml | 2 +- indra/newview/skins/default/xui/nl/floater_script_queue.xml | 2 +- indra/newview/skins/default/xui/nl/floater_sell_land.xml | 2 +- indra/newview/skins/default/xui/nl/floater_snapshot.xml | 2 +- indra/newview/skins/default/xui/nl/floater_statistics.xml | 2 +- indra/newview/skins/default/xui/nl/floater_telehub.xml | 2 +- indra/newview/skins/default/xui/nl/floater_texture_ctrl.xml | 2 +- indra/newview/skins/default/xui/nl/floater_tools.xml | 2 +- indra/newview/skins/default/xui/nl/floater_top_objects.xml | 2 +- indra/newview/skins/default/xui/nl/floater_water.xml | 2 +- indra/newview/skins/default/xui/nl/floater_world_map.xml | 2 +- indra/newview/skins/default/xui/pl/floater_about_land.xml | 2 +- indra/newview/skins/default/xui/pl/floater_auction.xml | 2 +- indra/newview/skins/default/xui/pl/floater_avatar_picker.xml | 2 +- indra/newview/skins/default/xui/pl/floater_avatar_textures.xml | 2 +- indra/newview/skins/default/xui/pl/floater_beacons.xml | 2 +- indra/newview/skins/default/xui/pl/floater_build_options.xml | 2 +- indra/newview/skins/default/xui/pl/floater_bulk_perms.xml | 2 +- indra/newview/skins/default/xui/pl/floater_bumps.xml | 2 +- indra/newview/skins/default/xui/pl/floater_buy_contents.xml | 2 +- indra/newview/skins/default/xui/pl/floater_buy_currency.xml | 2 +- indra/newview/skins/default/xui/pl/floater_buy_land.xml | 2 +- indra/newview/skins/default/xui/pl/floater_buy_object.xml | 2 +- indra/newview/skins/default/xui/pl/floater_choose_group.xml | 2 +- indra/newview/skins/default/xui/pl/floater_color_picker.xml | 2 +- indra/newview/skins/default/xui/pl/floater_customize.xml | 2 +- indra/newview/skins/default/xui/pl/floater_day_cycle_options.xml | 2 +- indra/newview/skins/default/xui/pl/floater_device_settings.xml | 2 +- indra/newview/skins/default/xui/pl/floater_env_settings.xml | 2 +- indra/newview/skins/default/xui/pl/floater_font_test.xml | 2 +- indra/newview/skins/default/xui/pl/floater_gesture.xml | 2 +- indra/newview/skins/default/xui/pl/floater_god_tools.xml | 2 +- indra/newview/skins/default/xui/pl/floater_hardware_settings.xml | 2 +- indra/newview/skins/default/xui/pl/floater_hud.xml | 2 +- indra/newview/skins/default/xui/pl/floater_inspect.xml | 2 +- indra/newview/skins/default/xui/pl/floater_inventory.xml | 2 +- .../skins/default/xui/pl/floater_inventory_item_properties.xml | 2 +- indra/newview/skins/default/xui/pl/floater_inventory_view_finder.xml | 2 +- indra/newview/skins/default/xui/pl/floater_joystick.xml | 4 ++-- indra/newview/skins/default/xui/pl/floater_lagmeter.xml | 2 +- indra/newview/skins/default/xui/pl/floater_land_holdings.xml | 2 +- indra/newview/skins/default/xui/pl/floater_live_lsleditor.xml | 2 +- indra/newview/skins/default/xui/pl/floater_lsl_guide.xml | 2 +- indra/newview/skins/default/xui/pl/floater_media_browser.xml | 2 +- indra/newview/skins/default/xui/pl/floater_mem_leaking.xml | 2 +- indra/newview/skins/default/xui/pl/floater_mute_object.xml | 2 +- indra/newview/skins/default/xui/pl/floater_my_friends.xml | 2 +- indra/newview/skins/default/xui/pl/floater_openobject.xml | 2 +- indra/newview/skins/default/xui/pl/floater_perm_prefs.xml | 2 +- indra/newview/skins/default/xui/pl/floater_post_process.xml | 2 +- indra/newview/skins/default/xui/pl/floater_postcard.xml | 2 +- indra/newview/skins/default/xui/pl/floater_preferences.xml | 2 +- indra/newview/skins/default/xui/pl/floater_preview_classified.xml | 2 +- indra/newview/skins/default/xui/pl/floater_preview_event.xml | 2 +- indra/newview/skins/default/xui/pl/floater_preview_notecard.xml | 2 +- indra/newview/skins/default/xui/pl/floater_region_info.xml | 2 +- indra/newview/skins/default/xui/pl/floater_report_abuse.xml | 2 +- indra/newview/skins/default/xui/pl/floater_script_debug.xml | 2 +- indra/newview/skins/default/xui/pl/floater_script_preview.xml | 2 +- indra/newview/skins/default/xui/pl/floater_script_queue.xml | 2 +- indra/newview/skins/default/xui/pl/floater_script_search.xml | 2 +- indra/newview/skins/default/xui/pl/floater_sell_land.xml | 2 +- indra/newview/skins/default/xui/pl/floater_settings_debug.xml | 2 +- indra/newview/skins/default/xui/pl/floater_snapshot.xml | 2 +- indra/newview/skins/default/xui/pl/floater_sound_preview.xml | 2 +- indra/newview/skins/default/xui/pl/floater_statistics.xml | 2 +- indra/newview/skins/default/xui/pl/floater_telehub.xml | 2 +- indra/newview/skins/default/xui/pl/floater_texture_ctrl.xml | 2 +- indra/newview/skins/default/xui/pl/floater_tools.xml | 2 +- indra/newview/skins/default/xui/pl/floater_top_objects.xml | 2 +- indra/newview/skins/default/xui/pl/floater_water.xml | 2 +- indra/newview/skins/default/xui/pl/floater_windlight_options.xml | 2 +- indra/newview/skins/default/xui/pl/floater_world_map.xml | 2 +- indra/newview/skins/default/xui/pt/floater_about.xml | 2 +- indra/newview/skins/default/xui/pt/floater_about_land.xml | 2 +- indra/newview/skins/default/xui/pt/floater_auction.xml | 2 +- indra/newview/skins/default/xui/pt/floater_avatar_picker.xml | 2 +- indra/newview/skins/default/xui/pt/floater_avatar_textures.xml | 2 +- indra/newview/skins/default/xui/pt/floater_beacons.xml | 2 +- indra/newview/skins/default/xui/pt/floater_build_options.xml | 2 +- indra/newview/skins/default/xui/pt/floater_bulk_perms.xml | 2 +- indra/newview/skins/default/xui/pt/floater_bumps.xml | 2 +- indra/newview/skins/default/xui/pt/floater_buy_contents.xml | 2 +- indra/newview/skins/default/xui/pt/floater_buy_currency.xml | 2 +- indra/newview/skins/default/xui/pt/floater_buy_land.xml | 2 +- indra/newview/skins/default/xui/pt/floater_buy_object.xml | 2 +- indra/newview/skins/default/xui/pt/floater_choose_group.xml | 2 +- indra/newview/skins/default/xui/pt/floater_color_picker.xml | 2 +- indra/newview/skins/default/xui/pt/floater_customize.xml | 2 +- indra/newview/skins/default/xui/pt/floater_day_cycle_options.xml | 2 +- indra/newview/skins/default/xui/pt/floater_device_settings.xml | 2 +- indra/newview/skins/default/xui/pt/floater_env_settings.xml | 2 +- indra/newview/skins/default/xui/pt/floater_font_test.xml | 2 +- indra/newview/skins/default/xui/pt/floater_gesture.xml | 2 +- indra/newview/skins/default/xui/pt/floater_god_tools.xml | 2 +- indra/newview/skins/default/xui/pt/floater_hardware_settings.xml | 2 +- indra/newview/skins/default/xui/pt/floater_hud.xml | 2 +- indra/newview/skins/default/xui/pt/floater_inspect.xml | 2 +- indra/newview/skins/default/xui/pt/floater_inventory.xml | 2 +- .../skins/default/xui/pt/floater_inventory_item_properties.xml | 2 +- indra/newview/skins/default/xui/pt/floater_inventory_view_finder.xml | 2 +- indra/newview/skins/default/xui/pt/floater_joystick.xml | 2 +- indra/newview/skins/default/xui/pt/floater_lagmeter.xml | 2 +- indra/newview/skins/default/xui/pt/floater_land_holdings.xml | 2 +- indra/newview/skins/default/xui/pt/floater_live_lsleditor.xml | 2 +- indra/newview/skins/default/xui/pt/floater_lsl_guide.xml | 2 +- indra/newview/skins/default/xui/pt/floater_media_browser.xml | 2 +- indra/newview/skins/default/xui/pt/floater_mem_leaking.xml | 2 +- indra/newview/skins/default/xui/pt/floater_mute_object.xml | 2 +- indra/newview/skins/default/xui/pt/floater_my_friends.xml | 2 +- indra/newview/skins/default/xui/pt/floater_openobject.xml | 2 +- indra/newview/skins/default/xui/pt/floater_perm_prefs.xml | 2 +- indra/newview/skins/default/xui/pt/floater_post_process.xml | 2 +- indra/newview/skins/default/xui/pt/floater_postcard.xml | 2 +- indra/newview/skins/default/xui/pt/floater_preferences.xml | 2 +- indra/newview/skins/default/xui/pt/floater_preview_classified.xml | 2 +- indra/newview/skins/default/xui/pt/floater_preview_event.xml | 2 +- indra/newview/skins/default/xui/pt/floater_preview_notecard.xml | 2 +- indra/newview/skins/default/xui/pt/floater_region_info.xml | 2 +- indra/newview/skins/default/xui/pt/floater_report_abuse.xml | 2 +- indra/newview/skins/default/xui/pt/floater_script_debug.xml | 2 +- indra/newview/skins/default/xui/pt/floater_script_preview.xml | 2 +- indra/newview/skins/default/xui/pt/floater_script_queue.xml | 2 +- indra/newview/skins/default/xui/pt/floater_script_search.xml | 2 +- indra/newview/skins/default/xui/pt/floater_sell_land.xml | 2 +- indra/newview/skins/default/xui/pt/floater_settings_debug.xml | 2 +- indra/newview/skins/default/xui/pt/floater_snapshot.xml | 2 +- indra/newview/skins/default/xui/pt/floater_sound_preview.xml | 2 +- indra/newview/skins/default/xui/pt/floater_statistics.xml | 2 +- indra/newview/skins/default/xui/pt/floater_telehub.xml | 2 +- indra/newview/skins/default/xui/pt/floater_texture_ctrl.xml | 2 +- indra/newview/skins/default/xui/pt/floater_tools.xml | 2 +- indra/newview/skins/default/xui/pt/floater_top_objects.xml | 2 +- indra/newview/skins/default/xui/pt/floater_water.xml | 2 +- indra/newview/skins/default/xui/pt/floater_windlight_options.xml | 2 +- indra/newview/skins/default/xui/pt/floater_world_map.xml | 2 +- 569 files changed, 579 insertions(+), 579 deletions(-) diff --git a/indra/newview/skins/default/xui/da/floater_about.xml b/indra/newview/skins/default/xui/da/floater_about.xml index 81d4d3fdfd..f0c9c45d04 100644 --- a/indra/newview/skins/default/xui/da/floater_about.xml +++ b/indra/newview/skins/default/xui/da/floater_about.xml @@ -1,5 +1,5 @@ - + diff --git a/indra/newview/skins/default/xui/da/floater_about_land.xml b/indra/newview/skins/default/xui/da/floater_about_land.xml index c4cf722159..cb5d618dde 100644 --- a/indra/newview/skins/default/xui/da/floater_about_land.xml +++ b/indra/newview/skins/default/xui/da/floater_about_land.xml @@ -1,5 +1,5 @@ - + diff --git a/indra/newview/skins/default/xui/da/floater_auction.xml b/indra/newview/skins/default/xui/da/floater_auction.xml index f981242f8a..8f793557be 100644 --- a/indra/newview/skins/default/xui/da/floater_auction.xml +++ b/indra/newview/skins/default/xui/da/floater_auction.xml @@ -1,5 +1,5 @@ - + + Date: Thu, 5 Nov 2009 15:16:27 -0500 Subject: Updated TimeTextColor. http://jira.secondlife.com/browse/EXT-2138 --- indra/newview/skins/default/colors.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml index 1e0da13162..572a4cf9e9 100644 --- a/indra/newview/skins/default/colors.xml +++ b/indra/newview/skins/default/colors.xml @@ -651,7 +651,7 @@ value="0 0 0 .33" /> + reference="LtGray" /> -- cgit v1.3 From 6ce9f3b047084a9b947f66d041645238feb4b09b Mon Sep 17 00:00:00 2001 From: Erica Date: Thu, 5 Nov 2009 12:53:41 -0800 Subject: EXT-2160 texture picker cancel button should be on the right, General texture and color picker cleanup --- .../skins/default/xui/en/floater_color_picker.xml | 22 +++-- .../skins/default/xui/en/floater_texture_ctrl.xml | 105 +++++++++++---------- 2 files changed, 67 insertions(+), 60 deletions(-) diff --git a/indra/newview/skins/default/xui/en/floater_color_picker.xml b/indra/newview/skins/default/xui/en/floater_color_picker.xml index e4b9d3f6bc..4380ff8f4b 100644 --- a/indra/newview/skins/default/xui/en/floater_color_picker.xml +++ b/indra/newview/skins/default/xui/en/floater_color_picker.xml @@ -168,26 +168,29 @@ -