diff options
52 files changed, 315 insertions, 297 deletions
diff --git a/indra/llcommon/lldate.h b/indra/llcommon/lldate.h index 5c28a076cd..b7d8b32030 100644 --- a/indra/llcommon/lldate.h +++ b/indra/llcommon/lldate.h @@ -164,8 +164,5 @@ LL_COMMON_API std::ostream& operator<<(std::ostream& s, const LLDate& date); LL_COMMON_API std::istream& operator>>(std::istream& s, LLDate& date); -const static std::string weekdays[] = {"Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"}; - -const static std::string months[] = {"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"}; #endif // LL_LLDATE_H diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index a8e9114e4c..1e5a798202 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -241,6 +241,7 @@ set(viewer_SOURCE_FILES llimpanel.cpp llimview.cpp llimcontrolpanel.cpp + llinspect.cpp llinspectavatar.cpp llinspectgroup.cpp llinspectobject.cpp @@ -713,6 +714,7 @@ set(viewer_HEADER_FILES llimview.h llimcontrolpanel.h llinspectavatar.h + llinspect.h llinspectgroup.h llinspectobject.h llinventorybridge.h diff --git a/indra/newview/llagentwearables.cpp b/indra/newview/llagentwearables.cpp index 223f8779ec..34d2c00007 100644 --- a/indra/newview/llagentwearables.cpp +++ b/indra/newview/llagentwearables.cpp @@ -655,20 +655,20 @@ U32 LLAgentWearables::pushWearable(const EWearableType type, LLWearable *wearabl { // no null wearables please! //TODO: insert llwarns - return MAX_ATTACHMENTS_PER_TYPE; + return MAX_WEARABLES_PER_TYPE; } - if (type < WT_COUNT) + if (type < WT_COUNT || mWearableDatas[type].size() < MAX_WEARABLES_PER_TYPE) { mWearableDatas[type].push_back(wearable); return mWearableDatas[type].size()-1; } - return MAX_ATTACHMENTS_PER_TYPE; + return MAX_WEARABLES_PER_TYPE; } void LLAgentWearables::popWearable(const EWearableType type, LLWearable *wearable) { U32 index = getWearableIndex(type, wearable); - if (index < MAX_ATTACHMENTS_PER_TYPE && index < getWearableCount(type)) + if (index < MAX_WEARABLES_PER_TYPE && index < getWearableCount(type)) { popWearable(type, index); } @@ -688,7 +688,7 @@ U32 LLAgentWearables::getWearableIndex(const EWearableType type, LLWearable *wea if (wearable_iter == mWearableDatas.end()) { llwarns << "tried to get wearable index with an invalid type!" << llendl; - return MAX_ATTACHMENTS_PER_TYPE; + return MAX_WEARABLES_PER_TYPE; } const wearableentry_vec_t& wearable_vec = wearable_iter->second; for(U32 index = 0; index < wearable_vec.size(); index++) @@ -699,7 +699,7 @@ U32 LLAgentWearables::getWearableIndex(const EWearableType type, LLWearable *wea } } - return MAX_ATTACHMENTS_PER_TYPE; + return MAX_WEARABLES_PER_TYPE; } const LLWearable* LLAgentWearables::getWearable(const EWearableType type, U32 index) const diff --git a/indra/newview/llagentwearables.h b/indra/newview/llagentwearables.h index d147b0447b..6b456abfa7 100644 --- a/indra/newview/llagentwearables.h +++ b/indra/newview/llagentwearables.h @@ -258,7 +258,7 @@ private: LLPointer<LLRefCount> mCB; }; - static const U32 MAX_ATTACHMENTS_PER_TYPE = 4; + static const U32 MAX_WEARABLES_PER_TYPE = 1; }; // LLAgentWearables diff --git a/indra/newview/llinspect.cpp b/indra/newview/llinspect.cpp new file mode 100644 index 0000000000..aa299014ee --- /dev/null +++ b/indra/newview/llinspect.cpp @@ -0,0 +1,97 @@ +/** + * @file llinspect.cpp + * + * $LicenseInfo:firstyear=2009&license=viewergpl$ + * + * Copyright (c) 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" + +#include "llinspect.h" + +#include "llcontrol.h" // LLCachedControl +#include "llui.h" // LLUI::sSettingsGroups + +LLInspect::LLInspect(const LLSD& key) +: LLFloater(key), + mCloseTimer(), + mOpenTimer() +{ +} + +LLInspect::~LLInspect() +{ +} + +// virtual +void LLInspect::draw() +{ + static LLCachedControl<F32> FADE_TIME(*LLUI::sSettingGroups["config"], "InspectorFadeTime", 1.f); + if (mOpenTimer.getStarted()) + { + F32 alpha = clamp_rescale(mOpenTimer.getElapsedTimeF32(), 0.f, FADE_TIME, 0.f, 1.f); + LLViewDrawContext context(alpha); + LLFloater::draw(); + if (alpha == 1.f) + { + mOpenTimer.stop(); + } + + } + else if (mCloseTimer.getStarted()) + { + F32 alpha = clamp_rescale(mCloseTimer.getElapsedTimeF32(), 0.f, FADE_TIME, 1.f, 0.f); + LLViewDrawContext context(alpha); + LLFloater::draw(); + if (mCloseTimer.getElapsedTimeF32() > FADE_TIME) + { + closeFloater(false); + } + } + else + { + LLFloater::draw(); + } +} + +// virtual +void LLInspect::onOpen(const LLSD& data) +{ + LLFloater::onOpen(data); + + mCloseTimer.stop(); + mOpenTimer.start(); +} + +// virtual +void LLInspect::onFocusLost() +{ + LLFloater::onFocusLost(); + + // Start closing when we lose focus + mCloseTimer.start(); + mOpenTimer.stop(); +} diff --git a/indra/newview/llinspect.h b/indra/newview/llinspect.h new file mode 100644 index 0000000000..9bdb7c1f2c --- /dev/null +++ b/indra/newview/llinspect.h @@ -0,0 +1,60 @@ +/** + * @file llinspect.h + * + * $LicenseInfo:firstyear=2009&license=viewergpl$ + * + * Copyright (c) 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 LLINSPECT_H +#define LLINSPECT_H + +#include "llfloater.h" +#include "llframetimer.h" + +/// Base class for all inspectors (super-tooltips showing a miniature +/// properties view). +class LLInspect : public LLFloater +{ +public: + LLInspect(const LLSD& key); + virtual ~LLInspect(); + + /// Inspectors have a custom fade-in/fade-out animation + /*virtual*/ void draw(); + + /// Start open animation + /*virtual*/ void onOpen(const LLSD& avatar_id); + + /// Inspectors close themselves when they lose focus + /*virtual*/ void onFocusLost(); + +private: + LLFrameTimer mCloseTimer; + LLFrameTimer mOpenTimer; +}; + +#endif
\ No newline at end of file diff --git a/indra/newview/llinspectavatar.cpp b/indra/newview/llinspectavatar.cpp index 14dd0cdbce..081e55971d 100644 --- a/indra/newview/llinspectavatar.cpp +++ b/indra/newview/llinspectavatar.cpp @@ -41,13 +41,13 @@ #include "llcallingcard.h" #include "llfloaterreporter.h" #include "llfloaterworldmap.h" +#include "llinspect.h" #include "llmutelist.h" #include "llpanelblockedlist.h" #include "llviewermenu.h" #include "llvoiceclient.h" // Linden libraries -#include "llcontrol.h" // LLCachedControl #include "llfloater.h" #include "llfloaterreg.h" #include "llmenubutton.h" @@ -66,7 +66,7 @@ class LLFetchAvatarData; // Avatar Inspector, a small information window used when clicking // on avatar names in the 2D UI and in the ambient inspector widget for // the 3D world. -class LLInspectAvatar : public LLFloater +class LLInspectAvatar : public LLInspect { friend class LLFloaterReg; @@ -77,7 +77,6 @@ public: virtual ~LLInspectAvatar(); /*virtual*/ BOOL postBuild(void); - /*virtual*/ void draw(); // Because floater is single instance, need to re-parse data on each spawn // (for example, inspector about same avatar but in different position) @@ -86,9 +85,6 @@ public: // When closing they should close their gear menu /*virtual*/ void onClose(bool app_quitting); - // Inspectors close themselves when they lose focus - /*virtual*/ void onFocusLost(); - // Update view based on information from avatar properties processor void processAvatarData(LLAvatarData* data); @@ -132,8 +128,6 @@ private: // an in-flight request for avatar properties from LLAvatarPropertiesProcessor // is represented by this object LLFetchAvatarData* mPropertiesRequest; - LLFrameTimer mCloseTimer; - LLFrameTimer mOpenTimer; }; ////////////////////////////////////////////////////////////////////////////// @@ -183,12 +177,11 @@ public: }; LLInspectAvatar::LLInspectAvatar(const LLSD& sd) -: LLFloater( LLSD() ), // single_instance, doesn't really need key +: LLInspect( LLSD() ), // single_instance, doesn't really need key mAvatarID(), // set in onOpen() mPartnerID(), mAvatarName(), - mPropertiesRequest(NULL), - mCloseTimer() + mPropertiesRequest(NULL) { mCommitCallbackRegistrar.add("InspectAvatar.ViewProfile", boost::bind(&LLInspectAvatar::onClickViewProfile, this)); mCommitCallbackRegistrar.add("InspectAvatar.AddFriend", boost::bind(&LLInspectAvatar::onClickAddFriend, this)); @@ -234,35 +227,7 @@ BOOL LLInspectAvatar::postBuild(void) return TRUE; } -void LLInspectAvatar::draw() -{ - static LLCachedControl<F32> FADE_TIME(*LLUI::sSettingGroups["config"], "InspectorFadeTime", 1.f); - if (mOpenTimer.getStarted()) - { - F32 alpha = clamp_rescale(mOpenTimer.getElapsedTimeF32(), 0.f, FADE_TIME, 0.f, 1.f); - LLViewDrawContext context(alpha); - LLFloater::draw(); - if (alpha == 1.f) - { - mOpenTimer.stop(); - } - } - else if (mCloseTimer.getStarted()) - { - F32 alpha = clamp_rescale(mCloseTimer.getElapsedTimeF32(), 0.f, FADE_TIME, 1.f, 0.f); - LLViewDrawContext context(alpha); - LLFloater::draw(); - if (mCloseTimer.getElapsedTimeF32() > FADE_TIME) - { - closeFloater(false); - } - } - else - { - LLFloater::draw(); - } -} // Multiple calls to showInstance("inspect_avatar", foo) will provide different @@ -270,8 +235,8 @@ void LLInspectAvatar::draw() //virtual void LLInspectAvatar::onOpen(const LLSD& data) { - mCloseTimer.stop(); - mOpenTimer.start(); + // Start open animation + LLInspect::onOpen(data); // Extract appropriate avatar id mAvatarID = data["avatar_id"]; @@ -306,14 +271,6 @@ void LLInspectAvatar::onClose(bool app_quitting) getChild<LLMenuButton>("gear_btn")->hideMenu(); } -//virtual -void LLInspectAvatar::onFocusLost() -{ - // Start closing when we lose focus - mCloseTimer.start(); - mOpenTimer.stop(); -} - void LLInspectAvatar::requestUpdate() { // Don't make network requests when spawning from the debug menu at the diff --git a/indra/newview/llinspectgroup.cpp b/indra/newview/llinspectgroup.cpp index 184d413743..e079e27e56 100644 --- a/indra/newview/llinspectgroup.cpp +++ b/indra/newview/llinspectgroup.cpp @@ -36,6 +36,7 @@ // viewer files #include "llgroupactions.h" #include "llgroupmgr.h" +#include "llinspect.h" // Linden libraries #include "llcontrol.h" // LLCachedControl @@ -55,7 +56,7 @@ class LLFetchGroupData; /// Group Inspector, a small information window used when clicking /// on group names in the 2D UI -class LLInspectGroup : public LLFloater +class LLInspectGroup : public LLInspect { friend class LLFloaterReg; @@ -65,8 +66,6 @@ public: LLInspectGroup(const LLSD& key); virtual ~LLInspectGroup(); - /*virtual*/ void draw(); - // Because floater is single instance, need to re-parse data on each spawn // (for example, inspector about same group but in different position) /*virtual*/ void onOpen(const LLSD& group_id); @@ -74,9 +73,6 @@ public: // When closing they should close their gear menu /*virtual*/ void onClose(bool app_quitting); - // Inspectors close themselves when they lose focus - /*virtual*/ void onFocusLost(); - // Update view based on information from group manager void processGroupData(); @@ -101,8 +97,6 @@ private: // an in-flight network request for group properties // is represented by this object LLFetchGroupData* mPropertiesRequest; - LLFrameTimer mCloseTimer; - LLFrameTimer mOpenTimer; }; ////////////////////////////////////////////////////////////////////////////// @@ -144,10 +138,9 @@ public: }; LLInspectGroup::LLInspectGroup(const LLSD& sd) -: LLFloater( LLSD() ), // single_instance, doesn't really need key +: LLInspect( LLSD() ), // single_instance, doesn't really need key mGroupID(), // set in onOpen() - mPropertiesRequest(NULL), - mCloseTimer() + mPropertiesRequest(NULL) { mCommitCallbackRegistrar.add("InspectGroup.ViewProfile", boost::bind(&LLInspectGroup::onClickViewProfile, this)); @@ -168,44 +161,14 @@ LLInspectGroup::~LLInspectGroup() mPropertiesRequest = NULL; } -void LLInspectGroup::draw() -{ - static LLCachedControl<F32> FADE_TIME(*LLUI::sSettingGroups["config"], "InspectorFadeTime", 1.f); - if (mOpenTimer.getStarted()) - { - F32 alpha = clamp_rescale(mOpenTimer.getElapsedTimeF32(), 0.f, FADE_TIME, 0.f, 1.f); - LLViewDrawContext context(alpha); - LLFloater::draw(); - if (alpha == 1.f) - { - mOpenTimer.stop(); - } - - } - else if (mCloseTimer.getStarted()) - { - F32 alpha = clamp_rescale(mCloseTimer.getElapsedTimeF32(), 0.f, FADE_TIME, 1.f, 0.f); - LLViewDrawContext context(alpha); - LLFloater::draw(); - if (mCloseTimer.getElapsedTimeF32() > FADE_TIME) - { - closeFloater(false); - } - } - else - { - LLFloater::draw(); - } -} - // Multiple calls to showInstance("inspect_avatar", foo) will provide different // LLSD for foo, which we will catch here. //virtual void LLInspectGroup::onOpen(const LLSD& data) { - mCloseTimer.stop(); - mOpenTimer.start(); + // start fade animation + LLInspect::onOpen(data); mGroupID = data["group_id"]; @@ -227,16 +190,9 @@ void LLInspectGroup::onOpen(const LLSD& data) // virtual void LLInspectGroup::onClose(bool app_quitting) -{ -} - -//virtual -void LLInspectGroup::onFocusLost() { - // Start closing when we lose focus - mCloseTimer.start(); - mOpenTimer.stop(); -} + // *TODO: If we add a gear menu, close it here +} void LLInspectGroup::requestUpdate() { diff --git a/indra/newview/llinspectobject.cpp b/indra/newview/llinspectobject.cpp index cdb3a10dfc..29cca14a7b 100644 --- a/indra/newview/llinspectobject.cpp +++ b/indra/newview/llinspectobject.cpp @@ -34,6 +34,7 @@ #include "llinspectobject.h" // Viewer +#include "llinspect.h" #include "llnotifications.h" // *TODO: Eliminate, add LLNotificationsUtil wrapper #include "llselectmgr.h" #include "llslurl.h" @@ -43,8 +44,6 @@ // Linden libraries #include "llbutton.h" // setLabel(), not virtual! #include "llclickaction.h" -#include "llcontrol.h" // LLCachedControl -#include "llfloater.h" #include "llfloaterreg.h" #include "llmenubutton.h" #include "llresmgr.h" // getMonetaryString @@ -56,15 +55,13 @@ class LLViewerObject; -// *TODO: Abstract out base class for LLInspectObject and LLInspectObject - ////////////////////////////////////////////////////////////////////////////// // LLInspectObject ////////////////////////////////////////////////////////////////////////////// // Object Inspector, a small information window used when clicking // in the ambient inspector widget for objects in the 3D world. -class LLInspectObject : public LLFloater +class LLInspectObject : public LLInspect { friend class LLFloaterReg; @@ -75,7 +72,6 @@ public: virtual ~LLInspectObject(); /*virtual*/ BOOL postBuild(void); - /*virtual*/ void draw(); // Because floater is single instance, need to re-parse data on each spawn // (for example, inspector about same avatar but in different position) @@ -84,9 +80,6 @@ public: // Release the selection and do other cleanup /*virtual*/ void onClose(bool app_quitting); - // Inspectors close themselves when they lose focus - /*virtual*/ void onFocusLost(); - private: // Refresh displayed data with information from selection manager void update(); @@ -113,16 +106,13 @@ private: private: LLUUID mObjectID; - LLFrameTimer mOpenTimer; - LLFrameTimer mCloseTimer; LLSafeHandle<LLObjectSelection> mObjectSelection; }; LLInspectObject::LLInspectObject(const LLSD& sd) -: LLFloater( LLSD() ), // single_instance, doesn't really need key +: LLInspect( LLSD() ), // single_instance, doesn't really need key mObjectID(), // set in onOpen() - mCloseTimer(), - mOpenTimer() + mObjectSelection() { // can't make the properties request until the widgets are constructed // as it might return immediately, so do it in postBuild. @@ -181,39 +171,14 @@ BOOL LLInspectObject::postBuild(void) return TRUE; } -void LLInspectObject::draw() -{ - static LLCachedControl<F32> FADE_OUT_TIME(*LLUI::sSettingGroups["config"], "InspectorFadeTime", 1.f); - if (mOpenTimer.getStarted()) - { - F32 alpha = clamp_rescale(mOpenTimer.getElapsedTimeF32(), 0.f, FADE_OUT_TIME, 0.f, 1.f); - LLViewDrawContext context(alpha); - LLFloater::draw(); - } - else if (mCloseTimer.getStarted()) - { - F32 alpha = clamp_rescale(mCloseTimer.getElapsedTimeF32(), 0.f, FADE_OUT_TIME, 1.f, 0.f); - LLViewDrawContext context(alpha); - LLFloater::draw(); - if (mCloseTimer.getElapsedTimeF32() > FADE_OUT_TIME) - { - closeFloater(false); - } - } - else - { - LLFloater::draw(); - } -} - // Multiple calls to showInstance("inspect_avatar", foo) will provide different // LLSD for foo, which we will catch here. //virtual void LLInspectObject::onOpen(const LLSD& data) { - mCloseTimer.stop(); - mOpenTimer.start(); + // Start animation + LLInspect::onOpen(data); // Extract appropriate avatar id mObjectID = data["object_id"]; @@ -260,14 +225,6 @@ void LLInspectObject::onClose(bool app_quitting) getChild<LLMenuButton>("gear_btn")->hideMenu(); } -//virtual -void LLInspectObject::onFocusLost() -{ - // Start closing when we lose focus - mCloseTimer.start(); - mOpenTimer.stop(); -} - void LLInspectObject::update() { diff --git a/indra/newview/skins/default/xui/en/floater_about_land.xml b/indra/newview/skins/default/xui/en/floater_about_land.xml index 1f366f6c52..072fafd06e 100644 --- a/indra/newview/skins/default/xui/en/floater_about_land.xml +++ b/indra/newview/skins/default/xui/en/floater_about_land.xml @@ -1560,7 +1560,7 @@ Only large parcels can be listed in search. layout="topleft" left_pad="5" name="Clear" - tool_tip="Clear the landing point." + tool_tip="Clear the landing point" top_delta="0" width="50" /> <text @@ -1580,7 +1580,7 @@ Only large parcels can be listed in search. layout="topleft" left_delta="116" name="landing type" - tool_tip="Teleport Routing -- select how to handle teleports onto your land." + tool_tip="Teleport Routing -- select how to handle teleports onto your land" top_delta="0" width="120"> <combo_box.item diff --git a/indra/newview/skins/default/xui/en/floater_animation_preview.xml b/indra/newview/skins/default/xui/en/floater_animation_preview.xml index 3a2337bfff..a6a6e0ec22 100644 --- a/indra/newview/skins/default/xui/en/floater_animation_preview.xml +++ b/indra/newview/skins/default/xui/en/floater_animation_preview.xml @@ -196,7 +196,7 @@ Maximum animation length is [MAX_LENGTH] seconds. left="10" max_val="4" name="priority" - tool_tip="Controls which other animations can be overridden by this animation." + tool_tip="Controls which other animations can be overridden by this animation" width="160" /> <check_box top_pad="0" @@ -206,7 +206,7 @@ Maximum animation length is [MAX_LENGTH] seconds. left="10" width="100" name="loop_check" - tool_tip="Makes this animation loop." /> + tool_tip="Makes this animation loop" /> <spinner follows="left|top" height="23" @@ -219,7 +219,7 @@ Maximum animation length is [MAX_LENGTH] seconds. left="30" max_val="100" name="loop_in_point" - tool_tip="Sets point in animation that looping returns to." + tool_tip="Sets point in animation that looping returns to" width="110" /> <spinner bottom_delta="0" @@ -232,7 +232,7 @@ Maximum animation length is [MAX_LENGTH] seconds. left_pad="10" max_val="100" name="loop_out_point" - tool_tip="Sets point in animation that ends a loop." + tool_tip="Sets point in animation that ends a loop" label_width="45" width="120" /> <text @@ -252,7 +252,7 @@ Maximum animation length is [MAX_LENGTH] seconds. layout="topleft" left_pad="0" name="hand_pose_combo" - tool_tip="Controls what hands do during animation." + tool_tip="Controls what hands do during animation" width="150"> <combo_box.item label="Spread" @@ -325,7 +325,7 @@ Maximum animation length is [MAX_LENGTH] seconds. layout="topleft" left_pad="0" name="emote_combo" - tool_tip="Controls what face does during animation."> + tool_tip="Controls what face does during animation"> <combo_box.item label="(None)" name="[None]" /> @@ -405,7 +405,7 @@ Maximum animation length is [MAX_LENGTH] seconds. layout="topleft" left_pad="0" name="preview_base_anim" - tool_tip="Use this to test your animation behavior while your avatar performs common actions."> + tool_tip="Use this to test your animation behavior while your avatar performs common actions"> <combo_box.item label="Standing" name="Standing" /> @@ -430,7 +430,7 @@ Maximum animation length is [MAX_LENGTH] seconds. left="10" max_val="10" name="ease_in_time" - tool_tip="Amount of time (in seconds) over which animations blends in." + tool_tip="Amount of time (in seconds) over which animations blends in" top_pad="10" width="200" /> <spinner @@ -444,7 +444,7 @@ Maximum animation length is [MAX_LENGTH] seconds. top_pad="0" max_val="10" name="ease_out_time" - tool_tip="Amount of time (in seconds) over which animations blends out." + tool_tip="Amount of time (in seconds) over which animations blends out" width="200" /> <button follows="top|right" @@ -455,7 +455,7 @@ Maximum animation length is [MAX_LENGTH] seconds. left="10" name="play_btn" picture_style="true" - tool_tip="Play/pause your animation." + tool_tip="Play/pause your animation" top_pad="0" width="28" /> <button diff --git a/indra/newview/skins/default/xui/en/floater_beacons.xml b/indra/newview/skins/default/xui/en/floater_beacons.xml index 09b1735e04..a60064fb37 100644 --- a/indra/newview/skins/default/xui/en/floater_beacons.xml +++ b/indra/newview/skins/default/xui/en/floater_beacons.xml @@ -53,7 +53,7 @@ height="16" layout="topleft" left="20" - tool_tip="Beacon Width" + tool_tip="Beacon width" name="beacon_width_label" top_pad="3" width="128"> diff --git a/indra/newview/skins/default/xui/en/floater_build_options.xml b/indra/newview/skins/default/xui/en/floater_build_options.xml index 42a063928c..3e6845cfa5 100644 --- a/indra/newview/skins/default/xui/en/floater_build_options.xml +++ b/indra/newview/skins/default/xui/en/floater_build_options.xml @@ -61,7 +61,7 @@ height="16" layout="topleft" left="10" - tool_tip="Grid Opacity" + tool_tip="Grid opacity" name="grid_opacity_label" top_pad="5" width="128"> diff --git a/indra/newview/skins/default/xui/en/floater_camera.xml b/indra/newview/skins/default/xui/en/floater_camera.xml index 86c75a3946..a5c73a7ca4 100644 --- a/indra/newview/skins/default/xui/en/floater_camera.xml +++ b/indra/newview/skins/default/xui/en/floater_camera.xml @@ -45,7 +45,7 @@ quadrant="left" scale_image="false" sound_flags="3" - tool_tip="Orbit Camera Around Focus" + tool_tip="Orbit camera around focus" top="15" width="64" /> <joystick_track @@ -60,7 +60,7 @@ quadrant="left" scale_image="false" sound_flags="3" - tool_tip="Move Camera Up and Down, Left and Right" + tool_tip="Move camera up and down, left and right" top="15" visible="false" width="64" /> @@ -77,7 +77,7 @@ quadrant="left" scale_image="false" sound_flags="3" - tool_tip="Zoom Camera Towards Focus" + tool_tip="Zoom camera toward focus" top_delta="0" width="16" /> </panel> @@ -99,7 +99,7 @@ image_selected="PushButton_Selected_Press" name="orbit_btn" tab_stop="false" - tool_tip="Orbit Camera" + tool_tip="Orbit camera" value="true" width="25"> </button> @@ -113,7 +113,7 @@ image_selected="PushButton_Selected_Press" name="pan_btn" tab_stop="false" - tool_tip="Pan Camera" + tool_tip="Pan camera" width="25"> </button> <button @@ -125,7 +125,7 @@ image_selected="PushButton_Selected_Press" name="avatarview_btn" tab_stop="false" - tool_tip="See as Avatar" + tool_tip="See as avatar" width="25"> </button> <button @@ -138,7 +138,7 @@ image_selected="PushButton_Selected_Press" name="freecamera_btn" tab_stop="false" - tool_tip="View Object" + tool_tip="View object" width="25"> </button> diff --git a/indra/newview/skins/default/xui/en/floater_customize.xml b/indra/newview/skins/default/xui/en/floater_customize.xml index ba71754da8..70468e7474 100644 --- a/indra/newview/skins/default/xui/en/floater_customize.xml +++ b/indra/newview/skins/default/xui/en/floater_customize.xml @@ -1039,7 +1039,7 @@ scratch and wear it. layout="topleft" left_delta="0" name="Color/Tint" - tool_tip="Click to open Color Picker" + tool_tip="Click to open color picker" top_delta="80" width="64" /> <button @@ -1245,7 +1245,7 @@ scratch and wear it. layout="topleft" left_delta="0" name="Color/Tint" - tool_tip="Click to open Color Picker" + tool_tip="Click to open color picker" top_delta="80" width="64" /> <button @@ -1555,7 +1555,7 @@ scratch and wear it. layout="topleft" left_delta="0" name="Color/Tint" - tool_tip="Click to open Color Picker" + tool_tip="Click to open color picker" top_delta="80" width="64" /> <button @@ -1761,7 +1761,7 @@ scratch and wear it. layout="topleft" left_delta="0" name="Color/Tint" - tool_tip="Click to open Color Picker" + tool_tip="Click to open color picker" top_delta="80" width="64" /> <button @@ -1979,7 +1979,7 @@ scratch and wear it. layout="topleft" left_delta="0" name="Color/Tint" - tool_tip="Click to open Color Picker" + tool_tip="Click to open color picker" top_delta="80" width="64" /> <button @@ -2185,7 +2185,7 @@ scratch and wear it. layout="topleft" left_delta="0" name="Color/Tint" - tool_tip="Click to open Color Picker" + tool_tip="Click to open color picker" top_delta="80" width="64" /> <button @@ -2391,7 +2391,7 @@ scratch and wear it. layout="topleft" left_delta="0" name="Color/Tint" - tool_tip="Click to open Color Picker" + tool_tip="Click to open color picker" top_delta="80" width="64" /> <button @@ -2597,7 +2597,7 @@ scratch and wear it. layout="topleft" left_delta="0" name="Color/Tint" - tool_tip="Click to open Color Picker" + tool_tip="Click to open color picker" top_delta="80" width="64" /> <button @@ -2803,7 +2803,7 @@ scratch and wear it. layout="topleft" left_delta="0" name="Color/Tint" - tool_tip="Click to open Color Picker" + tool_tip="Click to open color picker" top_delta="80" width="64" /> <button diff --git a/indra/newview/skins/default/xui/en/floater_env_settings.xml b/indra/newview/skins/default/xui/en/floater_env_settings.xml index 5e87e065a4..cecd6c4ef7 100644 --- a/indra/newview/skins/default/xui/en/floater_env_settings.xml +++ b/indra/newview/skins/default/xui/en/floater_env_settings.xml @@ -105,7 +105,7 @@ layout="topleft" left="390" name="EnvWaterColor" - tool_tip="Click to open Color Picker" + tool_tip="Click to open color picker" top="30" width="40" /> <text diff --git a/indra/newview/skins/default/xui/en/floater_gesture.xml b/indra/newview/skins/default/xui/en/floater_gesture.xml index 3d0a969112..7346c81e79 100644 --- a/indra/newview/skins/default/xui/en/floater_gesture.xml +++ b/indra/newview/skins/default/xui/en/floater_gesture.xml @@ -59,7 +59,7 @@ <button follows="bottom|left" font="SansSerifBigBold" - tool_tip="Change sort and view of Recent Residents list" + tool_tip="Change sort and view of recent residents list" height="18" image_disabled="OptionsMenu_Disabled" image_selected="OptionsMenu_Press" @@ -81,7 +81,7 @@ left_pad="5" name="new_gesture_btn" picture_style="true" - tool_tip="Make new Gesture" + tool_tip="Make new gesture" top_delta="0" width="18" /> <button @@ -95,7 +95,7 @@ left_pad="230" name="del_btn" picture_style="true" - tool_tip="Delete this Gesture" + tool_tip="Delete this gesture" top_delta="0" width="18" /> </panel> diff --git a/indra/newview/skins/default/xui/en/floater_god_tools.xml b/indra/newview/skins/default/xui/en/floater_god_tools.xml index 53d05f3c61..02754b25dd 100644 --- a/indra/newview/skins/default/xui/en/floater_god_tools.xml +++ b/indra/newview/skins/default/xui/en/floater_god_tools.xml @@ -98,7 +98,7 @@ layout="topleft" left="10" name="check prelude" - tool_tip="Set this to make the region a prelude." + tool_tip="Set this to make the region a prelude" top_pad="10" width="180"> <check_box.commit_callback @@ -110,7 +110,7 @@ layout="topleft" left_delta="0" name="check fixed sun" - tool_tip="Fix the sun position (like in Region/Estate > Terrain." + tool_tip="Fix the sun position (like in Region/Estate > Terrain" top_pad="4" width="180"> <check_box.commit_callback @@ -134,7 +134,7 @@ layout="topleft" left_delta="0" name="check visible" - tool_tip="Set this to make the region visible to non-gods." + tool_tip="Set this to make the region visible to non-gods" top_pad="4" width="180"> <check_box.commit_callback @@ -146,7 +146,7 @@ layout="topleft" left_delta="0" name="check damage" - tool_tip="Set this to enable damage in this region." + tool_tip="Set this to enable damage in this region" top_pad="4" width="180"> <check_box.commit_callback @@ -158,7 +158,7 @@ layout="topleft" left_delta="0" name="block dwell" - tool_tip="Set this to make the region not compute traffic." + tool_tip="Set this to make the region not compute traffic" top_pad="4" width="180"> <check_box.commit_callback @@ -182,7 +182,7 @@ layout="topleft" left_delta="0" name="is sandbox" - tool_tip="Toggle whether this is a sandbox region." + tool_tip="Toggle whether this is a sandbox region" top_pad="4" width="180"> <check_box.commit_callback @@ -197,7 +197,7 @@ layout="topleft" left="12" name="Bake Terrain" - tool_tip="Save the current terrain as default." + tool_tip="Save the current terrain as default" top_pad="32" width="110"> <button.commit_callback @@ -211,7 +211,7 @@ label_selected="Revert Terrain" layout="topleft" name="Revert Terrain" - tool_tip="Replace the current terrain with default." + tool_tip="Replace the current terrain with default" top_pad="10" width="110"> <button.commit_callback @@ -225,7 +225,7 @@ label_selected="Swap Terrain" layout="topleft" name="Swap Terrain" - tool_tip="Swap current terrain with default." + tool_tip="Swap current terrain with default" top_pad="10" width="110"> <button.commit_callback @@ -425,7 +425,7 @@ layout="topleft" left="278" name="Refresh" - tool_tip="Click here to refresh the above information." + tool_tip="Click here to refresh the above information" top_pad="10" width="110"> <button.commit_callback @@ -440,7 +440,7 @@ layout="topleft" left="278" name="Apply" - tool_tip="Click here to apply any changes from above." + tool_tip="Click here to apply any changes from above" top="317" width="110"> <button.commit_callback @@ -455,7 +455,7 @@ layout="topleft" left="130" name="Select Region" - tool_tip="Select the whole region with the land tool." + tool_tip="Select the whole region with the land tool" top="238" width="110"> <button.commit_callback @@ -470,7 +470,7 @@ layout="topleft" left_delta="0" name="Autosave now" - tool_tip="Save gzipped state to autosave directory." + tool_tip="Save gzipped state to autosave directory" top_pad="10" width="110"> <button.commit_callback @@ -562,7 +562,7 @@ layout="topleft" left="278" name="Apply" - tool_tip="Click here to apply any changes from above." + tool_tip="Click here to apply any changes from above" top="54" width="110"> <button.commit_callback @@ -577,7 +577,7 @@ layout="topleft" left="8" name="Set Target" - tool_tip="Set the target avatar for object deletion." + tool_tip="Set the target avatar for object deletion" top="78" width="110"> <button.commit_callback @@ -649,7 +649,7 @@ layout="topleft" left="12" name="Get Top Colliders" - tool_tip="Gets list of objects experiencing the most narrowphase callbacks." + tool_tip="Gets list of objects experiencing the most narrowphase callbacks" top_pad="20" width="130"> <button.commit_callback @@ -664,7 +664,7 @@ layout="topleft" left_delta="0" name="Get Top Scripts" - tool_tip="Gets list of objects spending the most time running scripts." + tool_tip="Gets list of objects spending the most time running scripts" top_pad="5" width="130"> <button.commit_callback @@ -679,7 +679,7 @@ layout="topleft" left_delta="0" name="Scripts digest" - tool_tip="Gets a list of all scripts and number of occurences of each." + tool_tip="Gets a list of all scripts and number of occurences of each" top_pad="5" width="130" > <button.commit_callback diff --git a/indra/newview/skins/default/xui/en/floater_hardware_settings.xml b/indra/newview/skins/default/xui/en/floater_hardware_settings.xml index c695753ca3..fe04d1f627 100644 --- a/indra/newview/skins/default/xui/en/floater_hardware_settings.xml +++ b/indra/newview/skins/default/xui/en/floater_hardware_settings.xml @@ -132,7 +132,7 @@ left="10" max_val="4096" name="GrapicsCardTextureMemory" - tool_tip="Amount of memory to allocate for textures. Defaults to Video Card Memory. Reducing this may improve performance but may also make textures blurry." + tool_tip="Amount of memory to allocate for textures. Defaults to video card memory. Reducing this may improve performance but may also make textures blurry." top_pad="10" width="300" /> <spinner diff --git a/indra/newview/skins/default/xui/en/floater_lagmeter.xml b/indra/newview/skins/default/xui/en/floater_lagmeter.xml index 7803075ff9..2966b47232 100644 --- a/indra/newview/skins/default/xui/en/floater_lagmeter.xml +++ b/indra/newview/skins/default/xui/en/floater_lagmeter.xml @@ -338,7 +338,7 @@ layout="topleft" left="10" name="minimize" - tool_tip="Toggle Floater Size" + tool_tip="Toggle floater size" top_delta="4" width="40"> <button.commit_callback diff --git a/indra/newview/skins/default/xui/en/floater_land_holdings.xml b/indra/newview/skins/default/xui/en/floater_land_holdings.xml index f887b48ed0..dbafa56035 100644 --- a/indra/newview/skins/default/xui/en/floater_land_holdings.xml +++ b/indra/newview/skins/default/xui/en/floater_land_holdings.xml @@ -58,7 +58,7 @@ layout="topleft" left_pad="4" name="Show on Map" - tool_tip="Show this land on the world map." + tool_tip="Show this land on the world map" top_delta="0" width="100" /> <text diff --git a/indra/newview/skins/default/xui/en/floater_moveview.xml b/indra/newview/skins/default/xui/en/floater_moveview.xml index f82e01dd1f..745385f153 100644 --- a/indra/newview/skins/default/xui/en/floater_moveview.xml +++ b/indra/newview/skins/default/xui/en/floater_moveview.xml @@ -57,7 +57,7 @@ name="turn left btn" picture_style="true" scale_image="false" - tool_tip="Turn Left (press Left Arrow or A)" + tool_tip="Turn left (press Left Arrow or A)" top="45" width="25" /> <button @@ -71,7 +71,7 @@ name="turn right btn" picture_style="true" scale_image="false" - tool_tip="Turn Right (press Right Arrow or D)" + tool_tip="Turn right (press Right Arrow or D)" top_delta="0" width="25" /> <button @@ -85,7 +85,7 @@ name="move up btn" picture_style="true" scale_image="false" - tool_tip="Fly Up, Press "E"" + tool_tip="Fly up, press "E"" top="14" width="25" /> <button @@ -99,7 +99,7 @@ name="move down btn" picture_style="true" scale_image="false" - tool_tip="Fly Down, Press "C"" + tool_tip="Fly down, press "C"" top_delta="0" width="20" /> <joystick_turn @@ -114,7 +114,7 @@ picture_style="true" quadrant="up" scale_image="false" - tool_tip="Walk Forward (press Up Arrow or W)" + tool_tip="Walk forward (press up arrow or W)" top_delta="10" width="21" /> <joystick_turn @@ -129,7 +129,7 @@ picture_style="true" quadrant="down" scale_image="false" - tool_tip="Walk Backward (press Down Arrow or S)" + tool_tip="Walk backward (press down arrow or S)" top_delta="30" width="21" /> </panel> @@ -152,7 +152,7 @@ name="mode_walk_btn" left="10" pad_right="0" - tool_tip="Walking Mode" + tool_tip="Walking mode" top="2" width="31" /> <button @@ -167,7 +167,7 @@ name="mode_run_btn" pad_left="0" pad_right="0" - tool_tip="Running Mode" + tool_tip="Running mode" top="2" width="31" /> <button @@ -181,7 +181,7 @@ name="mode_fly_btn" pad_left="0" pad_right="0" - tool_tip="Flying Mode" + tool_tip="Flying mode" top="2" width="31" /> <button @@ -192,7 +192,7 @@ layout="topleft" left="0" name="stop_fly_btn" - tool_tip="Stop Flying" + tool_tip="Stop flying" top="2" width="115" /> </panel> diff --git a/indra/newview/skins/default/xui/en/floater_preview_animation.xml b/indra/newview/skins/default/xui/en/floater_preview_animation.xml index 5756f9590e..e34b87dbba 100644 --- a/indra/newview/skins/default/xui/en/floater_preview_animation.xml +++ b/indra/newview/skins/default/xui/en/floater_preview_animation.xml @@ -43,7 +43,7 @@ layout="topleft" left="10" name="Anim play btn" - tool_tip="Play this animation so that others can see it." + tool_tip="Play this animation so that others can see it" top="47" width="125" /> <button @@ -54,7 +54,7 @@ layout="topleft" left_pad="5" name="Anim audition btn" - tool_tip="Play this animation so that only you can see it." + tool_tip="Play this animation so that only you can see it" top_delta="0" width="125" /> </floater> diff --git a/indra/newview/skins/default/xui/en/floater_preview_sound.xml b/indra/newview/skins/default/xui/en/floater_preview_sound.xml index 4220655a6f..7a868a1fe9 100644 --- a/indra/newview/skins/default/xui/en/floater_preview_sound.xml +++ b/indra/newview/skins/default/xui/en/floater_preview_sound.xml @@ -44,7 +44,7 @@ sound_flags="0" top="55" left="10" - tool_tip="Play this sound so that others can hear it." + tool_tip="Play this sound so that others can hear it" width="125" /> <button follows="left|top" @@ -55,7 +55,7 @@ layout="topleft" name="Sound audition btn" sound_flags="0" - tool_tip="Play this sound so that only you can hear it." + tool_tip="Play this sound so that only you can hear it" left_pad="10" width="125" /> diff --git a/indra/newview/skins/default/xui/en/floater_preview_texture.xml b/indra/newview/skins/default/xui/en/floater_preview_texture.xml index e477b6ddb8..32f71da61a 100644 --- a/indra/newview/skins/default/xui/en/floater_preview_texture.xml +++ b/indra/newview/skins/default/xui/en/floater_preview_texture.xml @@ -108,10 +108,10 @@ <combo_item name="Unconstrained" value="Unconstrained"> Unconstrained </combo_item> - <combo_item name="1:1" value="1:1" tool_tip="Group Insignia or 1st Life Profile"> + <combo_item name="1:1" value="1:1" tool_tip="Group insignia or 1st Life profile"> 1:1 </combo_item> - <combo_item name="4:3" value="4:3" tool_tip="2nd Life Profile"> + <combo_item name="4:3" value="4:3" tool_tip="2nd Life profile"> 4:3 </combo_item> <combo_item name="10:7" value="10:7" tool_tip="Classifieds and search listings, landmarks"> @@ -123,7 +123,7 @@ <combo_item name="16:10" value="16:10"> 16:10 </combo_item> - <combo_item name="16:9" value="16:9" tool_tip="Profile Picks"> + <combo_item name="16:9" value="16:9" tool_tip="Profile picks"> 16:9 </combo_item> <combo_item name="2:1" value="2:1"> diff --git a/indra/newview/skins/default/xui/en/floater_snapshot.xml b/indra/newview/skins/default/xui/en/floater_snapshot.xml index bd1484c0fe..551f570b52 100644 --- a/indra/newview/skins/default/xui/en/floater_snapshot.xml +++ b/indra/newview/skins/default/xui/en/floater_snapshot.xml @@ -125,7 +125,7 @@ layout="topleft" left="10" name="more_btn" - tool_tip="Advanced Options" + tool_tip="Advanced options" top="270" width="80" /> <button @@ -136,7 +136,7 @@ layout="topleft" left_delta="0" name="less_btn" - tool_tip="Advanced Options" + tool_tip="Advanced options" top_delta="0" width="80" /> <text diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml index 0b82a91431..7829a4fa93 100644 --- a/indra/newview/skins/default/xui/en/floater_tools.xml +++ b/indra/newview/skins/default/xui/en/floater_tools.xml @@ -321,7 +321,7 @@ label_selected="Options" layout="topleft" name="Options..." - tool_tip="Grid Options" + tool_tip="Grid options" top_delta="0" right="-10" width="18" @@ -714,7 +714,7 @@ layout="topleft" left="135" name="button apply to selection" - tool_tip="Modify Selected Land" + tool_tip="Modify selected land" width="78"> <button.commit_callback function="BuildTool.applyToSelection"/> @@ -946,7 +946,7 @@ name="button deed" top_pad="0" left="100" - tool_tip="Deeding gives this item away with Next owner permissions. Group shared objects can be deeded by a group officer." + tool_tip="Deeding gives this item away with next owner permissions. Group shared objects can be deeded by a group officer." width="80" /> <check_box height="19" @@ -1244,7 +1244,7 @@ label="Temporary" layout="topleft" name="Temporary Checkbox Ctrl" - tool_tip="Causes object to be deleted 1 minute after creation." + tool_tip="Causes object to be deleted 1 minute after creation" top_pad="0" width="123" /> <check_box @@ -1941,7 +1941,7 @@ layout="topleft" left_delta="0" name="sculpt mirror control" - tool_tip="Flips sculpted prim along the X axis." + tool_tip="Flips sculpted prim along the X axis" top_pad="8" visible="false" width="130" /> @@ -1951,7 +1951,7 @@ layout="topleft" left_delta="0" name="sculpt invert control" - tool_tip="Inverts the sculpted prims normals, making it appear inside-out." + tool_tip="Inverts the sculpted prims normals, making it appear inside-out" top_pad="4" visible="false" width="121" /> @@ -2041,7 +2041,7 @@ layout="topleft" left="10" name="Flexible1D Checkbox Ctrl" - tool_tip="Allows object to flex about the Z axis. (Client-side only)" + tool_tip="Allows object to flex about the Z axis (Client-side only)" top_pad="10" width="121" /> <spinner @@ -2173,7 +2173,7 @@ left_pad="10" top_pad="-17" name="colorswatch" - tool_tip="Click to open Color Picker" + tool_tip="Click to open color picker" width="40" /> <texture_picker allow_no_texture="true" @@ -2278,7 +2278,7 @@ layout="topleft" left_pad="15" name="colorswatch" - tool_tip="Click to open Color Picker" + tool_tip="Click to open color picker" top_delta="0" width="64" /> <text @@ -2699,7 +2699,7 @@ picture_style="true" tab_stop="false" top_delta="0" - tool_tip="Add Media" + tool_tip="Add media" width="18"> <button.commit_callback function="BuildTool.AddMedia"/> @@ -2733,7 +2733,7 @@ width="100" /> <button follows="bottom|left" - tool_tip="Change sort and view of Recent Residents list" + tool_tip="Change sort and view of recent residents list" height="18" image_disabled="OptionsMenu_Disabled" image_selected="OptionsMenu_Press" diff --git a/indra/newview/skins/default/xui/en/floater_water.xml b/indra/newview/skins/default/xui/en/floater_water.xml index 6206ea29c2..a860b1038c 100644 --- a/indra/newview/skins/default/xui/en/floater_water.xml +++ b/indra/newview/skins/default/xui/en/floater_water.xml @@ -111,7 +111,7 @@ layout="topleft" left="40" name="WaterFogColor" - tool_tip="Click to open Color Picker" + tool_tip="Click to open color picker" top="30" width="40" /> <text diff --git a/indra/newview/skins/default/xui/en/floater_world_map.xml b/indra/newview/skins/default/xui/en/floater_world_map.xml index 8f88366842..f37c0e9022 100644 --- a/indra/newview/skins/default/xui/en/floater_world_map.xml +++ b/indra/newview/skins/default/xui/en/floater_world_map.xml @@ -325,7 +325,7 @@ left_pad="4" max_chars="60" name="friend combo" - tool_tip="Friend to Show on Map" + tool_tip="Friend to show on map" top_delta="-4" width="202"> <combo_box.item @@ -355,7 +355,7 @@ left_pad="4" max_chars="64" name="landmark combo" - tool_tip="Landmark to Show on Map" + tool_tip="Landmark to show on map" top_delta="-4" width="202"> <combo_box.item diff --git a/indra/newview/skins/default/xui/en/inspect_avatar.xml b/indra/newview/skins/default/xui/en/inspect_avatar.xml index a934e541da..5bf481e9cb 100644 --- a/indra/newview/skins/default/xui/en/inspect_avatar.xml +++ b/indra/newview/skins/default/xui/en/inspect_avatar.xml @@ -86,7 +86,7 @@ min_val="0.05" name="volume_slider" show_text="false" - tool_tip="Voice Volume" + tool_tip="Voice volume" top_pad="0" value="0.5" width="150" /> diff --git a/indra/newview/skins/default/xui/en/menu_inventory.xml b/indra/newview/skins/default/xui/en/menu_inventory.xml index 7785492651..62940b87dc 100644 --- a/indra/newview/skins/default/xui/en/menu_inventory.xml +++ b/indra/newview/skins/default/xui/en/menu_inventory.xml @@ -603,14 +603,6 @@ function="Inventory.DoToSelected" parameter="wear" /> </menu_item_call> - <menu_item_call - label="Add" - layout="topleft" - name="Wearable Add"> - <menu_item_call.on_click - function="Inventory.DoToSelected" - parameter="wear_add" /> - </menu_item_call> <menu_item_call label="Take Off" layout="topleft" diff --git a/indra/newview/skins/default/xui/en/panel_classified.xml b/indra/newview/skins/default/xui/en/panel_classified.xml index fde795260e..18d12aef70 100644 --- a/indra/newview/skins/default/xui/en/panel_classified.xml +++ b/indra/newview/skins/default/xui/en/panel_classified.xml @@ -40,7 +40,7 @@ layout="topleft" left_delta="0" name="given_name_editor" - tool_tip="Name must begin with a letter or number, not punctuation." + tool_tip="Name must begin with a letter or number, not punctuation" top_delta="288" width="400" /> <text_editor @@ -61,7 +61,7 @@ layout="topleft" left="20" name="location_editor" - tool_tip="Set the location for this classified to your current position." + tool_tip="Set the location for this classified to your current position" width="400" /> <button follows="left|top" diff --git a/indra/newview/skins/default/xui/en/panel_edit_gloves.xml b/indra/newview/skins/default/xui/en/panel_edit_gloves.xml index e88c82d406..517cdd75fb 100644 --- a/indra/newview/skins/default/xui/en/panel_edit_gloves.xml +++ b/indra/newview/skins/default/xui/en/panel_edit_gloves.xml @@ -37,7 +37,7 @@ layout="topleft" left_pad="10" name="Color/Tint" - tool_tip="Click to open Color Picker" + tool_tip="Click to open color picker" top="10" width="64" /> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_edit_jacket.xml b/indra/newview/skins/default/xui/en/panel_edit_jacket.xml index 70dab20351..0b54944e29 100644 --- a/indra/newview/skins/default/xui/en/panel_edit_jacket.xml +++ b/indra/newview/skins/default/xui/en/panel_edit_jacket.xml @@ -49,7 +49,7 @@ layout="topleft" left_pad="10" name="Color/Tint" - tool_tip="Click to open Color Picker" + tool_tip="Click to open color picker" top="10" width="64" /> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_edit_pants.xml b/indra/newview/skins/default/xui/en/panel_edit_pants.xml index 0748757c70..939314f9f9 100644 --- a/indra/newview/skins/default/xui/en/panel_edit_pants.xml +++ b/indra/newview/skins/default/xui/en/panel_edit_pants.xml @@ -37,7 +37,7 @@ layout="topleft" left_pad="10" name="Color/Tint" - tool_tip="Click to open Color Picker" + tool_tip="Click to open color picker" top="10" width="64" /> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_edit_shirt.xml b/indra/newview/skins/default/xui/en/panel_edit_shirt.xml index 140b5c5f94..258ee06697 100644 --- a/indra/newview/skins/default/xui/en/panel_edit_shirt.xml +++ b/indra/newview/skins/default/xui/en/panel_edit_shirt.xml @@ -37,7 +37,7 @@ layout="topleft" left_pad="10" name="Color/Tint" - tool_tip="Click to open Color Picker" + tool_tip="Click to open color picker" top="10" width="64" /> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_edit_shoes.xml b/indra/newview/skins/default/xui/en/panel_edit_shoes.xml index 01f2c428f1..22fced4aac 100644 --- a/indra/newview/skins/default/xui/en/panel_edit_shoes.xml +++ b/indra/newview/skins/default/xui/en/panel_edit_shoes.xml @@ -37,7 +37,7 @@ layout="topleft" left_pad="10" name="Color/Tint" - tool_tip="Click to open Color Picker" + tool_tip="Click to open color picker" top="10" width="64" /> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_edit_skirt.xml b/indra/newview/skins/default/xui/en/panel_edit_skirt.xml index c04276525a..411d433604 100644 --- a/indra/newview/skins/default/xui/en/panel_edit_skirt.xml +++ b/indra/newview/skins/default/xui/en/panel_edit_skirt.xml @@ -37,7 +37,7 @@ layout="topleft" left_pad="10" name="Color/Tint" - tool_tip="Click to open Color Picker" + tool_tip="Click to open color picker" top="10" width="64" /> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_edit_socks.xml b/indra/newview/skins/default/xui/en/panel_edit_socks.xml index 7c95ac637d..faff67795c 100644 --- a/indra/newview/skins/default/xui/en/panel_edit_socks.xml +++ b/indra/newview/skins/default/xui/en/panel_edit_socks.xml @@ -37,7 +37,7 @@ layout="topleft" left_pad="10" name="Color/Tint" - tool_tip="Click to open Color Picker" + tool_tip="Click to open color picker" top="10" width="64" /> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_edit_underpants.xml b/indra/newview/skins/default/xui/en/panel_edit_underpants.xml index 5fe1c2caef..bb0b353a01 100644 --- a/indra/newview/skins/default/xui/en/panel_edit_underpants.xml +++ b/indra/newview/skins/default/xui/en/panel_edit_underpants.xml @@ -37,7 +37,7 @@ layout="topleft" left_pad="10" name="Color/Tint" - tool_tip="Click to open Color Picker" + tool_tip="Click to open color picker" top="10" width="64" /> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_group_general.xml b/indra/newview/skins/default/xui/en/panel_group_general.xml index 19285e8e48..c18b625033 100644 --- a/indra/newview/skins/default/xui/en/panel_group_general.xml +++ b/indra/newview/skins/default/xui/en/panel_group_general.xml @@ -116,7 +116,7 @@ Hover your mouse over the options for more help. layout="topleft" left_delta="0" name="list_groups_in_profile" - tool_tip="Sets whether you want to show this group in your Profile" + tool_tip="Sets whether you want to show this group in your profile" top_pad="5" width="240" /> <panel @@ -147,7 +147,7 @@ Hover your mouse over the options for more help. layout="topleft" left_delta="0" name="check_enrollment_fee" - tool_tip="Sets whether to require an enrollment fee to join the group." + tool_tip="Sets whether to require an enrollment fee to join the group" top_pad="5" width="90" /> <spinner @@ -173,7 +173,7 @@ Hover your mouse over the options for more help. layout="topleft" left="4" name="show_in_group_list" - tool_tip="Let people see this group in search results." + tool_tip="Let people see this group in search results" top_pad="4" width="90" /> <combo_box @@ -181,7 +181,7 @@ Hover your mouse over the options for more help. layout="topleft" left_delta="0" name="group_mature_check" - tool_tip="Sets whether your group information is considered mature." + tool_tip="Sets whether your group information is considered mature" top_pad="10" width="240"> <combo_box.item diff --git a/indra/newview/skins/default/xui/en/panel_group_invite.xml b/indra/newview/skins/default/xui/en/panel_group_invite.xml index 68b30faa1c..1996977acb 100644 --- a/indra/newview/skins/default/xui/en/panel_group_invite.xml +++ b/indra/newview/skins/default/xui/en/panel_group_invite.xml @@ -49,7 +49,7 @@ Resident Chooser' to start. left_delta="0" multi_select="true" name="invitee_list" - tool_tip="Hold the Ctrl key and click resident names to multi-select." + tool_tip="Hold the Ctrl key and click resident names to multi-select" top_pad="4" width="200" /> <button @@ -59,7 +59,7 @@ Resident Chooser' to start. layout="topleft" left_delta="0" name="remove_button" - tool_tip="Removes residents selected above from the invite list." + tool_tip="Removes residents selected above from the invite list" top_pad="4" width="200" /> <text @@ -78,7 +78,7 @@ Resident Chooser' to start. layout="topleft" left_delta="0" name="role_name" - tool_tip="Choose from the list of Roles you are allowed to assign members to." + tool_tip="Choose from the list of Roles you are allowed to assign members to" top_delta="16" width="196" /> <button diff --git a/indra/newview/skins/default/xui/en/panel_group_roles.xml b/indra/newview/skins/default/xui/en/panel_group_roles.xml index bf861af4f2..75ded4f249 100644 --- a/indra/newview/skins/default/xui/en/panel_group_roles.xml +++ b/indra/newview/skins/default/xui/en/panel_group_roles.xml @@ -464,7 +464,7 @@ things in this group. There's a broad variety of Abilities. multi_select="true" name="action_list" search_column="1" - tool_tip="Select an Ability to view more details." + tool_tip="Select an Ability to view more details" top_pad="6" width="255"> <scroll_list.columns @@ -542,7 +542,7 @@ things in this group. There's a broad variety of Abilities. follows="left|top" left_pad="5" name="member_allowed_actions" - tool_tip="For Details of each Allowed Ability see the Abilities tab." + tool_tip="For details of each allowed ability see the abilities tab" top_delta="0" width="130"> <scroll_list.columns @@ -655,7 +655,7 @@ things in this group. There's a broad variety of Abilities. layout="topleft" left_pad="15" name="static5" - tool_tip="A list of Abilities the currently selected role can perform." + tool_tip="A list of abilities the currently selected role can perform" top_delta="0" width="100"> Allowed Abilities @@ -674,7 +674,7 @@ things in this group. There's a broad variety of Abilities. layout="topleft" left_delta="0" name="role_visible_in_list" - tool_tip="Sets whether members of this role are visible in the General tab to people outside of the group." + tool_tip="Sets whether members of this role are visible in the General tab to people outside of the group." top_pad="10" width="130" /> <scroll_list @@ -684,7 +684,7 @@ things in this group. There's a broad variety of Abilities. left="135" name="role_allowed_actions" search_column="2" - tool_tip="For Details of each Allowed Ability see the Abilities tab." + tool_tip="For details of each allowed ability see the abilities tab" top="101" width="130"> <scroll_list.columns diff --git a/indra/newview/skins/default/xui/en/panel_landmarks.xml b/indra/newview/skins/default/xui/en/panel_landmarks.xml index 7c7561f922..ad452b16a7 100644 --- a/indra/newview/skins/default/xui/en/panel_landmarks.xml +++ b/indra/newview/skins/default/xui/en/panel_landmarks.xml @@ -113,7 +113,7 @@ left_pad="5" name="add_landmark_btn" picture_style="true" - tool_tip="Add New Landmark" + tool_tip="Add new landmark" width="18" /> <button follows="bottom|left" @@ -125,7 +125,7 @@ left_pad="5" name="add_folder_btn" picture_style="true" - tool_tip="Add New Folder" + tool_tip="Add new folder" width="18" /> <button follows="bottom|right" @@ -136,7 +136,7 @@ right="-5" name="trash_btn" picture_style="true" - tool_tip="Remove selected Landmark" + tool_tip="Remove selected landmark" top="6" width="18" /> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml index 3d984a83fb..e53edf891d 100644 --- a/indra/newview/skins/default/xui/en/panel_people.xml +++ b/indra/newview/skins/default/xui/en/panel_people.xml @@ -86,7 +86,7 @@ color="DkGray" width="313"> <button follows="bottom|left" - tool_tip="Change sort and view of Residents list" + tool_tip="Change sort and view of residents list" height="18" image_disabled="OptionsMenu_Disabled" image_selected="OptionsMenu_Press" @@ -165,7 +165,7 @@ color="DkGray" width="313"> <button follows="bottom|left" - tool_tip="Change sort and view of Friends list" + tool_tip="Change sort and view of friends list" height="18" image_disabled="OptionsMenu_Disabled" image_selected="OptionsMenu_Press" @@ -237,7 +237,7 @@ color="DkGray" width="313"> <button follows="bottom|left" - tool_tip="Change sort and view of Groups list" + tool_tip="Change sort and view of groups list" height="18" image_disabled="OptionsMenu_Disabled" image_selected="OptionsMenu_Press" @@ -322,7 +322,7 @@ color="DkGray" <button follows="bottom|left" font="SansSerifBigBold" - tool_tip="Change sort and view of Recent Residents list" + tool_tip="Change sort and view of recent residents list" height="18" image_disabled="OptionsMenu_Disabled" image_selected="OptionsMenu_Press" @@ -382,7 +382,7 @@ color="DkGray" label="Add Friend" layout="topleft" name="add_friend_btn" - tool_tip="Add selected resident to your Friends List" + tool_tip="Add selected resident to your friends List" width="85" /> </layout_panel> <layout_panel diff --git a/indra/newview/skins/default/xui/en/panel_picks.xml b/indra/newview/skins/default/xui/en/panel_picks.xml index 2869ec78f4..ac2cf19a96 100644 --- a/indra/newview/skins/default/xui/en/panel_picks.xml +++ b/indra/newview/skins/default/xui/en/panel_picks.xml @@ -54,7 +54,7 @@ left_pad="15" name="new_btn" picture_style="true" - tool_tip="Create New Pick at Current Location" + tool_tip="Create new pick at current location" top="5" width="18" /> <button diff --git a/indra/newview/skins/default/xui/en/panel_region_debug.xml b/indra/newview/skins/default/xui/en/panel_region_debug.xml index 78e5678455..25e1171688 100644 --- a/indra/newview/skins/default/xui/en/panel_region_debug.xml +++ b/indra/newview/skins/default/xui/en/panel_region_debug.xml @@ -162,7 +162,7 @@ layout="topleft" left_delta="60" name="return_scripts" - tool_tip="Return only objects which have scripts." + tool_tip="Return only objects which have scripts" top_delta="0" width="80" /> <check_box diff --git a/indra/newview/skins/default/xui/en/panel_region_estate.xml b/indra/newview/skins/default/xui/en/panel_region_estate.xml index afcefcbd3b..c7a60ed2e4 100644 --- a/indra/newview/skins/default/xui/en/panel_region_estate.xml +++ b/indra/newview/skins/default/xui/en/panel_region_estate.xml @@ -180,7 +180,7 @@ regions in the estate. layout="topleft" left_delta="0" name="limit_payment" - tool_tip="Ban unidentified residents." + tool_tip="Ban unidentified residents" top_pad="2" width="278" /> <check_box diff --git a/indra/newview/skins/default/xui/en/panel_stand_stop_flying.xml b/indra/newview/skins/default/xui/en/panel_stand_stop_flying.xml index 203aed2adb..c8703aa895 100644 --- a/indra/newview/skins/default/xui/en/panel_stand_stop_flying.xml +++ b/indra/newview/skins/default/xui/en/panel_stand_stop_flying.xml @@ -23,7 +23,7 @@ label="Stop Flying" layout="topleft" name="stop_fly_btn" - tool_tip="Stop Flying" + tool_tip="Stop flying" top="2" visible="false" width="115" /> diff --git a/indra/newview/skins/default/xui/en/panel_status_bar.xml b/indra/newview/skins/default/xui/en/panel_status_bar.xml index fc61ce9683..795e0ffc0d 100644 --- a/indra/newview/skins/default/xui/en/panel_status_bar.xml +++ b/indra/newview/skins/default/xui/en/panel_status_bar.xml @@ -68,7 +68,7 @@ left_pad="20" name="TimeText" text_color="TimeTextColor" - tool_tip="Current Time (Pacific)" + tool_tip="Current time (Pacific)" width="80"> 12:00 AM </text> @@ -82,7 +82,7 @@ name="scriptout" picture_style="true" scale_image="false" - tool_tip="Script Warnings and Errors" + tool_tip="Script warnings and errors" top="0" visible="false" width="16" /> @@ -140,7 +140,7 @@ name="no_build" picture_style="true" scale_image="false" - tool_tip="Building/Rezzing not allowed" + tool_tip="Building/rezzing not allowed" top="0" visible="false" width="16" /> @@ -168,7 +168,7 @@ name="restrictpush" picture_style="true" scale_image="false" - tool_tip="No Pushing" + tool_tip="No pushing" top="0" visible="false" width="16" /> diff --git a/indra/newview/skins/default/xui/en/widgets/combo_box.xml b/indra/newview/skins/default/xui/en/widgets/combo_box.xml index 8b23b72c2d..9ed3749308 100644 --- a/indra/newview/skins/default/xui/en/widgets/combo_box.xml +++ b/indra/newview/skins/default/xui/en/widgets/combo_box.xml @@ -15,7 +15,7 @@ label="" hover_glow_amount="0.15" font="SansSerifSmall" - scale_image="false" + scale_image="true" pad_right="24" image_unselected="DropDown_Off" image_selected="DropDown_Selected" diff --git a/indra/newview/skins/default/xui/en/widgets/location_input.xml b/indra/newview/skins/default/xui/en/widgets/location_input.xml index d86103aedc..40c8dc860d 100644 --- a/indra/newview/skins/default/xui/en/widgets/location_input.xml +++ b/indra/newview/skins/default/xui/en/widgets/location_input.xml @@ -46,7 +46,7 @@ <combo_button name="Location History" label="" pad_right="0" - tool_tip="My Location History"/> + tool_tip="My location history"/> <combo_list bg_writeable_color="MenuDefaultBgColor" page_lines="10" scroll_bar_bg_visible="true" /> <combo_editor name="Combo Text Entry" |