diff --git a/indra/llcommon/llfasttimer.h b/indra/llcommon/llfasttimer.h
index f5c90291b801d3a87346a7c89f0024f9062bd4f2..5058a2e772d33cc67b86c03c2b1668041132df73 100644
--- a/indra/llcommon/llfasttimer.h
+++ b/indra/llcommon/llfasttimer.h
@@ -39,40 +39,30 @@
#define TIME_FAST_TIMERS 0
#if LL_WINDOWS
-
+// because MS has different signatures for these functions in winnt.h
+// need to rename them to avoid conflicts
+#define _interlockedbittestandset _renamed_interlockedbittestandset
+#define _interlockedbittestandreset _renamed_interlockedbittestandreset
+#include <intrin.h>
+#undef _interlockedbittestandset
+#undef _interlockedbittestandreset
+
+#define LL_INLINE __forceinline
// shift off lower 8 bits for lower resolution but longer term timing
// on 1Ghz machine, a 32-bit word will hold ~1000 seconds of timing
inline U32 get_cpu_clock_count_32()
{
- U32 ret_val;
- __asm
- {
- _emit 0x0f
- _emit 0x31
- shr eax,8
- shl edx,24
- or eax, edx
- mov dword ptr [ret_val], eax
- }
- return ret_val;
+ U64 time_stamp = __rdtsc();
+ return (U32)(time_stamp >> 8);
}
// return full timer value, *not* shifted by 8 bits
inline U64 get_cpu_clock_count_64()
{
- U64 ret_val;
- __asm
- {
- _emit 0x0f
- _emit 0x31
- mov eax,eax
- mov edx,edx
- mov dword ptr [ret_val+4], edx
- mov dword ptr [ret_val], eax
- }
- return ret_val;
+ return __rdtsc();
}
-
+#else
+#define LL_INLINE
#endif // LL_WINDOWS
#if (LL_LINUX || LL_SOLARIS || LL_DARWIN) && (defined(__i386__) || defined(__amd64__))
@@ -113,10 +103,25 @@ class LLMutex;
#include <queue>
#include "llsd.h"
-
class LL_COMMON_API LLFastTimer
{
public:
+
+ class NamedTimer;
+
+ struct LL_COMMON_API FrameState
+ {
+ FrameState(NamedTimer* timerp);
+
+ U32 mSelfTimeCounter;
+ U32 mCalls;
+ FrameState* mParent; // info for caller timer
+ FrameState* mLastCaller; // used to bootstrap tree construction
+ NamedTimer* mTimer;
+ U16 mActiveCount; // number of timers with this ID active on stack
+ bool mMoveUpTree; // needs to be moved up the tree of timers at the end of frame
+ };
+
// stores a "named" timer instance to be reused via multiple LLFastTimer stack instances
class LL_COMMON_API NamedTimer
: public LLInstanceTracker<NamedTimer>
@@ -149,24 +154,10 @@ class LL_COMMON_API LLFastTimer
static NamedTimer& getRootNamedTimer();
- struct FrameState
- {
- FrameState(NamedTimer* timerp);
-
- U32 mSelfTimeCounter;
- U32 mCalls;
- FrameState* mParent; // info for caller timer
- FrameState* mLastCaller; // used to bootstrap tree construction
- NamedTimer* mTimer;
- U16 mActiveCount; // number of timers with this ID active on stack
- bool mMoveUpTree; // needs to be moved up the tree of timers at the end of frame
- };
-
S32 getFrameStateIndex() const { return mFrameStateIndex; }
FrameState& getFrameState() const;
-
private:
friend class LLFastTimer;
friend class NamedTimerFactory;
@@ -185,7 +176,6 @@ class LL_COMMON_API LLFastTimer
static void buildHierarchy();
static void resetFrame();
static void reset();
-
//
// members
@@ -207,58 +197,47 @@ class LL_COMMON_API LLFastTimer
std::vector<NamedTimer*> mChildren;
bool mCollapsed; // don't show children
bool mNeedsSorting; // sort children whenever child added
-
};
// used to statically declare a new named timer
class LL_COMMON_API DeclareTimer
: public LLInstanceTracker<DeclareTimer>
{
+ friend class LLFastTimer;
public:
DeclareTimer(const std::string& name, bool open);
DeclareTimer(const std::string& name);
static void updateCachedPointers();
- // convertable to NamedTimer::FrameState for convenient usage of LLFastTimer(declared_timer)
- operator NamedTimer::FrameState&() { return *mFrameState; }
private:
- NamedTimer& mTimer;
- NamedTimer::FrameState* mFrameState;
+ NamedTimer& mTimer;
+ FrameState* mFrameState;
};
-
public:
- static LLMutex* sLogLock;
- static std::queue<LLSD> sLogQueue;
- static BOOL sLog;
- static BOOL sMetricLog;
-
- typedef std::vector<NamedTimer::FrameState> info_list_t;
- static info_list_t& getFrameStateList();
+ LLFastTimer(LLFastTimer::FrameState* state);
- enum RootTimerMarker { ROOT };
- LLFastTimer(RootTimerMarker);
-
- LLFastTimer(NamedTimer::FrameState& timer)
- : mFrameState(&timer)
+ LL_INLINE LLFastTimer(LLFastTimer::DeclareTimer& timer)
+ : mFrameState(timer.mFrameState)
{
#if TIME_FAST_TIMERS
U64 timer_start = get_cpu_clock_count_64();
#endif
#if FAST_TIMER_ON
- NamedTimer::FrameState* frame_state = &timer;
- U32 cur_time = get_cpu_clock_count_32();
- mStartSelfTime = cur_time;
- mStartTotalTime = cur_time;
+ LLFastTimer::FrameState* frame_state = mFrameState;
+ mStartTime = get_cpu_clock_count_32();
frame_state->mActiveCount++;
frame_state->mCalls++;
// keep current parent as long as it is active when we are
frame_state->mMoveUpTree |= (frame_state->mParent->mActiveCount == 0);
- mLastTimer = sCurTimer;
- sCurTimer = this;
+ LLFastTimer::CurTimerData* cur_timer_data = &LLFastTimer::sCurTimerData;
+ mLastTimerData = *cur_timer_data;
+ cur_timer_data->mCurTimer = this;
+ cur_timer_data->mFrameState = frame_state;
+ cur_timer_data->mChildTime = 0;
#endif
#if TIME_FAST_TIMERS
U64 timer_end = get_cpu_clock_count_64();
@@ -266,26 +245,26 @@ class LL_COMMON_API LLFastTimer
#endif
}
- ~LLFastTimer()
+ LL_INLINE ~LLFastTimer()
{
#if TIME_FAST_TIMERS
U64 timer_start = get_cpu_clock_count_64();
#endif
#if FAST_TIMER_ON
- NamedTimer::FrameState* frame_state = mFrameState;
- U32 cur_time = get_cpu_clock_count_32();
- frame_state->mSelfTimeCounter += cur_time - mStartSelfTime;
+ LLFastTimer::FrameState* frame_state = mFrameState;
+ U32 total_time = get_cpu_clock_count_32() - mStartTime;
+ frame_state->mSelfTimeCounter += total_time - LLFastTimer::sCurTimerData.mChildTime;
frame_state->mActiveCount--;
- LLFastTimer* last_timer = mLastTimer;
- sCurTimer = last_timer;
// store last caller to bootstrap tree creation
- frame_state->mLastCaller = last_timer->mFrameState;
+ // do this in the destructor in case of recursion to get topmost caller
+ frame_state->mLastCaller = mLastTimerData.mFrameState;
// we are only tracking self time, so subtract our total time delta from parents
- U32 total_time = cur_time - mStartTotalTime;
- last_timer->mStartSelfTime += total_time;
+ mLastTimerData.mChildTime += total_time;
+
+ LLFastTimer::sCurTimerData = mLastTimerData;
#endif
#if TIME_FAST_TIMERS
U64 timer_end = get_cpu_clock_count_64();
@@ -294,7 +273,20 @@ class LL_COMMON_API LLFastTimer
#endif
}
+public:
+ static LLMutex* sLogLock;
+ static std::queue<LLSD> sLogQueue;
+ static BOOL sLog;
+ static BOOL sMetricLog;
+ static bool sPauseHistory;
+ static bool sResetHistory;
+ static U64 sTimerCycles;
+ static U32 sTimerCalls;
+ typedef std::vector<FrameState> info_list_t;
+ static info_list_t& getFrameStateList();
+
+
// call this once a frame to reset timers
static void nextFrame();
@@ -312,23 +304,26 @@ class LL_COMMON_API LLFastTimer
static void writeLog(std::ostream& os);
static const NamedTimer* getTimerByName(const std::string& name);
-public:
- static bool sPauseHistory;
- static bool sResetHistory;
- static U64 sTimerCycles;
- static U32 sTimerCalls;
-
+ struct CurTimerData
+ {
+ LLFastTimer* mCurTimer;
+ FrameState* mFrameState;
+ U32 mChildTime;
+ };
+ static CurTimerData sCurTimerData;
+
private:
- static LLFastTimer* sCurTimer;
static S32 sCurFrameIndex;
static S32 sLastFrameIndex;
static U64 sLastFrameTime;
static info_list_t* sTimerInfos;
- U32 mStartSelfTime; // start time + time of all child timers
- U32 mStartTotalTime; // start time + time of all child timers
- NamedTimer::FrameState* mFrameState;
- LLFastTimer* mLastTimer;
+ U32 mStartTime;
+ LLFastTimer::FrameState* mFrameState;
+ LLFastTimer::CurTimerData mLastTimerData;
+
};
+typedef class LLFastTimer LLFastTimer;
+
#endif // LL_LLFASTTIMER_H
diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp
index 845203b420ebb7e29ef5a70372462f6ba61948c1..a35d279500494fed9e4deeaed37b1ab1adb8b18c 100644
--- a/indra/llui/llfloater.cpp
+++ b/indra/llui/llfloater.cpp
@@ -878,9 +878,11 @@ void LLFloater::setSnappedTo(const LLView* snap_view)
else
{
//RN: assume it's a floater as it must be a sibling to our parent floater
- LLFloater* floaterp = (LLFloater*)snap_view;
-
- setSnapTarget(floaterp->getHandle());
+ const LLFloater* floaterp = dynamic_cast<const LLFloater*>(snap_view);
+ if (floaterp)
+ {
+ setSnapTarget(floaterp->getHandle());
+ }
}
}
diff --git a/indra/llui/lltexteditor.cpp b/indra/llui/lltexteditor.cpp
index e8fc9475a542d55f42958964c6d6e692b9fbe5f5..f2c3879a6c97bc57def552a400870e0aeb38b346 100644
--- a/indra/llui/lltexteditor.cpp
+++ b/indra/llui/lltexteditor.cpp
@@ -308,7 +308,8 @@ LLTextEditor::~LLTextEditor()
// Scrollbar is deleted by LLView
std::for_each(mUndoStack.begin(), mUndoStack.end(), DeletePointer());
- delete mContextMenu;
+ // context menu is owned by menu holder, not us
+ //delete mContextMenu;
}
////////////////////////////////////////////////////////////
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index f56be4004a4a30da71e7bc420e2d738965ccd025..0e1d5ca80b5e97447d5ceb8d7098c142fe11f684 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -212,7 +212,6 @@ set(viewer_SOURCE_FILES
llfloaterurldisplay.cpp
llfloaterurlentry.cpp
llfloatervoicedevicesettings.cpp
- llfloatervolumepulldown.cpp
llfloaterwater.cpp
llfloaterwhitelistentry.cpp
llfloaterwindlight.cpp
@@ -348,6 +347,7 @@ set(viewer_SOURCE_FILES
llpanelshower.cpp
llpanelteleporthistory.cpp
llpanelvolume.cpp
+ llpanelvolumepulldown.cpp
llparcelselection.cpp
llparticipantlist.cpp
llpatchvertexarray.cpp
@@ -850,6 +850,7 @@ set(viewer_HEADER_FILES
llpanelshower.h
llpanelteleporthistory.h
llpanelvolume.h
+ llpanelvolumepulldown.h
llparcelselection.h
llparticipantlist.h
llpatchvertexarray.h
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 9250b427af6254770cabe436488ffc7fd98e9c50..184606d495fb662a8b30af2904b98064f254e930 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -1141,7 +1141,18 @@
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>Boolean</string>
+ <string>S32</string>
+ <key>Value</key>
+ <integer>5</integer>
+ </map>
+ <key>CallFloaterMaxItems</key>
+ <map>
+ <key>Comment</key>
+ <string>Max number of visible participants in voice controls window</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>S32</string>
<key>Value</key>
<integer>1</integer>
</map>
diff --git a/indra/newview/installers/darwin/fix_application_icon_position.sh b/indra/newview/installers/darwin/fix_application_icon_position.sh
new file mode 100644
index 0000000000000000000000000000000000000000..a0b72a89f253c110da738d326d1830dec0a0493e
--- /dev/null
+++ b/indra/newview/installers/darwin/fix_application_icon_position.sh
@@ -0,0 +1,14 @@
+# just run this script each time after you change the installer's name to fix the icon misalignment
+#!/bin/bash
+cp -r ./../../../build-darwin-i386/newview/*.dmg ~/Desktop/TempBuild.dmg
+hdid ~/Desktop/TempBuild.dmg
+open -a finder /Volumes/Second\ Life\ Installer
+osascript dmg-cleanup.applescript
+cp /Volumes/Second\ Life\ Installer/.DS_Store ~/Desktop/_DS_Store
+chflags nohidden ~/Desktop/_DS_Store
+cp ~/Desktop/_DS_Store ./firstlook-dmg/_DS_Store
+cp ~/Desktop/_DS_Store ./publicnightly-dmg/_DS_Store
+cp ~/Desktop/_DS_Store ./release-dmg/_DS_Store
+cp ~/Desktop/_DS_Store ./releasecandidate-dmg/_DS_Store
+umount /Volumes/Second\ Life\ Installer/
+rm ~/Desktop/_DS_Store ~/Desktop/TempBuild.dmg
diff --git a/indra/newview/llcallfloater.cpp b/indra/newview/llcallfloater.cpp
index 1468f6d584f5b628f36cba6bbc4aa3f829956f94..c0efb85b512514c8572ad841490d01aaf2d289d2 100644
--- a/indra/newview/llcallfloater.cpp
+++ b/indra/newview/llcallfloater.cpp
@@ -51,6 +51,7 @@
#include "lltransientfloatermgr.h"
#include "llviewerwindow.h"
#include "llvoicechannel.h"
+#include "lllayoutstack.h"
static void get_voice_participants_uuids(std::vector<LLUUID>& speakers_uuids);
@@ -314,7 +315,7 @@ void LLCallFloater::updateSession()
//hide "Leave Call" button for nearby chat
bool is_local_chat = mVoiceType == VC_LOCAL_CHAT;
- childSetVisible("leave_call_btn", !is_local_chat);
+ childSetVisible("leave_call_btn_panel", !is_local_chat);
refreshParticipantList();
updateAgentModeratorState();
@@ -818,8 +819,8 @@ void reshape_floater(LLCallFloater* floater, S32 delta_height)
}
}
- floater->reshape(floater_rect.getWidth(), floater_rect.getHeight());
- floater->setRect(floater_rect);
+ floater->setShape(floater_rect);
+ floater->getChild<LLLayoutStack>("my_call_stack")->updateLayout(FALSE);
}
void LLCallFloater::reshapeToFitContent()
@@ -864,9 +865,8 @@ S32 LLCallFloater::getParticipantItemHeight()
S32 LLCallFloater::getMaxVisibleItems()
{
- S32 value = 5; // default value, in case convertToS32() fails.
- LLStringUtil::convertToS32(getString("max_visible_items"), value);
- return value;
+ static LLCachedControl<S32> max_visible_items(*LLUI::sSettingGroups["config"],"CallFloaterMaxItems");
+ return max_visible_items;
}
//EOF
diff --git a/indra/newview/llfloaterland.cpp b/indra/newview/llfloaterland.cpp
index 598a13de158ce6521f07e1b6db181cbbdba8731b..42c961a956b7c96e287a6b864a323dd31c4bac04 100644
--- a/indra/newview/llfloaterland.cpp
+++ b/indra/newview/llfloaterland.cpp
@@ -276,6 +276,7 @@ void LLFloaterLand::refresh()
mPanelAudio->refresh();
mPanelMedia->refresh();
mPanelAccess->refresh();
+ mPanelCovenant->refresh();
}
@@ -2795,12 +2796,6 @@ LLPanelLandCovenant::~LLPanelLandCovenant()
{
}
-BOOL LLPanelLandCovenant::postBuild()
-{
- refresh();
- return TRUE;
-}
-
// virtual
void LLPanelLandCovenant::refresh()
{
diff --git a/indra/newview/llfloaterland.h b/indra/newview/llfloaterland.h
index d7d02ba1a375a57316412920a763fdccd2d81578..a4785e8f5b0ee2533d8b4ea66c676311217dcc90 100644
--- a/indra/newview/llfloaterland.h
+++ b/indra/newview/llfloaterland.h
@@ -391,7 +391,6 @@ class LLPanelLandCovenant
public:
LLPanelLandCovenant(LLSafeHandle<LLParcelSelection>& parcelp);
virtual ~LLPanelLandCovenant();
- virtual BOOL postBuild();
void refresh();
static void updateCovenantText(const std::string& string);
static void updateEstateName(const std::string& name);
diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp
index d0716f67b8027cb5212ba6b45e5b30fdfc7258b0..9af37e817499a6b59ba1970ab4ba0095000c44dd 100644
--- a/indra/newview/llfloaterpreference.cpp
+++ b/indra/newview/llfloaterpreference.cpp
@@ -602,8 +602,8 @@ void LLFloaterPreference::onBtnOK()
apply();
closeFloater(false);
- gSavedSettings.saveToFile( gSavedSettings.getString("ClientSettingsFile"), TRUE );
LLUIColorTable::instance().saveUserSettings();
+ gSavedSettings.saveToFile( gSavedSettings.getString("ClientSettingsFile"), TRUE );
std::string crash_settings_filename = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, CRASH_SETTINGS_FILE);
// save all settings, even if equals defaults
gCrashSettings.saveToFile(crash_settings_filename, FALSE);
diff --git a/indra/newview/llfloaterregioninfo.cpp b/indra/newview/llfloaterregioninfo.cpp
index c4b87c1b2dc47f2b9e781258806c01f76edf8769..0402ba20e217d5a1fcf9c22eeee833ed13f538d1 100644
--- a/indra/newview/llfloaterregioninfo.cpp
+++ b/indra/newview/llfloaterregioninfo.cpp
@@ -406,6 +406,11 @@ LLPanelEstateCovenant* LLFloaterRegionInfo::getPanelCovenant()
void LLFloaterRegionInfo::refreshFromRegion(LLViewerRegion* region)
{
+ if (!region)
+ {
+ return;
+ }
+
// call refresh from region on all panels
std::for_each(
mInfoPanels.begin(),
diff --git a/indra/newview/llpanelvolumepulldown.cpp b/indra/newview/llpanelvolumepulldown.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..74e37efe4e45f0a0fadfddd9fc9457d29803ba5e
--- /dev/null
+++ b/indra/newview/llpanelvolumepulldown.cpp
@@ -0,0 +1,154 @@
+/**
+ * @file llpanelvolumepulldown.cpp
+ * @author Tofu Linden
+ * @brief A floater showing the master volume pull-down
+ *
+ * $LicenseInfo:firstyear=2008&license=viewergpl$
+ *
+ * Copyright (c) 2008-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 "llpanelvolumepulldown.h"
+
+// Viewer libs
+#include "llviewercontrol.h"
+#include "llstatusbar.h"
+
+// Linden libs
+#include "llbutton.h"
+#include "lltabcontainer.h"
+#include "llfloaterreg.h"
+#include "llfloaterpreference.h"
+#include "llslider.h"
+
+/* static */ const F32 LLPanelVolumePulldown::sAutoCloseFadeStartTimeSec = 4.0f;
+/* static */ const F32 LLPanelVolumePulldown::sAutoCloseTotalTimeSec = 5.0f;
+
+///----------------------------------------------------------------------------
+/// Class LLPanelVolumePulldown
+///----------------------------------------------------------------------------
+
+// Default constructor
+LLPanelVolumePulldown::LLPanelVolumePulldown()
+{
+ mCommitCallbackRegistrar.add("Vol.setControlFalse", boost::bind(&LLPanelVolumePulldown::setControlFalse, this, _2));
+ mCommitCallbackRegistrar.add("Vol.GoAudioPrefs", boost::bind(&LLPanelVolumePulldown::onAdvancedButtonClick, this, _2));
+ LLUICtrlFactory::instance().buildPanel(this, "panel_volume_pulldown.xml");
+}
+
+BOOL LLPanelVolumePulldown::postBuild()
+{
+ // set the initial volume-slider's position to reflect reality
+ LLSlider* volslider = getChild<LLSlider>( "mastervolume" );
+ volslider->setValue(gSavedSettings.getF32("AudioLevelMaster"));
+
+ return LLPanel::postBuild();
+}
+
+/*virtual*/
+void LLPanelVolumePulldown::onMouseEnter(S32 x, S32 y, MASK mask)
+{
+ mHoverTimer.stop();
+ LLPanel::onMouseEnter(x,y,mask);
+}
+
+
+/*virtual*/
+void LLPanelVolumePulldown::onMouseLeave(S32 x, S32 y, MASK mask)
+{
+ mHoverTimer.start();
+ LLPanel::onMouseLeave(x,y,mask);
+}
+
+/*virtual*/
+void LLPanelVolumePulldown::handleVisibilityChange ( BOOL new_visibility )
+{
+ if (new_visibility)
+ {
+ mHoverTimer.start(); // timer will be stopped when mouse hovers over panel
+ gFocusMgr.setTopCtrl(this);
+ }
+ else
+ {
+ mHoverTimer.stop();
+ gFocusMgr.setTopCtrl(NULL);
+ }
+}
+
+/*virtual*/
+void LLPanelVolumePulldown::onTopLost()
+{
+ setVisible(FALSE);
+}
+
+void LLPanelVolumePulldown::onAdvancedButtonClick(const LLSD& user_data)
+{
+ // close the global volume minicontrol, we're bringing up the big one
+ setVisible(FALSE);
+
+ // bring up the prefs floater
+ LLFloaterPreference* prefsfloater = dynamic_cast<LLFloaterPreference*>
+ (LLFloaterReg::showInstance("preferences"));
+ if (prefsfloater)
+ {
+ // grab the 'audio' panel from the preferences floater and
+ // bring it the front!
+ LLTabContainer* tabcontainer = prefsfloater->getChild<LLTabContainer>("pref core");
+ LLPanel* audiopanel = prefsfloater->getChild<LLPanel>("audio");
+ if (tabcontainer && audiopanel)
+ {
+ tabcontainer->selectTabPanel(audiopanel);
+ }
+ }
+}
+
+void LLPanelVolumePulldown::setControlFalse(const LLSD& user_data)
+{
+ std::string control_name = user_data.asString();
+ LLControlVariable* control = findControl(control_name);
+
+ if (control)
+ control->set(LLSD(FALSE));
+}
+
+//virtual
+void LLPanelVolumePulldown::draw()
+{
+ F32 alpha = mHoverTimer.getStarted()
+ ? clamp_rescale(mHoverTimer.getElapsedTimeF32(), sAutoCloseFadeStartTimeSec, sAutoCloseTotalTimeSec, 1.f, 0.f)
+ : 1.0f;
+ LLViewDrawContext context(alpha);
+
+ LLPanel::draw();
+
+ if (alpha == 0.f)
+ {
+ setVisible(FALSE);
+ }
+}
+
diff --git a/indra/newview/llpanelvolumepulldown.h b/indra/newview/llpanelvolumepulldown.h
new file mode 100644
index 0000000000000000000000000000000000000000..9f20caa1a8bd9efcd1eddb131507c1283e36a35e
--- /dev/null
+++ b/indra/newview/llpanelvolumepulldown.h
@@ -0,0 +1,64 @@
+/**
+ * @file llpanelvolumepulldown.h
+ * @author Tofu Linden
+ * @brief A panel showing the master volume pull-down
+ *
+ * $LicenseInfo:firstyear=2008&license=viewergpl$
+ *
+ * Copyright (c) 2008-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_LLPANELVOLUMEPULLDOWN_H
+#define LL_LLPANELVOLUMEPULLDOWN_H
+
+#include "linden_common.h"
+
+#include "llpanel.h"
+
+class LLFrameTimer;
+
+class LLPanelVolumePulldown : public LLPanel
+{
+ public:
+ LLPanelVolumePulldown();
+ /*virtual*/ void draw();
+ /*virtual*/ void onMouseEnter(S32 x, S32 y, MASK mask);
+ /*virtual*/ void onMouseLeave(S32 x, S32 y, MASK mask);
+ /*virtual*/ void handleVisibilityChange ( BOOL new_visibility );
+ /*virtual*/ void onTopLost();
+ /*virtual*/ BOOL postBuild();
+
+ private:
+ void setControlFalse(const LLSD& user_data);
+ void onAdvancedButtonClick(const LLSD& user_data);
+
+ LLFrameTimer mHoverTimer;
+ static const F32 sAutoCloseFadeStartTimeSec;
+ static const F32 sAutoCloseTotalTimeSec;
+};
+
+
+#endif // LL_LLPANELVOLUMEPULLDOWN_H
diff --git a/indra/newview/llstatusbar.cpp b/indra/newview/llstatusbar.cpp
index 5ce3bbb9f629f599abc16adc35d97dd4d1394dce..b3b2b9ee5d55e658f4360c743393e2165117122a 100644
--- a/indra/newview/llstatusbar.cpp
+++ b/indra/newview/llstatusbar.cpp
@@ -42,7 +42,7 @@
#include "llfloaterbuycurrency.h"
#include "llfloaterchat.h"
#include "llfloaterlagmeter.h"
-#include "llfloatervolumepulldown.h"
+#include "llpanelvolumepulldown.h"
#include "llfloaterregioninfo.h"
#include "llfloaterscriptdebug.h"
#include "llhudicon.h"
@@ -204,6 +204,21 @@ LLStatusBar::LLStatusBar(const LLRect& rect)
addChild(mSGPacketLoss);
childSetActionTextbox("stat_btn", onClickStatGraph);
+
+ mPanelVolumePulldown = new LLPanelVolumePulldown();
+ addChild(mPanelVolumePulldown);
+
+ LLRect volume_pulldown_rect = mPanelVolumePulldown->getRect();
+ LLButton* volbtn = getChild<LLButton>( "volume_btn" );
+ volume_pulldown_rect.setLeftTopAndSize(volbtn->getRect().mLeft -
+ (volume_pulldown_rect.getWidth() - volbtn->getRect().getWidth())/2,
+ volbtn->calcScreenRect().mBottom,
+ volume_pulldown_rect.getWidth(),
+ volume_pulldown_rect.getHeight());
+
+ mPanelVolumePulldown->setShape(volume_pulldown_rect);
+ mPanelVolumePulldown->setFollows(FOLLOWS_TOP|FOLLOWS_RIGHT);
+ mPanelVolumePulldown->setVisible(FALSE);
}
LLStatusBar::~LLStatusBar()
@@ -501,7 +516,7 @@ static void onClickScriptDebug(void*)
void LLStatusBar::onMouseEnterVolume(LLUICtrl* ctrl)
{
// show the master volume pull-down
- LLFloaterReg::showInstance("volume_pulldown");
+ gStatusBar->mPanelVolumePulldown->setVisible(TRUE);
}
static void onClickVolume(void* data)
diff --git a/indra/newview/llstatusbar.h b/indra/newview/llstatusbar.h
index f77cc1acb863f592a616bee261dfcbfdf946756b..0e98da0fe45ba52e304bbfd2eba3b8e4662db8d5 100644
--- a/indra/newview/llstatusbar.h
+++ b/indra/newview/llstatusbar.h
@@ -112,7 +112,7 @@ class LLStatusBar
S32 mSquareMetersCommitted;
LLFrameTimer* mBalanceTimer;
LLFrameTimer* mHealthTimer;
-
+ LLPanelVolumePulldown* mPanelVolumePulldown;
static std::vector<std::string> sDays;
static std::vector<std::string> sMonths;
static const U32 MAX_DATE_STRING_LENGTH;
diff --git a/indra/newview/llviewerdisplay.cpp b/indra/newview/llviewerdisplay.cpp
index 3dac0ee452db03d12504c1ccafd8cb7ffbef0791..4d559e2ca7e724868a561a8e91cb377b51041854 100644
--- a/indra/newview/llviewerdisplay.cpp
+++ b/indra/newview/llviewerdisplay.cpp
@@ -1011,7 +1011,7 @@ void render_hud_attachments()
LLRect get_whole_screen_region()
{
- LLRect whole_screen = gViewerWindow->getWindowRectScaled();
+ LLRect whole_screen = gViewerWindow->getWorldViewRectScaled();
// apply camera zoom transform (for high res screenshots)
F32 zoom_factor = LLViewerCamera::getInstance()->getZoomFactor();
@@ -1019,13 +1019,13 @@ LLRect get_whole_screen_region()
if (zoom_factor > 1.f)
{
S32 num_horizontal_tiles = llceil(zoom_factor);
- S32 tile_width = llround((F32)gViewerWindow->getWindowWidthScaled() / zoom_factor);
- S32 tile_height = llround((F32)gViewerWindow->getWindowHeightScaled() / zoom_factor);
+ S32 tile_width = llround((F32)gViewerWindow->getWorldViewWidthScaled() / zoom_factor);
+ S32 tile_height = llround((F32)gViewerWindow->getWorldViewHeightScaled() / zoom_factor);
int tile_y = sub_region / num_horizontal_tiles;
int tile_x = sub_region - (tile_y * num_horizontal_tiles);
glh::matrix4f mat;
- whole_screen.setLeftTopAndSize(tile_x * tile_width, gViewerWindow->getWindowHeightScaled() - (tile_y * tile_height), tile_width, tile_height);
+ whole_screen.setLeftTopAndSize(tile_x * tile_width, gViewerWindow->getWorldViewHeightScaled() - (tile_y * tile_height), tile_width, tile_height);
}
return whole_screen;
}
@@ -1045,12 +1045,12 @@ bool get_hud_matrices(const LLRect& screen_region, glh::matrix4f &proj, glh::mat
F32 aspect_ratio = LLViewerCamera::getInstance()->getAspect();
glh::matrix4f mat;
- F32 scale_x = (F32)gViewerWindow->getWindowWidthScaled() / (F32)screen_region.getWidth();
- F32 scale_y = (F32)gViewerWindow->getWindowHeightScaled() / (F32)screen_region.getHeight();
+ F32 scale_x = (F32)gViewerWindow->getWorldViewWidthScaled() / (F32)screen_region.getWidth();
+ F32 scale_y = (F32)gViewerWindow->getWorldViewHeightScaled() / (F32)screen_region.getHeight();
mat.set_scale(glh::vec3f(scale_x, scale_y, 1.f));
mat.set_translate(
- glh::vec3f(clamp_rescale((F32)screen_region.getCenterX(), 0.f, (F32)gViewerWindow->getWindowWidthScaled(), 0.5f * scale_x * aspect_ratio, -0.5f * scale_x * aspect_ratio),
- clamp_rescale((F32)screen_region.getCenterY(), 0.f, (F32)gViewerWindow->getWindowHeightScaled(), 0.5f * scale_y, -0.5f * scale_y),
+ glh::vec3f(clamp_rescale((F32)screen_region.getCenterX(), 0.f, (F32)gViewerWindow->getWorldViewWidthScaled(), 0.5f * scale_x * aspect_ratio, -0.5f * scale_x * aspect_ratio),
+ clamp_rescale((F32)screen_region.getCenterY(), 0.f, (F32)gViewerWindow->getWorldViewHeightScaled(), 0.5f * scale_y, -0.5f * scale_y),
0.f));
proj *= mat;
@@ -1300,8 +1300,8 @@ void render_ui_2d()
if (gAgent.getAvatarObject() && gAgent.mHUDCurZoom < 0.98f)
{
glPushMatrix();
- S32 half_width = (gViewerWindow->getWindowWidthScaled() / 2);
- S32 half_height = (gViewerWindow->getWindowHeightScaled() / 2);
+ S32 half_width = (gViewerWindow->getWorldViewWidthScaled() / 2);
+ S32 half_height = (gViewerWindow->getWorldViewHeightScaled() / 2);
glScalef(LLUI::sGLScaleFactor.mV[0], LLUI::sGLScaleFactor.mV[1], 1.f);
glTranslatef((F32)half_width, (F32)half_height, 0.f);
F32 zoom = gAgent.mHUDCurZoom;
diff --git a/indra/newview/llviewerfloaterreg.cpp b/indra/newview/llviewerfloaterreg.cpp
index 256bf38a418f51d64921c1245a04300dc9484811..e81115c8ab67cadd089e49a3e31f624b63f4c45a 100644
--- a/indra/newview/llviewerfloaterreg.cpp
+++ b/indra/newview/llviewerfloaterreg.cpp
@@ -106,7 +106,6 @@
#include "llfloateruipreview.h"
#include "llfloaterurldisplay.h"
#include "llfloatervoicedevicesettings.h"
-#include "llfloatervolumepulldown.h"
#include "llfloaterwater.h"
#include "llfloaterwhitelistentry.h"
#include "llfloaterwindlight.h"
@@ -258,7 +257,6 @@ void LLViewerFloaterReg::registerFloaters()
LLFloaterReg::add("upload_image", "floater_image_preview.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterImagePreview>, "upload");
LLFloaterReg::add("upload_sound", "floater_sound_preview.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterSoundPreview>, "upload");
- LLFloaterReg::add("volume_pulldown", "floater_volume_pulldown.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterVolumePulldown>);
LLFloaterReg::add("voice_controls", "floater_voice_controls.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLCallFloater>);
LLFloaterReg::add("whitelist_entry", "floater_whitelist_entry.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterWhiteListEntry>);
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp
index 83cbc8a1f919ab11ba4b73f8128e0126edbe4985..ddaf4a221c940fc59d5ddca3035a9f251d88b875 100644
--- a/indra/newview/llviewerwindow.cpp
+++ b/indra/newview/llviewerwindow.cpp
@@ -604,7 +604,6 @@ BOOL LLViewerWindow::handleAnyMouseClick(LLWindow *window, LLCoordGL pos, MASK
{
const char* buttonname = "";
const char* buttonstatestr = "";
- BOOL handled = FALSE;
S32 x = pos.mX;
S32 y = pos.mY;
x = llround((F32)x / mDisplayScale.mV[VX]);
@@ -699,7 +698,10 @@ BOOL LLViewerWindow::handleAnyMouseClick(LLWindow *window, LLCoordGL pos, MASK
}
else
{
- handled = top_ctrl->pointInView(local_x, local_y) && top_ctrl->handleMouseUp(local_x, local_y, mask);
+ if (top_ctrl->pointInView(local_x, local_y) && top_ctrl->handleMouseUp(local_x, local_y, mask))
+ {
+ return TRUE;
+ }
}
}
@@ -717,34 +719,12 @@ BOOL LLViewerWindow::handleAnyMouseClick(LLWindow *window, LLCoordGL pos, MASK
llinfos << buttonname << " Mouse " << buttonstatestr << " not handled by view" << llendl;
}
- if (down)
+ // Do not allow tool manager to handle mouseclicks if we have disconnected
+ if(!gDisconnected && LLToolMgr::getInstance()->getCurrentTool()->handleAnyMouseClick( x, y, mask, clicktype, down ) )
{
- if (gDisconnected)
- {
- return FALSE;
- }
-
- if(LLToolMgr::getInstance()->getCurrentTool()->handleAnyMouseClick( x, y, mask, clicktype, down ) )
- {
- return TRUE;
- }
+ return TRUE;
}
- else
- {
- if( !handled )
- {
- handled = mRootView->handleAnyMouseClick(x, y, mask, clicktype, down);
- }
- if( !handled )
- {
- LLTool *tool = LLToolMgr::getInstance()->getCurrentTool();
- if (tool)
- {
- handled = tool->handleAnyMouseClick(x, y, mask, clicktype, down);
- }
- }
- }
// If we got this far on a down-click, it wasn't handled.
// Up-clicks, though, are always handled as far as the OS is concerned.
diff --git a/indra/newview/skins/default/textures/bottomtray/Unread_Chiclet.png b/indra/newview/skins/default/textures/bottomtray/Unread_Chiclet.png
index 447e0af0be61761287ef55d611d7e96428174a53..6343ddf035a738440af60dbc13317f33587e39db 100644
Binary files a/indra/newview/skins/default/textures/bottomtray/Unread_Chiclet.png and b/indra/newview/skins/default/textures/bottomtray/Unread_Chiclet.png differ
diff --git a/indra/newview/skins/default/textures/bottomtray/WellButton_Lit.png b/indra/newview/skins/default/textures/bottomtray/WellButton_Lit.png
index dd9133bcc463fe3303ae364bdd381ae3132f66a0..661d1c5611030be801d620730b1979c79e474a09 100644
Binary files a/indra/newview/skins/default/textures/bottomtray/WellButton_Lit.png and b/indra/newview/skins/default/textures/bottomtray/WellButton_Lit.png differ
diff --git a/indra/newview/skins/default/textures/bottomtray/WellButton_Lit_Selected.png b/indra/newview/skins/default/textures/bottomtray/WellButton_Lit_Selected.png
index 0080e71f4191729d2902dc07d49329c185833100..f927fd3989b32ab663cdc45f238f1158ee2b0638 100644
Binary files a/indra/newview/skins/default/textures/bottomtray/WellButton_Lit_Selected.png and b/indra/newview/skins/default/textures/bottomtray/WellButton_Lit_Selected.png differ
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index ed6aa1f6707772247ab1c14b7679c32439812ba7..2d519858dbf61c0f8c0c7f2d283694585af93ca5 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -224,7 +224,7 @@ with the same filename but different name
scale.left="4" scale.top="28" scale.right="60" scale.bottom="4" />
<texture name="Inspector_Hover" file_name="windows/Inspector_Hover.png" preload="false" />
<texture name="Inspector_I" file_name="windows/Inspector_I.png" preload="false" />
-
+
<texture name="Inv_Acessories" file_name="icons/Inv_Accessories.png" preload="false" />
<texture name="Inv_Alpha" file_name="icons/Inv_Alpha.png" preload="false" />
<texture name="Inv_Animation" file_name="icons/Inv_Animation.png" preload="false" />
@@ -649,6 +649,12 @@ with the same filename but different name
<texture name="PowerOff_Over" file_name="icons/PowerOff_Over.png" preload="false" />
<texture name="PowerOff_Press" file_name="icons/PowerOff_Press.png" preload="false" />
+ <texture name="pixiesmall.j2c" use_mips="true" />
+ <texture name="script_error.j2c" use_mips="true" />
+ <texture name="silhouette.j2c" use_mips="true" />
+ <texture name="foot_shadow.j2c" use_mips="true" />
+ <texture name="cloud-particle.j2c" use_mips="true" />
+
<!--WARNING OLD ART BELOW *do not use*-->
<texture name="icn_chatbar.tga" />
<texture name="icn_media_web.tga" preload="true" />
@@ -677,8 +683,6 @@ with the same filename but different name
<texture name="toggle_button_off" file_name="toggle_button_off.png" preload="true" />
<texture name="toggle_button_selected" file_name="toggle_button_selected.png" preload="true" />
-
- <texture name="sm_rounded_corners_simple.tga" scale.left="4" scale.top="4" scale.bottom="4" scale.right="4" />
<texture name="color_swatch_alpha.tga" preload="true" />
<texture name="button_anim_pause.tga" />
@@ -697,7 +701,6 @@ with the same filename but different name
<texture name="icon_event_mature.tga" />
<texture name="icon_for_sale.tga" />
<texture name="icon_place_for_sale.tga" />
- <texture name="icon_popular.tga" />
<texture name="icon_top_pick.tga" />
<texture name="lag_status_critical.tga" />
@@ -716,27 +719,10 @@ with the same filename but different name
<texture name="map_telehub.tga" />
<texture name="map_track_16.tga" />
- <texture name="media_icon.tga" file_name="icn_label_media.tga" />
- <texture name="music_icon.tga" file_name="icn_label_music.tga" />
-
- <texture name="notify_tip_icon.tga" />
<texture name="notify_caution_icon.tga" />
<texture name="notify_next.png" preload="true" />
<texture name="notify_box_icon.tga" />
- <texture name="pixiesmall.j2c" use_mips="true" />
- <texture name="script_error.j2c" use_mips="true" />
- <texture name="silhouette.j2c" use_mips="true" />
- <texture name="foot_shadow.j2c" use_mips="true" />
- <texture name="cloud-particle.j2c" use_mips="true" />
-
- <texture name="status_no_build.tga" />
- <texture name="status_voice.tga" />
- <texture name="status_no_fly.tga" />
- <texture name="status_health.tga" />
- <texture name="status_no_push.tga" />
- <texture name="status_no_scripts.tga" />
-
<texture name="icn_active-speakers-dot-lvl0.tga" />
<texture name="icn_active-speakers-dot-lvl1.tga" />
<texture name="icn_active-speakers-dot-lvl2.tga" />
diff --git a/indra/newview/skins/default/xui/en/floater_about.xml b/indra/newview/skins/default/xui/en/floater_about.xml
index fac7aef690dbb5b037cca946b90b44f0994e4a3d..b6443c4c21cc0dd58a2b76483f104215e2259d96 100644
--- a/indra/newview/skins/default/xui/en/floater_about.xml
+++ b/indra/newview/skins/default/xui/en/floater_about.xml
@@ -112,7 +112,7 @@ Packets Lost: [PACKETS_LOST,number,0]/[PACKETS_IN,number,0] ([PACKETS_PCT,number
word_wrap="true">
Second Life is brought to you by Philip, Tessa, Andrew, Cory, James, Ben, Char, Charlie, Colin, Dan, Daniel, Doug, Eric, Hamlet, Haney, Eve, Hunter, Ian, Jeff, Jennifer, Jim, John, Lee, Mark, Peter, Phoenix, Richard, Robin, Xenon, Steve, Tanya, Eddie, Avi, Frank, Bruce, Aaron, Alice, Bob, Debra, Eileen, Helen, Janet, Louie, Leviathania, Stefan, Ray, Kevin, Tom, Mikeb, MikeT, Burgess, Elena, Tracy, Bill, Todd, Ryan, Zach, Sarah, Nova, Tim, Stephanie, Michael, Evan, Nicolas, Catherine, Rachelle, Dave, Holly, Bub, Kelly, Magellan, Ramzi, Don, Sabin, Jill, Rheya, Jeska, Torley, Kona, Callum, Charity, Ventrella, Jack, Vektor, Iris, Chris, Nicole, Mick, Reuben, Blue, Babbage, Yedwab, Deana, Lauren, Brent, Pathfinder, Chadrick, Altruima, Jesse, Teeny, Monroe, Icculus, David, Tess, Lizzie, Patsy, Isaac, Lawrence, Cyn, Bo, Gia, Annette, Marius, Tbone, Jonathan, Karen, Ginsu, Satoko, Yuko, Makiko, Thomas, Harry, Seth, Alexei, Brian, Guy, Runitai, Ethan, Data, Cornelius, Kenny, Swiss, Zero, Natria, Wendy, Stephen, Teeple, Thumper, Lucy, Dee, Mia, Liana, Warren, Branka, Aura, beez, Milo, Hermia, Red, Thrax, Joe, Sally, Magenta, Mogura, Paul, Jose, Rejean, Henrik, Lexie, Amber, Logan, Xan, Nora, Morpheus, Donovan, Leyla, MichaelFrancis, Beast, Cube, Bucky, Joshua, Stryfe, Harmony, Teresa, Claudia, Walker, Glenn, Fritz, Fordak, June, Cleopetra, Jean, Ivy, Betsy, Roosevelt, Spike, Ken, Which, Tofu, Chiyo, Rob, Zee, dustin, George, Del, Matthew, Cat, Jacqui, Lightfoot, Adrian, Viola, Alfred, Noel, Irfan, Sunil, Yool, Rika, Jane, Xtreme, Frontier, a2, Neo, Siobhan, Yoz, Justin, Elle, Qarl, Benjamin, Isabel, Gulliver, Everett, Christopher, Izzy, Stephany, Garry, Sejong, Sean, Tobin, Iridium, Meta, Anthony, Jeremy, JP, Jake, Maurice, Madhavi, Leopard, Kyle, Joon, Kari, Bert, Belinda, Jon, Kristi, Bridie, Pramod, KJ, Socrates, Maria, Ivan, Aric, Yamasaki, Adreanne, Jay, MitchK, Ceren, Coco, Durl, Jenny, Periapse, Kartic, Storrs, Lotte, Sandy, Rohn, Colossus, Zen, BigPapi, Brad, Pastrami, Kurz, Mani, Neuro, Jaime, MJ, Rowan, Sgt, Elvis, Gecko, Samuel, Sardonyx, Leo, Bryan, Niko, Soft, Poppy, Rachel, Aki, Angelo, Banzai, Alexa, Sue, CeeLo, Bender, CG, Gillian, Pelle, Nick, Echo, Zara, Christine, Shamiran, Emma, Blake, Keiko, Plexus, Joppa, Sidewinder, Erica, Ashlei, Twilight, Kristen, Brett, Q, Enus, Simon, Bevis, Kraft, Kip, Chandler, Ron, LauraP, Ram, KyleJM, Scouse, Prospero, Melissa, Marty, Nat, Hamilton, Kend, Lordan, Jimmy, Kosmo, Seraph, Green, Ekim, Wiggo, JT, Rome, Doris, Miz, Benoc, Whump, Trinity, Patch, Kate, TJ, Bao, Joohwan, Christy, Sofia, Matias, Cogsworth, Johan, Oreh, Cheah, Angela, Brandy, Mango, Lan, Aleks, Gloria, Heidy, Mitchell, Space, Colton, Bambers, Einstein, Maggie, Malbers, Rose, Winnie, Stella, Milton, Rothman, Niall, Marin, Allison, Katie, Dawn, Katt, Dusty, Kalpana, Judy, Andrea, Ambroff, Infinity, Gail, Rico, Raymond, Yi, William, Christa, M, Teagan, Scout, Molly, Dante, Corr, Dynamike, Usi, Kaylee, Vidtuts, Lil, Danica, Sascha, Kelv, Jacob, Nya, Rodney, Brandon, Elsie, Blondin, Grant, Katrin, Nyx, Gabriel, Locklainn, Claire, Devin, Minerva, Monty, Austin, Bradford, Si, Keira, H, Caitlin, Dita, Makai, Jenn, Ann, Meredith, Clare, Joy, Praveen, Cody, Edmund, Ruthe, Sirena, Gayathri, Spider, FJ, Davidoff, Tian, Jennie, Louise, Oskar, Landon, Noelle, Jarv, Ingrid, Al, Sommer, Doc, Aria, Huin, Gray, Lili, Vir, DJ, Yang, T, Simone, Maestro, Scott, Charlene, Quixote, Amanda, Susan, Zed, Anne, Enkidu, Esbee, Joroan, Katelin, Roxie, Tay, Scarlet, Kevin, Johnny, Wolfgang, Andren, Bob, Howard, Merov, Rand, Ray, Michon, Newell, Galen, Dessie, Les and many others.
-Thank you to the following residents for helping to ensure that this is the best version yet: (in progress)
+Thank you to the following Residents for helping to ensure that this is the best version yet: (in progress)
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 33fdd923ad2f97ac73d359a1b067f882c218bfa7..900f4c5956a91b82d1131bfb660365031f26c425 100644
--- a/indra/newview/skins/default/xui/en/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/en/floater_about_land.xml
@@ -1036,7 +1036,7 @@ Leyla Linden </text>
name="Autoreturn"
top="164"
width="294">
- Autoreturn other residents' objects (minutes, 0 for off):
+ Autoreturn other Residents' objects (minutes, 0 for off):
</text>
<line_editor
border_style="line"
@@ -1175,7 +1175,7 @@ Only large parcels can be listed in search.
name="allow_label"
top="10"
width="278">
- Allow other residents to:
+ Allow other Residents to:
</text>
<check_box
height="16"
@@ -1917,7 +1917,7 @@ Only large parcels can be listed in search.
layout="topleft"
left_delta="0"
name="limit_payment"
- tool_tip="Ban unidentified residents."
+ tool_tip="Ban unidentified Residents."
top_pad="4"
width="278" />
<check_box
@@ -1927,7 +1927,7 @@ Only large parcels can be listed in search.
layout="topleft"
left_delta="0"
name="limit_age_verified"
- tool_tip="Ban residents who have not verified their age. See the [SUPPORT_SITE] for more information."
+ tool_tip="Ban Residents who have not verified their age. See the [SUPPORT_SITE] for more information."
top_pad="4"
width="278" />
<check_box
diff --git a/indra/newview/skins/default/xui/en/floater_buy_currency.xml b/indra/newview/skins/default/xui/en/floater_buy_currency.xml
index 86229c6691f0bb7c0c6385af5f0bcdb080d3c3ce..d202bf1b9f1180ffaf6cad7442a117f606f38233 100644
--- a/indra/newview/skins/default/xui/en/floater_buy_currency.xml
+++ b/indra/newview/skins/default/xui/en/floater_buy_currency.xml
@@ -107,7 +107,7 @@
height="16"
layout="topleft"
top_delta="0"
- left="242"
+ left="217"
name="currency_label"
width="15">
L$
@@ -123,7 +123,7 @@
label="L$"
left_pad="3"
name="currency_amt"
- width="60">
+ width="85">
1234
</line_editor>
<text
diff --git a/indra/newview/skins/default/xui/en/floater_customize.xml b/indra/newview/skins/default/xui/en/floater_customize.xml
index 0dc7d62b19ff470add3b3d2f0a0c51321514ede0..ddc0d9af729777afdebc1a39c6030869a7ad8c46 100644
--- a/indra/newview/skins/default/xui/en/floater_customize.xml
+++ b/indra/newview/skins/default/xui/en/floater_customize.xml
@@ -260,10 +260,9 @@
left="10"
name="not worn instructions"
top="31"
+ word_wrap="true"
width="373">
- Put on a new shape by dragging one from your inventory
-to your avatar. Alternately, you create a new one from
-scratch and wear it.
+ Put on a new shape by dragging one from your inventory to your avatar. Alternately, you create a new one from scratch and wear it.
</text>
<text
type="string"
@@ -274,6 +273,7 @@ scratch and wear it.
left_delta="0"
name="no modify instructions"
top_delta="0"
+ word_wrap="true"
width="373">
You do not have permission to modify this wearable.
</text>
@@ -300,7 +300,7 @@ scratch and wear it.
left="10"
name="Create New"
top="104"
- width="140" />
+ width="160" />
<button
follows="right|bottom"
height="23"
@@ -463,10 +463,9 @@ scratch and wear it.
left="10"
name="not worn instructions"
top="31"
+ word_wrap="true"
width="373">
- Put on a new skin by dragging one from your inventory
-to your avatar. Alternately, you create a new one from
-scratch and wear it.
+ Put on a new skin by dragging one from your inventory to your avatar. Alternately, you create a new one from scratch and wear it.
</text>
<text
type="string"
@@ -477,6 +476,7 @@ scratch and wear it.
left_delta="0"
name="no modify instructions"
top_delta="0"
+ word_wrap="true"
width="373">
You do not have permission to modify this wearable.
</text>
@@ -542,7 +542,7 @@ scratch and wear it.
left_delta="0"
name="Create New"
top_delta="-249"
- width="120" />
+ width="160" />
<button
follows="right|bottom"
height="23"
@@ -713,10 +713,9 @@ scratch and wear it.
left="10"
name="not worn instructions"
top="31"
+ word_wrap="true"
width="373">
- Put on a new hair by dragging one from your inventory
-to your avatar. Alternately, you create a new one from
-scratch and wear it.
+ Put on a new hair by dragging one from your inventory to your avatar. Alternately, you create a new one from scratch and wear it.
</text>
<text
type="string"
@@ -727,6 +726,7 @@ scratch and wear it.
left_delta="0"
name="no modify instructions"
top_delta="0"
+ word_wrap="true"
width="373">
You do not have permission to modify this wearable.
</text>
@@ -765,7 +765,7 @@ scratch and wear it.
left_delta="0"
name="Create New"
top_delta="-89"
- width="120" />
+ width="160" />
<button
follows="right|bottom"
height="23"
@@ -898,10 +898,9 @@ scratch and wear it.
left_delta="0"
name="not worn instructions"
top_pad="8"
+ word_wrap="true"
width="373">
- Put on a new eyes by dragging one from your inventory
-to your avatar. Alternately, you create a new one from
-scratch and wear it.
+ Put on a new set of eyes by dragging one from your inventory to your avatar. Alternately, you create a new one from scratch and wear it.
</text>
<text
type="string"
@@ -912,6 +911,7 @@ scratch and wear it.
left_delta="0"
name="no modify instructions"
top_delta="0"
+ word_wrap="true"
width="373">
You do not have permission to modify this wearable.
</text>
@@ -950,7 +950,7 @@ scratch and wear it.
left_delta="0"
name="Create New"
top_delta="39"
- width="120" />
+ width="160" />
<button
follows="right|bottom"
height="23"
@@ -1056,7 +1056,7 @@ scratch and wear it.
left_delta="0"
name="Create New"
top_delta="-41"
- width="120" />
+ width="160" />
<button
follows="left|top"
height="23"
@@ -1170,10 +1170,9 @@ scratch and wear it.
left_delta="0"
name="not worn instructions"
top_pad="8"
+ word_wrap="true"
width="373">
- Put on a new shirt by dragging one from your inventory
-to your avatar. Alternately, you create a new one from
-scratch and wear it.
+ Put on a new shirt by dragging one from your inventory to your avatar. Alternately, you create a new one from scratch and wear it.
</text>
<text
type="string"
@@ -1184,6 +1183,7 @@ scratch and wear it.
left_delta="0"
name="no modify instructions"
top_delta="0"
+ word_wrap="true"
width="373">
You do not have permission to modify this wearable.
</text>
@@ -1262,7 +1262,7 @@ scratch and wear it.
left_delta="0"
name="Create New"
top_delta="-41"
- width="120" />
+ width="160" />
<button
follows="left|top"
height="23"
@@ -1376,10 +1376,9 @@ scratch and wear it.
left_delta="0"
name="not worn instructions"
top_pad="8"
+ word_wrap="true"
width="373">
- Put on a new pants by dragging one from your inventory
-to your avatar. Alternately, you create a new one from
-scratch and wear it.
+ Put on new pants by dragging one from your inventory to your avatar. Alternately, you create a new one from scratch and wear it.
</text>
<text
type="string"
@@ -1390,6 +1389,7 @@ scratch and wear it.
left_delta="0"
name="no modify instructions"
top_delta="0"
+ word_wrap="true"
width="373">
You do not have permission to modify this wearable.
</text>
@@ -1509,10 +1509,9 @@ scratch and wear it.
left_delta="0"
name="not worn instructions"
top_pad="8"
+ word_wrap="true"
width="373">
- Put on a new shoes by dragging one from your inventory
-to your avatar. Alternately, you create a new one from
-scratch and wear it.
+ Put on a new pair of shoes by dragging one from your inventory to your avatar. Alternately, you create a new one from scratch and wear it.
</text>
<text
type="string"
@@ -1523,6 +1522,7 @@ scratch and wear it.
left_delta="0"
name="no modify instructions"
top_delta="0"
+ word_wrap="true"
width="373">
You do not have permission to modify this wearable.
</text>
@@ -1572,7 +1572,7 @@ scratch and wear it.
left_delta="0"
name="Create New"
top_delta="-41"
- width="120" />
+ width="160" />
<button
follows="left|top"
height="23"
@@ -1715,10 +1715,9 @@ scratch and wear it.
left_delta="0"
name="not worn instructions"
top_pad="8"
+ word_wrap="true"
width="373">
- Put on a new socks by dragging one from your inventory
-to your avatar. Alternately, you create a new one from
-scratch and wear it.
+ Put on new socks by dragging one from your inventory to your avatar. Alternately, you create a new one from scratch and wear it.
</text>
<text
type="string"
@@ -1729,6 +1728,7 @@ scratch and wear it.
left_delta="0"
name="no modify instructions"
top_delta="0"
+ word_wrap="true"
width="373">
You do not have permission to modify this wearable.
</text>
@@ -1778,7 +1778,7 @@ scratch and wear it.
left_delta="0"
name="Create New"
top_delta="-41"
- width="120" />
+ width="160" />
<button
follows="left|top"
height="23"
@@ -1921,10 +1921,9 @@ scratch and wear it.
left_delta="0"
name="not worn instructions"
top_pad="8"
+ word_wrap="true"
width="373">
- Put on a new jacket by dragging one from your inventory
-to your avatar. Alternately, you create a new one from
-scratch and wear it.
+ Put on a new jacket by dragging one from your inventory to your avatar. Alternately, you create a new one from scratch and wear it.
</text>
<text
type="string"
@@ -1935,6 +1934,7 @@ scratch and wear it.
left_delta="0"
name="no modify instructions"
top_delta="0"
+ word_wrap="true"
width="373">
You do not have permission to modify this wearable.
</text>
@@ -1996,7 +1996,7 @@ scratch and wear it.
left_delta="0"
name="Create New"
top_delta="-121"
- width="140" />
+ width="160" />
<button
follows="left|top"
height="23"
@@ -2139,10 +2139,9 @@ scratch and wear it.
left_delta="0"
name="not worn instructions"
top_pad="8"
+ word_wrap="true"
width="373">
- Put on a new gloves by dragging one from your inventory
-to your avatar. Alternately, you create a new one from
-scratch and wear it.
+ Put on new gloves by dragging one from your inventory to your avatar. Alternately, you create a new one from scratch and wear it.
</text>
<text
type="string"
@@ -2153,6 +2152,7 @@ scratch and wear it.
left_delta="0"
name="no modify instructions"
top_delta="0"
+ word_wrap="true"
width="373">
You do not have permission to modify this wearable.
</text>
@@ -2202,7 +2202,7 @@ scratch and wear it.
left_delta="0"
name="Create New"
top_delta="-41"
- width="130" />
+ width="160" />
<button
follows="left|top"
height="23"
@@ -2345,10 +2345,9 @@ scratch and wear it.
left_delta="0"
name="not worn instructions"
top_pad="8"
+ word_wrap="true"
width="373">
- Put on a new undershirt by dragging one from your inventory
-to your avatar. Alternately, you create a new one from
-scratch and wear it.
+ Put on a new undershirt by dragging one from your inventory to your avatar. Alternately, you create a new one from scratch and wear it.
</text>
<text
type="string"
@@ -2359,6 +2358,7 @@ scratch and wear it.
left_delta="0"
name="no modify instructions"
top_delta="0"
+ word_wrap="true"
width="373">
You do not have permission to modify this wearable.
</text>
@@ -2551,10 +2551,9 @@ scratch and wear it.
left_delta="0"
name="not worn instructions"
top_pad="8"
+ word_wrap="true"
width="373">
- Put on a new underpants by dragging one from your inventory
-to your avatar. Alternately, you create a new one from
-scratch and wear it.
+ Put on new underpants by dragging one from your inventory to your avatar. Alternately, you create a new one from scratch and wear it.
</text>
<text
type="string"
@@ -2565,6 +2564,7 @@ scratch and wear it.
left_delta="0"
name="no modify instructions"
top_delta="0"
+ word_wrap="true"
width="373">
You do not have permission to modify this wearable.
</text>
@@ -2757,10 +2757,9 @@ scratch and wear it.
left_delta="0"
name="not worn instructions"
top_pad="8"
+ word_wrap="true"
width="373">
- Put on a new skirt by dragging one from your inventory
-to your avatar. Alternately, you create a new one from
-scratch and wear it.
+ Put on a new skirt by dragging one from your inventory to your avatar. Alternately, you create a new one from scratch and wear it.
</text>
<text
type="string"
@@ -2771,6 +2770,7 @@ scratch and wear it.
left_delta="0"
name="no modify instructions"
top_delta="0"
+ word_wrap="true"
width="373">
You do not have permission to modify this wearable.
</text>
@@ -2820,7 +2820,7 @@ scratch and wear it.
left_delta="0"
name="Create New"
top_delta="-41"
- width="120" />
+ width="160" />
<button
follows="left|top"
height="23"
@@ -2962,11 +2962,10 @@ scratch and wear it.
layout="topleft"
left_delta="-2"
name="not worn instructions"
- top_delta="2"
+ top_pad="8"
+ word_wrap="true"
width="373">
- Put on a new alpha mask by dragging one from your inventory
-to your avatar. Alternately, you create a new one from
-scratch and wear it.
+ Put on a new alpha mask by dragging one from your inventory to your avatar. Alternately, you create a new one from scratch and wear it.
</text>
<text
type="string"
@@ -2977,6 +2976,7 @@ scratch and wear it.
left_delta="0"
name="no modify instructions"
top_delta="0"
+ word_wrap="true"
width="373">
You do not have permission to modify this wearable.
</text>
@@ -3108,7 +3108,7 @@ scratch and wear it.
left="8"
name="Create New"
top="104"
- width="120" />
+ width="160" />
<button
follows="left|top"
height="23"
@@ -3250,11 +3250,10 @@ scratch and wear it.
layout="topleft"
left_delta="-2"
name="not worn instructions"
- top_delta="2"
+ top_pad="8"
+ word_wrap="true"
width="373">
- Put on a new tattoo by dragging one from your inventory
-to your avatar. Alternately, you create a new one from
-scratch and wear it.
+ Put on a new tattoo by dragging one from your inventory to your avatar. Alternately, you create a new one from scratch and wear it.
</text>
<text
type="string"
@@ -3265,6 +3264,7 @@ scratch and wear it.
left_delta="0"
name="no modify instructions"
top_delta="0"
+ word_wrap="true"
width="373">
You do not have permission to modify this wearable.
</text>
@@ -3327,7 +3327,7 @@ scratch and wear it.
left_delta="0"
name="Create New"
top_delta="-121"
- width="120" />
+ width="160" />
<button
follows="left|top"
height="23"
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 b01c0edc8bc223777fe750c6fc05790c1566bfe1..0fac6cd5f17ec01626c53b5c4145dd2fa5accf6d 100644
--- a/indra/newview/skins/default/xui/en/floater_god_tools.xml
+++ b/indra/newview/skins/default/xui/en/floater_god_tools.xml
@@ -123,7 +123,7 @@
layout="topleft"
left_delta="0"
name="check reset home"
- tool_tip="When resident teleports out, reset their home to the destination position."
+ tool_tip="When Resident teleports out, reset their home to the destination position."
top_pad="4"
width="180">
<check_box.commit_callback
diff --git a/indra/newview/skins/default/xui/en/floater_im.xml b/indra/newview/skins/default/xui/en/floater_im.xml
index 92a611175981dab7a66b5d291067330aba897db9..a21242ffe171cb819bbee4d1cea5c28a5d16570e 100644
--- a/indra/newview/skins/default/xui/en/floater_im.xml
+++ b/indra/newview/skins/default/xui/en/floater_im.xml
@@ -26,7 +26,7 @@
</multi_floater.string>
<multi_floater.string
name="muted_message">
- You have blocked this resident. Sending a message will automatically unblock them.
+ You have blocked this Resident. Sending a message will automatically unblock them.
</multi_floater.string>
<multi_floater.string
name="generic_request_error">
diff --git a/indra/newview/skins/default/xui/en/floater_nearby_chat.xml b/indra/newview/skins/default/xui/en/floater_nearby_chat.xml
index 920f0c909a7183c5df2cc0b4ebad92cb7bad1071..ae686d9ab7a4dd2da76f31907bbde1ad1adeb520 100644
--- a/indra/newview/skins/default/xui/en/floater_nearby_chat.xml
+++ b/indra/newview/skins/default/xui/en/floater_nearby_chat.xml
@@ -4,8 +4,8 @@
border_drop_shadow_visible="false"
drop_shadow_visible="false"
border="false"
- bg_opaque_image="Inspector_Background"
- bg_alpha_image="Toast_Background"
+ bg_opaque_image="Window_Foreground"
+ bg_alpha_image="Window_Background"
bg_alpha_color="0 0 0 0"
legacy_header_height="18"
can_minimize="true"
diff --git a/indra/newview/skins/default/xui/en/floater_report_abuse.xml b/indra/newview/skins/default/xui/en/floater_report_abuse.xml
index f1a75bfcb4de4bc97def8091806caf50a076ed3f..aa219b961521ebe3d98b30e397206b2e7421ac50 100644
--- a/indra/newview/skins/default/xui/en/floater_report_abuse.xml
+++ b/indra/newview/skins/default/xui/en/floater_report_abuse.xml
@@ -201,11 +201,11 @@
name="Age__Age_play"
value="31" />
<combo_box.item
- label="Age > Adult resident on Teen Second Life"
+ label="Age > Adult Resident on Teen Second Life"
name="Age__Adult_resident_on_Teen_Second_Life"
value="32" />
<combo_box.item
- label="Age > Underage resident outside of Teen Second Life"
+ label="Age > Underage Resident outside of Teen Second Life"
name="Age__Underage_resident_outside_of_Teen_Second_Life"
value="33" />
<combo_box.item
diff --git a/indra/newview/skins/default/xui/en/floater_select_key.xml b/indra/newview/skins/default/xui/en/floater_select_key.xml
index 93aa1f0e31aabab87ecb54469f5bdfcbbd32e063..4e89df5a7352f7770c5058f564e03aa922a0061d 100644
--- a/indra/newview/skins/default/xui/en/floater_select_key.xml
+++ b/indra/newview/skins/default/xui/en/floater_select_key.xml
@@ -15,13 +15,12 @@
follows="left|top"
height="30"
layout="topleft"
- left="10"
+ left="30"
name="Save item as:"
top="25"
word_wrap="true"
- width="220">
- Press a key to set your
-Speak button trigger.
+ width="180">
+ Press a key to set your Speak button trigger.
</text>
<button
height="23"
@@ -30,5 +29,6 @@ Speak button trigger.
layout="topleft"
right="-10"
name="Cancel"
+ top_pad="8"
width="100" />
</floater>
diff --git a/indra/newview/skins/default/xui/en/floater_top_objects.xml b/indra/newview/skins/default/xui/en/floater_top_objects.xml
index 68bb500c7857d3c283e5f5dcb2a39f752bf7a813..b06c6dc215d8df54bdd32d5e34d1fa9ece279c40 100644
--- a/indra/newview/skins/default/xui/en/floater_top_objects.xml
+++ b/indra/newview/skins/default/xui/en/floater_top_objects.xml
@@ -9,7 +9,7 @@
name="top_objects"
help_topic="top_objects"
title="Top Objects"
- width="550">
+ width="800">
<floater.string
name="top_scripts_title">
Top Scripts
@@ -64,7 +64,7 @@
multi_select="true"
name="objects_list"
top_delta="17"
- width="530">
+ width="780">
<scroll_list.columns
label="Score"
name="score"
@@ -84,11 +84,15 @@
<scroll_list.columns
label="Time"
name="time"
- width="100" />
+ width="150" />
<scroll_list.columns
label="Mono Time"
name="mono_time"
- width="55" />
+ width="100" />
+ <scroll_list.columns
+ label="URLs"
+ name="URLs"
+ width="100" />
<scroll_list.commit_callback
function="TopObjects.CommitObjectsList" />
</scroll_list>
@@ -112,7 +116,7 @@
left_pad="3"
name="id_editor"
top_delta="-3"
- width="325" />
+ width="575" />
<button
follows="bottom|right"
height="23"
@@ -144,7 +148,7 @@
left_pad="3"
name="object_name_editor"
top_delta="-3"
- width="325" />
+ width="575" />
<button
follows="bottom|right"
height="23"
@@ -176,7 +180,7 @@
left_pad="3"
name="owner_name_editor"
top_delta="-3"
- width="325" />
+ width="575" />
<button
follows="bottom|right"
height="23"
@@ -190,7 +194,7 @@
function="TopObjects.GetByOwnerName" />
</button>
<button
- follows="top|left"
+ follows="bottom|right"
height="22"
image_overlay="Refresh_Off"
layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/floater_tos.xml b/indra/newview/skins/default/xui/en/floater_tos.xml
index 1adb824e2a6ad6ff4956db4b9167488a13221699..5e168fe4aa6f268f2eb024a869581aca81baf988 100644
--- a/indra/newview/skins/default/xui/en/floater_tos.xml
+++ b/indra/newview/skins/default/xui/en/floater_tos.xml
@@ -49,9 +49,9 @@
left_delta="0"
name="tos_heading"
top_delta="-399"
+ word_wrap="true"
width="552">
- Please read the following Terms of Service carefully. To continue logging in to [SECOND_LIFE],
-you must accept the agreement.
+ Please read the following Terms of Service carefully. To continue logging in to [SECOND_LIFE], you must accept the agreement.
</text>
<web_browser
follows="left|top"
@@ -60,6 +60,6 @@ you must accept the agreement.
left_delta="0"
name="tos_html"
start_url="data:text/html,%3Chtml%3E%3Chead%3E%3C/head%3E%3Cbody text=%22000000%22%3E%3Ch2%3E Loading %3Ca%20target%3D%22_external%22%20href%3D%22http%3A//secondlife.com/app/tos/%22%3ETerms%20of%20Service%3C/a%3E...%3C/h2%3E %3C/body%3E %3C/html%3E"
- top_delta="0"
+ top_delta="40"
width="568" />
</floater>
diff --git a/indra/newview/skins/default/xui/en/floater_voice_controls.xml b/indra/newview/skins/default/xui/en/floater_voice_controls.xml
index b9649e9c577bcdd42d31015d466fb1d63f073e3b..ae198d69a37f56a5cfa4ebb26d67aa2057a3a0ab 100644
--- a/indra/newview/skins/default/xui/en/floater_voice_controls.xml
+++ b/indra/newview/skins/default/xui/en/floater_voice_controls.xml
@@ -3,9 +3,9 @@
can_resize="true"
can_minimize="true"
can_close="false"
- height="270"
+ height="275"
layout="topleft"
- min_height="122"
+ min_height="100"
min_width="190"
name="floater_voice_controls"
help_topic="floater_voice_controls"
@@ -33,27 +33,23 @@
name="no_one_near">
No one near has voice enabled
</string>
- <string
- name="max_visible_items">
- 5
- </string>
- <panel
- bevel_style="out"
- border="true"
- follows="left|right|top"
- height="62"
- layout="topleft"
- left="0"
- name="control_panel"
- top="0"
- width="282">
- <panel
- height="18"
- follows="top|left|right"
+ <layout_stack
+ clip="false"
+ follows="all"
+ height="262"
layout="topleft"
left="10"
- name="my_panel"
+ mouse_opaque="false"
+ name="my_call_stack"
+ orientation="vertical"
width="263">
+ <layout_panel
+ follows="top|left|right"
+ user_resize="false"
+ auto_resize="false"
+ layout="topleft"
+ height="26"
+ name="my_panel">
<avatar_icon
enabled="false"
follows="left|top"
@@ -79,92 +75,57 @@
<output_monitor
auto_update="true"
draw_border="false"
- follows="right"
+ follows="top|right"
height="16"
layout="topleft"
name="speaking_indicator"
- right="-1"
- top="2"
+ left_pad="5"
visible="true"
width="20" />
- </panel>
- <layout_stack
- border_size="0"
- clip="false"
- follows="all"
- height="28"
- layout="topleft"
- left="10"
- mouse_opaque="false"
- name="leave_call_stack"
- orientation="horizontal"
- top_pad="5"
- width="263">
- <layout_panel
- auto_resize="true"
- follows="left|right"
- height="26"
- layout="topleft"
- min_height="23"
- min_width="5"
- mouse_opaque="false"
- name="left_anchor"
- width="80"/>
+ </layout_panel>
<layout_panel
auto_resize="false"
- follows="left|right"
+ user_resize="false"
+ follows="top|left"
height="26"
+ visible="true"
layout="topleft"
- mouse_opaque="false"
- min_height="24"
- min_width="100"
name="leave_call_btn_panel"
width="100">
<button
- follows="left|right"
- height="24"
+ follows="right|top"
+ height="23"
+ top_pad="0"
label="Leave Call"
- left="0"
name="leave_call_btn"
- top="0"
width="100" />
</layout_panel>
- <layout_panel
- auto_resize="true"
- follows="left|right"
- height="26"
+ <layout_panel
+ follows="all"
+ layout="topleft"
+ left="2"
+ top_pad="0"
+ height="205"
+ name="callers_panel"
+ user_resize="false"
+ width="280">
+ <avatar_list
+ follows="all"
+ height="205"
+ ignore_online_status="true"
layout="topleft"
- mouse_opaque="false"
- min_height="24"
- min_width="5"
- name="right_anchor"
- width="80"/>
- </layout_stack>
- </panel>
- <avatar_list
- follows="all"
- height="197"
- ignore_online_status="true"
- layout="topleft"
- left="0"
- multi_select="true"
- name="speakers_list"
- width="282" />
- <panel
- filename="panel_avatar_list_item.xml"
- follows="left|right|top"
- height="24"
- layout="topleft"
- left="0"
- name="non_avatar_caller"
- top="70"
- width="282" />
- <view_border
- bevel_style="out"
- follows="left|top|right|bottom"
- height="206"
- layout="topleft"
- left="0"
- top="63"
- width="282" />
+ multi_select="true"
+ name="speakers_list"
+ width="280" />
+ <panel
+ filename="panel_avatar_list_item.xml"
+ follows="left|right|top"
+ height="24"
+ layout="topleft"
+ left="0"
+ name="non_avatar_caller"
+ top="10"
+ width="276" />
+ </layout_panel>
+ </layout_stack>
</floater>
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index fa7e3e86a33f2810f9e169b75756b2d3311eed4f..45100eb1ffa8c542991ad418ad004f5f90d144b7 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -198,40 +198,6 @@
function="Floater.Toggle"
parameter="nearby_media" />
</menu_item_check>
- <!--menu_item_check
- label="Block List"
- layout="topleft"
- name="Mute List">
- <menu_item_check.on_check
- function="Floater.Visible"
- parameter="mute" />
- <menu_item_check.on_click
- function="Floater.Toggle"
- parameter="mute" />
- </menu_item_check-->
- <menu_item_separator
- layout="topleft" />
- <menu_item_check
- label="(Legacy) Communicate"
- layout="topleft"
- name="Instant Message"
- shortcut="control|T">
- <menu_item_check.on_check
- function="Floater.Visible"
- parameter="communicate" />
- <menu_item_check.on_click
- function="Floater.Toggle"
- parameter="communicate" />
- </menu_item_check>
- <menu_item_call
- label="(Temp) Media Remote Ctrl"
- layout="topleft"
- name="Preferences"
- shortcut="control|alt|M">
- <menu_item_call.on_click
- function="Floater.Toggle"
- parameter="media_remote_ctrl" />
- </menu_item_call>
</menu>
<menu
label="World"
@@ -283,7 +249,7 @@
</menu_item_call>
<menu
create_jump_keys="true"
- label="About This Place"
+ label="Place Profile"
layout="topleft"
name="Land"
tear_off="true">
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index b4ce0df6a2dd283964e4574b8af325c60f6776a6..e01536f256e0f22d7678e3f88f2f7e8bcefd394b 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -246,7 +246,7 @@ Save all changes to clothing/body parts?
icon="alertmodal.tga"
name="GrantModifyRights"
type="alertmodal">
-Granting modify rights to another resident allows them to change, delete or take ANY objects you may have in-world. Be VERY careful when handing out this permission.
+Granting modify rights to another Resident allows them to change, delete or take ANY objects you may have in-world. Be VERY careful when handing out this permission.
Do you want to grant modify rights for [FIRST_NAME] [LAST_NAME]?
<usetemplate
name="okcancelbuttons"
@@ -258,7 +258,7 @@ Do you want to grant modify rights for [FIRST_NAME] [LAST_NAME]?
icon="alertmodal.tga"
name="GrantModifyRightsMultiple"
type="alertmodal">
-Granting modify rights to another resident allows them to change ANY objects you may have in-world. Be VERY careful when handing out this permission.
+Granting modify rights to another Resident allows them to change ANY objects you may have in-world. Be VERY careful when handing out this permission.
Do you want to grant modify rights for the selected Residents?
<usetemplate
name="okcancelbuttons"
@@ -1597,7 +1597,8 @@ Unable to force land ownership because selection spans multiple regions. Please
icon="alertmodal.tga"
name="ForceOwnerAuctionWarning"
type="alertmodal">
-This parcel is up for auction. Forcing ownership will cancel the auction and potentially make some residents unhappy if bidding has begun. Force ownership?
+This parcel is up for auction. Forcing ownership will cancel the auction and potentially make some Residents unhappy if bidding has begun.
+Force ownership?
<usetemplate
name="okcancelbuttons"
notext="Cancel"
@@ -3563,7 +3564,7 @@ Type a short announcement which will be sent to everyone in this region.
The maturity rating for this region has been updated.
It may take some time for the change to be reflected on the map.
-To enter Adult regions, residents must be Account Verified, either by age-verification or payment-verification.
+To enter Adult regions, Residents must be Account Verified, either by age-verification or payment-verification.
</notification>
<notification
@@ -4553,8 +4554,8 @@ Click on any landmark to select it, then click 'Teleport' at the botto
icon="notifytip.tga"
name="TeleportToPerson"
type="notifytip">
-You can contact residents like '[NAME]' by opening the People panel on the right side of your screen.
-Select the resident from the list, then click 'IM' at the bottom of the panel.
+You can contact Residents like '[NAME]' by opening the People panel on the right side of your screen.
+Select the Resident from the list, then click 'IM' at the bottom of the panel.
(You can also double-click on their name in the list, or right-click and choose 'IM').
</notification>
@@ -4703,7 +4704,7 @@ The objects on the selected parcel of land that is owned by [FIRST] [LAST] have
icon="notify.tga"
name="OtherObjectsReturned2"
type="notify">
-The objects on the selected parcel of land owned by the resident '[NAME]' have been returned to their owner.
+The objects on the selected parcel of land owned by the Resident '[NAME]' have been returned to their owner.
</notification>
<notification
@@ -5191,7 +5192,7 @@ An object named [OBJECTFROMNAME] owned by (an unknown Resident) has given you [O
name="OfferCallingCard"
type="notify">
[FIRST] [LAST] is offering their calling card.
-This will add a bookmark in your inventory so you can quickly IM this resident.
+This will add a bookmark in your inventory so you can quickly IM this Resident.
<form name="form">
<button
index="0"
diff --git a/indra/newview/skins/default/xui/en/panel_block_list_sidetray.xml b/indra/newview/skins/default/xui/en/panel_block_list_sidetray.xml
index 003e1baa7ebcde478f9c677f93510ff8d6ae6fd8..39170b90ca33fb2b23959611de79f35dcb3b7c03 100644
--- a/indra/newview/skins/default/xui/en/panel_block_list_sidetray.xml
+++ b/indra/newview/skins/default/xui/en/panel_block_list_sidetray.xml
@@ -37,7 +37,7 @@
layout="topleft"
left="5"
name="blocked"
- tool_tip="List of currently blocked residents"
+ tool_tip="List of currently blocked Residents"
top="30"
width="270" />
<button
@@ -47,7 +47,7 @@
layout="topleft"
left_delta="0"
name="Block resident..."
- tool_tip="Pick a resident to block"
+ tool_tip="Pick a Resident to block"
top_pad="4"
width="210">
<button.commit_callback
@@ -74,7 +74,7 @@
layout="topleft"
left_delta="0"
name="Unblock"
- tool_tip="Remove resident or object from blocked list"
+ tool_tip="Remove Resident or object from blocked list"
top_pad="4"
width="210" >
<button.commit_callback
diff --git a/indra/newview/skins/default/xui/en/panel_friends.xml b/indra/newview/skins/default/xui/en/panel_friends.xml
index ac731bcdf009e24d9e9bc1badf7784dcdec2e96b..c315adb33ebaa2e8745d15e718b837f1bc7a5e04 100644
--- a/indra/newview/skins/default/xui/en/panel_friends.xml
+++ b/indra/newview/skins/default/xui/en/panel_friends.xml
@@ -118,7 +118,7 @@
layout="topleft"
left_delta="0"
name="add_btn"
- tool_tip="Offer friendship to a resident"
+ tool_tip="Offer friendship to a Resident"
top_pad="13"
width="80" />
</panel>
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 37578eae7038b7fea6b99f0ce2db9d45bf056357..48083b7677da153f4805bdc61fd507cf33b9c5cf 100644
--- a/indra/newview/skins/default/xui/en/panel_group_invite.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_invite.xml
@@ -17,7 +17,7 @@
</panel.string>
<panel.string
name="already_in_group">
- Some avatars are already in group and were not invited.
+ Some Residents you chose are already in the group, and so were not sent an invitation.
</panel.string>
<text
type="string"
@@ -26,11 +26,10 @@
layout="topleft"
left="7"
name="help_text"
- top="24"
+ top="28"
+ word_wrap="true"
width="200">
- You can select multiple residents to
-invite to your group. Click 'Open
-Resident Chooser' to start.
+ You can select multiple Residents to invite to your group. Click 'Open Resident Chooser' to start.
</text>
<button
height="20"
@@ -48,7 +47,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
@@ -57,7 +56,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 the Residents selected above from the invite list"
top_pad="4"
width="200" />
<text
@@ -68,6 +67,7 @@ Resident Chooser' to start.
left_delta="4"
name="role_text"
top_pad="5"
+ word_wrap="true"
width="200">
Choose what Role to assign them to:
</text>
diff --git a/indra/newview/skins/default/xui/en/panel_my_profile.xml b/indra/newview/skins/default/xui/en/panel_my_profile.xml
index a9ff9362a073381bb57ad9aa1d2e53fa8f7fda68..27c1af1860cfb7728c5006bd9979bfbae8c43a95 100644
--- a/indra/newview/skins/default/xui/en/panel_my_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_my_profile.xml
@@ -316,7 +316,7 @@
left="0"
mouse_opaque="false"
name="add_friend"
- tool_tip="Offer friendship to the resident"
+ tool_tip="Offer friendship to the Resident"
top="5"
width="80" />
<button
diff --git a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
index e2884dbedcfeb96e7de81a4938bddd386f8dc845..9ad99b1f135934cf1b35e6bb30a3ef1de59d5f49 100644
--- a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
@@ -47,7 +47,7 @@
left="10"
name="back_btn"
tool_tip="Go back to previous location"
- top="3"
+ top="2"
width="31" />
<button
follows="left|top"
@@ -92,7 +92,6 @@
width="20" />
-->
</location_input>
-
<!-- <button -->
<!-- follows="right|top" -->
<!-- height="20" -->
@@ -108,7 +107,6 @@
<!-- name="search_bg" -->
<!-- top_delta="0" -->
<!-- width="168" /> -->
-
<search_combo_box
bevel_style="none"
border_style="line"
diff --git a/indra/newview/skins/default/xui/en/panel_notes.xml b/indra/newview/skins/default/xui/en/panel_notes.xml
index 73528b28ad2347f917a3974d579228e624ecde63..45b64d5e26be29077c45ef20a9332e696d3a5244 100644
--- a/indra/newview/skins/default/xui/en/panel_notes.xml
+++ b/indra/newview/skins/default/xui/en/panel_notes.xml
@@ -120,7 +120,7 @@
left="0"
mouse_opaque="false"
name="add_friend"
- tool_tip="Offer friendship to the resident"
+ tool_tip="Offer friendship to the Resident"
top="5"
width="80" />
<button
@@ -139,7 +139,7 @@
label="Call"
layout="topleft"
name="call"
- tool_tip="Call this resident"
+ tool_tip="Call this Resident"
left_pad="3"
top="5"
width="45" />
@@ -150,7 +150,7 @@
label="Map"
layout="topleft"
name="show_on_map_btn"
- tool_tip="Show the resident on the map"
+ tool_tip="Show the Resident on the map"
top="5"
left_pad="3"
width="45" />
diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml
index adf22f825ff6fde9214ffe31cffc2bea94fc4c7b..8a02637817ae2869d302b25b51ee16b3abb1cd07 100644
--- a/indra/newview/skins/default/xui/en/panel_people.xml
+++ b/indra/newview/skins/default/xui/en/panel_people.xml
@@ -106,7 +106,7 @@ background_visible="true"
left_pad="5"
name="add_friend_btn"
top_delta="0"
- tool_tip="Add selected resident to your friends List"
+ tool_tip="Add selected Resident to your friends List"
width="18">
<commit_callback
function="People.addFriend" />
@@ -192,7 +192,7 @@ background_visible="true"
layout="topleft"
left_pad="5"
name="add_btn"
- tool_tip="Offer friendship to a resident"
+ tool_tip="Offer friendship to a Resident"
top_delta="0"
width="18" />
<button
@@ -327,7 +327,7 @@ background_visible="true"
left_pad="5"
name="add_friend_btn"
top_delta="0"
- tool_tip="Add selected resident to your friends List"
+ tool_tip="Add selected Resident to your friends List"
width="18">
<commit_callback
function="People.addFriend" />
@@ -350,7 +350,7 @@ background_visible="true"
label="Profile"
layout="topleft"
name="view_profile_btn"
- tool_tip="Show picture, groups, and other residents information"
+ tool_tip="Show picture, groups, and other Residents information"
width="70" />
<button
follows="bottom|left"
@@ -370,7 +370,7 @@ background_visible="true"
label="Call"
layout="topleft"
name="call_btn"
- tool_tip="Call this resident"
+ tool_tip="Call this Resident"
width="50" />
<button
follows="left|top"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
index 17651b8caae64ef4d69cba30a21f0608f0dfbe9c..1e7acb566fe049e711665904160686b83041597d 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
@@ -2,7 +2,6 @@
<panel
border="true"
- background_visible="true"
follows="left|top|right|bottom"
height="408"
layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_general.xml b/indra/newview/skins/default/xui/en/panel_preferences_general.xml
index c98555735a7cee3bc63a82f1791a8d095aba2375..22c75a595ed5297950aebc46c50a9f7b910aaba1 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_general.xml
@@ -260,7 +260,7 @@
width="200">
My effects:
</text>
- <text
+ <text
type="string"
length="1"
follows="left|top"
@@ -270,16 +270,23 @@
name="title_afk_text"
width="190">
Away timeout:
- </text>
+ </text>
<color_swatch
- control_name="EffectColor"
+ can_apply_immediately="true"
follows="left|top"
height="50"
layout="topleft"
left="50"
name="effect_color_swatch"
tool_tip="Click to open Color Picker"
- width="38" />
+ width="38">
+ <color_swatch.init_callback
+ function="Pref.getUIColor"
+ parameter="EffectColor" />
+ <color_swatch.commit_callback
+ function="Pref.applyUIColor"
+ parameter="EffectColor" />
+ </color_swatch>
<combo_box
height="23"
layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
index cc00abf5a0d27d46ada423e4625cf17c3c632618..a0fcf59fc8db85c13e9a05106f7acb5de828687f 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
@@ -378,7 +378,7 @@
layout="topleft"
left_delta="250"
name="DrawDistanceMeterText2"
- top_delta="1"
+ top_delta="0"
width="128">
m
</text>
@@ -395,7 +395,7 @@
left="216"
max_val="8192"
name="MaxParticleCount"
- top_pad="6"
+ top_pad="7"
width="262" />
<slider
control_name="RenderGlowResolutionPow"
diff --git a/indra/newview/skins/default/xui/en/panel_profile.xml b/indra/newview/skins/default/xui/en/panel_profile.xml
index 2cd8940014580b094cb802f905e1f64d6e33a15d..597b6410cdab88f63148aa87682b899631e73813 100644
--- a/indra/newview/skins/default/xui/en/panel_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile.xml
@@ -296,7 +296,7 @@
left="0"
mouse_opaque="false"
name="add_friend"
- tool_tip="Offer friendship to the resident"
+ tool_tip="Offer friendship to the Resident"
top="5"
width="80" />
<button
@@ -315,7 +315,7 @@
label="Call"
layout="topleft"
name="call"
- tool_tip="Call this resident"
+ tool_tip="Call this Resident"
left_pad="3"
top="5"
width="45" />
@@ -326,7 +326,7 @@
label="Map"
layout="topleft"
name="show_on_map_btn"
- tool_tip="Show the resident on the map"
+ tool_tip="Show the Resident on the map"
top="5"
left_pad="3"
width="45" />
@@ -346,7 +346,7 @@
label="â–¼"
layout="topleft"
name="overflow_btn"
- tool_tip="Pay money to or share inventory with the resident"
+ tool_tip="Pay money to or share inventory with the Resident"
right="-1"
top="5"
left_pad="3"
diff --git a/indra/newview/skins/default/xui/en/panel_region_covenant.xml b/indra/newview/skins/default/xui/en/panel_region_covenant.xml
index ff55090f162e9326e348430fa5aaaed23f4207ce..dc8f71c868af937620d9248710ef5ff102eb0f58 100644
--- a/indra/newview/skins/default/xui/en/panel_region_covenant.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_covenant.xml
@@ -135,7 +135,8 @@
left="120"
name="covenant_help_text"
top_pad="10"
- width="460">
+ word_wrap="true"
+ width="360">
Changes to the covenant will show on all parcels in the estate.
</text>
<text
@@ -145,9 +146,10 @@
left_delta="0"
name="covenant_instructions"
top_pad="5"
- width="465">
- Drag and drop a notecard to change
- the Covenant for this Estate.
+ word_wrap="true"
+ font.style="ITALIC"
+ width="360">
+ Drag and drop a notecard to change the Covenant for this estate.
</text>
<text
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 ba39e880249daa24a57e32ef8f4271d9f2545f76..3980eb86d306b63dc06370fb5eb714e319263504 100644
--- a/indra/newview/skins/default/xui/en/panel_region_estate.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_estate.xml
@@ -19,9 +19,9 @@
left="10"
name="estate_help_text"
top="14"
- width="313">
- Changes to settings on this tab will affect all
-regions in the estate.
+ word_wrap="true"
+ width="275">
+ Changes to settings on this tab will affect all regions in the estate.
</text>
<text
type="string"
@@ -138,7 +138,7 @@ regions in the estate.
name="Only Allow"
top="250"
width="278">
- Restrict Access to Accounts Verified by:
+ Restrict Access to accounts verified by:
</text>
<check_box
follows="top|left"
@@ -147,7 +147,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
@@ -157,7 +157,7 @@ regions in the estate.
layout="topleft"
left_delta="0"
name="limit_age_verified"
- tool_tip="Ban residents who have not verified their age. See the [SUPPORT_SITE] for more information."
+ tool_tip="Ban Residents who have not verified their age. See the [SUPPORT_SITE] for more information."
top_pad="2"
width="278" />
<check_box
diff --git a/indra/newview/skins/default/xui/en/panel_region_texture.xml b/indra/newview/skins/default/xui/en/panel_region_texture.xml
index 502a5804c3135d9e127973d3efba41736f5365e9..04dbf73be94830f3260e4f0760243be3f0a14e7c 100644
--- a/indra/newview/skins/default/xui/en/panel_region_texture.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_texture.xml
@@ -292,7 +292,7 @@
name="height_text_lbl10"
top_delta="30"
width="400"
- wrap="true">
+ word_wrap="true">
These values represent the blend range for the textures above.
</text>
<text
@@ -303,7 +303,7 @@
name="height_text_lbl11"
top_delta="32"
width="400"
- wrap="true">
+ word_wrap="true">
Measured in meters, the LOW value is the MAXIMUM height of Texture #1, and the HIGH value is the MINIMUM height of Texture #4.
</text>
<button
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 00f54feabde73a4614e4c5e65a191c3e781eccd6..bfca2f2e46cb91e0ba637c0442917f2d815dd205 100644
--- a/indra/newview/skins/default/xui/en/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_status_bar.xml
@@ -42,18 +42,36 @@
<button
auto_resize="true"
halign="right"
+ font="SansSerifSmall"
+ follows="right|top"
+ image_overlay=""
+ image_selected="spacer35.tga"
+ image_unselected="spacer35.tga"
+ image_pressed="spacer35.tga"
+ height="16"
+ right="-228"
+ label_shadow="false"
+ name="buycurrency"
+ tool_tip="My Balance"
+ top="5"
+ width="100" />
+ <button
+ auto_resize="true"
+ halign="right"
+ font="SansSerifSmall"
follows="right|top"
image_selected="BuyArrow_Over"
image_unselected="BuyArrow_Over"
image_pressed="BuyArrow_Press"
height="16"
- right="-128"
- label_color="White"
+ label="Buy L$"
+ label_color="EmphasisColor"
+ left_pad="0"
label_shadow="false"
- name="buycurrency"
+ name="buyL"
pad_right="20px"
- tool_tip="My Balance: Click to buy more L$"
- top="3"
+ tool_tip="Click to buy more L$"
+ top="5"
width="100" />
<text
type="string"
@@ -62,29 +80,27 @@
follows="right|bottom"
halign="right"
height="16"
- top="4"
+ top="7"
layout="topleft"
left_pad="0"
name="TimeText"
- text_color="TimeTextColor"
tool_tip="Current time (Pacific)"
width="85">
12:00 AM
</text>
<button
follows="right|bottom"
- height="16"
+ height="15"
image_selected="AudioMute_Off"
image_pressed="Audio_Press"
image_unselected="Audio_Off"
is_toggle="true"
left_pad="18"
- top="1"
+ top="4"
name="volume_btn"
tool_tip="Global Volume Control"
width="16" />
<text
- enabled="true"
follows="right|bottom"
halign="center"
height="12"
diff --git a/indra/newview/skins/default/xui/en/panel_volume_pulldown.xml b/indra/newview/skins/default/xui/en/panel_volume_pulldown.xml
new file mode 100644
index 0000000000000000000000000000000000000000..60d4a7e00b5358e2a98314943600550aec8837b8
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_volume_pulldown.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+ background_opaque="true"
+ background_visible="false"
+ border_visible="false"
+ border="false"
+ chrome="true"
+ follows="bottom"
+ height="150"
+ layout="topleft"
+ name="volumepulldown_floater"
+ width="32">
+ <!-- floater background image -->
+ <icon
+ height="150"
+ image_name="Inspector_Background"
+ layout="topleft"
+ left="0"
+ name="normal_background"
+ top="0"
+ width="32" />
+ <slider
+ control_name="AudioLevelMaster"
+ follows="left|top"
+ left="0"
+ top="1"
+ orientation="vertical"
+ height="120"
+ increment="0.05"
+ initial_value="0.5"
+ layout="topleft"
+ name="mastervolume"
+ show_text="false"
+ slider_label.halign="right"
+ top_pad="2"
+ volume="true">
+ <slider.commit_callback
+ function="Vol.setControlFalse"
+ parameter="MuteAudio" />
+ </slider>
+ <button
+ left="7"
+ top_pad="9"
+ width="18"
+ height="12"
+ follows="top|left"
+ name="prefs_btn"
+ image_unselected="Icon_Gear_Foreground"
+ image_disabled="Icon_Gear_Background"
+ image_pressed="Icon_Gear_Press"
+ scale_image="false">
+ <button.commit_callback
+ function="Vol.GoAudioPrefs" />
+ </button>
+</panel>
diff --git a/indra/newview/skins/default/xui/en/sidepanel_task_info.xml b/indra/newview/skins/default/xui/en/sidepanel_task_info.xml
index d26e855e2f636b3518ebe16d748f9746972d149e..2dfcdf4a4cf35633ab3a23cc354a068e7cd5eff1 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_task_info.xml
@@ -153,28 +153,19 @@
layout="topleft"
left="5"
name="CreatorNameLabel"
- top_pad="10"
+ top_pad="12"
width="78">
Creator:
</text>
- <avatar_icon
- follows="top|left"
- height="20"
- default_icon_name="Generic_Person"
- layout="topleft"
- left_pad="0"
- top_delta="-6"
- mouse_opaque="true"
- width="20" />
<text
type="string"
- follows="left|right"
+ follows="left|right|top"
font="SansSerifSmall"
height="15"
layout="topleft"
- left_pad="5"
+ left_pad="0"
name="Creator Name"
- top_delta="6"
+ top_delta="0"
width="140">
Erica Linden
</text>
@@ -186,28 +177,19 @@
layout="topleft"
left="5"
name="Owner:"
- top_pad="10"
+ top_pad="15"
width="78">
Owner:
</text>
- <avatar_icon
- follows="top|left"
- height="20"
- default_icon_name="Generic_Person"
- layout="topleft"
- left_pad="0"
- top_delta="-6"
- mouse_opaque="true"
- width="20" />
<text
type="string"
- follows="left|right"
+ follows="left|right|top"
font="SansSerifSmall"
height="15"
layout="topleft"
- left_pad="5"
+ left_pad="0"
name="Owner Name"
- top_delta="6"
+ top_delta="0"
width="140">
Erica Linden
</text>
@@ -219,7 +201,7 @@
layout="topleft"
left="5"
name="Group_label"
- top_pad="10"
+ top_pad="15"
width="78">
Group:
</text>
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index f2f23a3847dc2d6ab8c0b92e04a596d2ee94d793..02dc5077811a6a491a273599a0c78a4b5c6118fc 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -67,7 +67,7 @@
<!-- tooltips for Urls -->
<string name="TooltipHttpUrl">Click to view this web page</string>
<string name="TooltipSLURL">Click to view this location's information</string>
- <string name="TooltipAgentUrl">Click to view this resident's profile</string>
+ <string name="TooltipAgentUrl">Click to view this Resident's profile</string>
<string name="TooltipGroupUrl">Click to view this group's description</string>
<string name="TooltipEventUrl">Click to view this event's description</string>
<string name="TooltipClassifiedUrl">Click to view this classified</string>
@@ -1609,11 +1609,11 @@ Sends an HTTP request to the specified url with the body of the request and para
</string>
<string name="LSLTipText_llResetLandBanList" translate="false">
llResetLandBanList()
-Removes all residents from the land ban list
+Removes all Residents from the land ban list
</string>
<string name="LSLTipText_llResetLandPassList" translate="false">
llResetLandPassList()
-Removes all residents from the land access/pass list
+Removes all Residents from the land access/pass list
</string>
<string name="LSLTipText_llGetObjectPrimCount" translate="false">
integer llGetObjectPrimCount(key object_id)
@@ -1621,7 +1621,7 @@ Returns the total number of prims for an object in the region
</string>
<string name="LSLTipText_llGetParcelPrimOwners" translate="false">
list llGetParcelPrimOwners(vector pos)
-Returns a list of all residents who own objects on the parcel at pos and with individual prim counts.
+Returns a list of all Residents who own objects on the parcel at pos and with individual prim counts.
Requires owner-like permissions for the parcel.
</string>
<string name="LSLTipText_llGetParcelPrimCount" translate="false">
@@ -1808,7 +1808,7 @@ Clears (deletes) the media and all params from the given face.
<!-- inventory -->
<string name="InventoryNoMatchingItems">No matching items found in inventory.</string>
- <string name="FavoritesNoMatchingItems">Drag and drop a landmark here to add to your favorites.</string>
+ <string name="FavoritesNoMatchingItems">Drag a landmark here to add it to your favorites.</string>
<string name="InventoryNoTexture">
You do not have a copy of
this texture in your inventory
@@ -2039,7 +2039,7 @@ this texture in your inventory
<string name="RegionInfoAllEstatesYouManage">
all estates that you manage for [OWNER]
</string>
- <string name="RegionInfoAllowedResidents">Allowed residents: ([ALLOWEDAGENTS], max [MAXACCESS])</string>
+ <string name="RegionInfoAllowedResidents">Allowed Residents: ([ALLOWEDAGENTS], max [MAXACCESS])</string>
<string name="RegionInfoAllowedGroups">Allowed groups: ([ALLOWEDGROUPS], max [MAXACCESS])</string>
<!-- script limits floater -->
@@ -2110,7 +2110,7 @@ this texture in your inventory
<!-- Mute -->
<string name="MuteByName">(by name)</string>
- <string name="MuteAgent">(resident)</string>
+ <string name="MuteAgent">(Resident)</string>
<string name="MuteObject">(object)</string>
<string name="MuteGroup">(group)</string>
@@ -2937,7 +2937,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
Click the [BUTTON NAME] button to accept/connect to this voice chat.
</string>
<string name="muted_message">
- You have blocked this resident. Sending a message will automatically unblock them.
+ You have blocked this Resident. Sending a message will automatically unblock them.
</string>
<!--Some times string name is getting from the body of server response.
For ex.: from gIMMgr::showSessionStartError in the LLViewerChatterBoxSessionStartReply::post.
diff --git a/indra/newview/skins/default/xui/en/widgets/chiclet_im_adhoc.xml b/indra/newview/skins/default/xui/en/widgets/chiclet_im_adhoc.xml
index af0d3382565dd6239d98099607c3496f46daad94..693c43f141b48c8629aee1bb38573bc2f86e6bed 100644
--- a/indra/newview/skins/default/xui/en/widgets/chiclet_im_adhoc.xml
+++ b/indra/newview/skins/default/xui/en/widgets/chiclet_im_adhoc.xml
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<chiclet_im_adhoc
- font="SansSerif"
height="25"
name="im_adhoc_chiclet"
show_speaker="false"
@@ -12,15 +11,14 @@
left="25"
name="speaker"
visible="false"
- width="20"/>
+ width="20" />
<chiclet_im_adhoc.avatar_icon
follows="left|top|bottom"
height="22"
mouse_opaque="true"
name="adhoc_icon"
- width="22"/>
+ width="22" />
<chiclet_im_adhoc.unread_notifications
- font="SansSerif"
font_halign="center"
height="25"
left="25"
@@ -29,13 +27,13 @@
text_color="white"
v_pad="5"
visible="false"
- width="20"/>
+ width="20" />
<chiclet_im_adhoc.new_message_icon
- bottom="12"
- height="13"
- image_name="Unread_Chiclet"
- left="12"
- name="new_message_icon"
- visible="false"
- width="13" />
+ bottom="11"
+ height="14"
+ image_name="Unread_Chiclet"
+ left="12"
+ name="new_message_icon"
+ visible="false"
+ width="14" />
</chiclet_im_adhoc>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/en/widgets/chiclet_im_group.xml b/indra/newview/skins/default/xui/en/widgets/chiclet_im_group.xml
index b1988a2d2001c6281be7166c4d6d5990dcb93386..f4fc58701c62a4a3dc411db50debf699abb2f885 100644
--- a/indra/newview/skins/default/xui/en/widgets/chiclet_im_group.xml
+++ b/indra/newview/skins/default/xui/en/widgets/chiclet_im_group.xml
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<chiclet_im_group
- font="SansSerif"
height="25"
name="im_group_chiclet"
show_speaker="false"
@@ -12,17 +11,17 @@
left="25"
name="speaker"
visible="false"
- width="20"/>
+ width="20" />
<chiclet_im_group.group_icon
default_icon="Generic_Group"
follows="left|top|bottom"
- height="22"
+ height="18"
+ bottom_pad="4"
mouse_opaque="true"
name="group_icon"
- width="22"/>
+ width="18" />
<chiclet_im_group.unread_notifications
height="25"
- font="SansSerif"
font_halign="center"
left="25"
mouse_opaque="false"
@@ -32,11 +31,11 @@
visible="false"
width="20"/>
<chiclet_im_group.new_message_icon
- bottom="12"
- height="13"
- image_name="Unread_Chiclet"
- left="12"
- name="new_message_icon"
- visible="false"
- width="13" />
+bottom="11"
+ height="14"
+ image_name="Unread_Chiclet"
+ left="12"
+ name="new_message_icon"
+ visible="false"
+ width="14" />
</chiclet_im_group>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/en/widgets/chiclet_im_p2p.xml b/indra/newview/skins/default/xui/en/widgets/chiclet_im_p2p.xml
index 52fbce0de76ab815ea2c386a3c137d3a7f451a15..535113f7176deca0fc7dd2bac4582c524e238d9b 100644
--- a/indra/newview/skins/default/xui/en/widgets/chiclet_im_p2p.xml
+++ b/indra/newview/skins/default/xui/en/widgets/chiclet_im_p2p.xml
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<chiclet_im_p2p
- font="SansSerif"
height="25"
name="im_p2p_chiclet"
show_speaker="false"
@@ -18,10 +17,9 @@
height="22"
mouse_opaque="true"
name="avatar_icon"
- width="22"/>
+ width="22" />
<chiclet_im_p2p.unread_notifications
height="25"
- font="SansSerif"
font_halign="center"
left="25"
mouse_opaque="false"
@@ -31,11 +29,11 @@
visible="false"
width="20"/>
<chiclet_im_p2p.new_message_icon
- bottom="12"
- height="13"
- image_name="Unread_Chiclet"
- left="12"
- name="new_message_icon"
- visible="false"
- width="13" />
+ bottom="11"
+ height="14"
+ image_name="Unread_Chiclet"
+ left="12"
+ name="new_message_icon"
+ visible="false"
+ width="14" />
</chiclet_im_p2p>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/en/widgets/chiclet_offer.xml b/indra/newview/skins/default/xui/en/widgets/chiclet_offer.xml
index 33f85a964cf063c4a8b30205827af8a61a1684cf..86bea9be5047cdc52428d1346011ffef11c9c043 100644
--- a/indra/newview/skins/default/xui/en/widgets/chiclet_offer.xml
+++ b/indra/newview/skins/default/xui/en/widgets/chiclet_offer.xml
@@ -1,22 +1,22 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<chiclet_offer
- font="SansSerif"
height="25"
name="offer_chiclet"
width="25">
<chiclet_offer.icon
- default_icon="Generic_Object_Small"
+ default_icon="Generic_Object_Small"
follows="all"
- height="22"
+ height="20"
mouse_opaque="false"
name="chiclet_icon"
- width="22"/>
+ bottom_pad="2"
+ width="20" />
<chiclet_offer.new_message_icon
- bottom="12"
- height="13"
+ bottom="11"
+ height="14"
image_name="Unread_Chiclet"
left="12"
name="new_message_icon"
visible="false"
- width="13" />
+ width="14" />
</chiclet_offer>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/en/widgets/chiclet_script.xml b/indra/newview/skins/default/xui/en/widgets/chiclet_script.xml
index 560c8e6ea5cbdffbf55b6c97abb54648e1bbfcc0..b1f9f5b0e80bf669ad94c135e13cfcdfcc566c16 100644
--- a/indra/newview/skins/default/xui/en/widgets/chiclet_script.xml
+++ b/indra/newview/skins/default/xui/en/widgets/chiclet_script.xml
@@ -1,22 +1,22 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<chiclet_script
- font="SansSerif"
height="25"
name="script_chiclet"
width="25">
<chiclet_script.icon
follows="all"
- height="22"
- image_name="Generic_Object_Small"
+ height="20"
+ image_name="Generic_Object_Small"
mouse_opaque="false"
name="chiclet_icon"
- width="22"/>
+ width="20"
+ bottom_pad="2" />
<chiclet_script.new_message_icon
- bottom="12"
- height="13"
+ bottom="11"
+ height="14"
image_name="Unread_Chiclet"
left="12"
name="new_message_icon"
visible="false"
- width="13" />
+ width="14" />
</chiclet_script>
\ No newline at end of file
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 67bb7c1896f496e0908e82c0520732f05731e5d5..1c0a8ba7c5ec5daf0db901633ffc5981eb72a181 100644
--- a/indra/newview/skins/default/xui/en/widgets/location_input.xml
+++ b/indra/newview/skins/default/xui/en/widgets/location_input.xml
@@ -96,7 +96,7 @@
name="damage_icon"
width="14"
height="13"
- top="22"
+ top="25"
left="2"
follows="right|top"
image_name="Parcel_Damage_Dark"
@@ -112,17 +112,19 @@
font="SansSerifSmall"
text_color="TextFgColor"
/>
-
- <combo_button name="Location History"
- label=""
- pad_right="0"/>
- <combo_list bg_writeable_color="MenuDefaultBgColor" page_lines="10"
+ <combo_button
+ name="Location History"
+ label=""
+ pad_right="0"/>
+ <combo_list
+ bg_writeable_color="MenuDefaultBgColor"
+ page_lines="10"
scroll_bar_bg_visible="true" />
<combo_editor name="Combo Text Entry"
- text_pad_left="22"
+ text_pad_left="27"
select_on_focus="false"
font="SansSerifSmall"
bevel_style="none"
border_style="line"
- border.border_thickness="0"/>
+ border.border_thickness="0" />
</location_input>