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 @@ public:
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 @@ public:
static void buildHierarchy();
static void resetFrame();
static void reset();
-
//
// members
@@ -207,58 +197,47 @@ public:
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 @@ public:
#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 @@ public:
#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 @@ public:
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/llplugin/llpluginclassmedia.cpp b/indra/llplugin/llpluginclassmedia.cpp
index ed8d10a88c41c0a61bf12f3c26c49e888ed18104..3d2eaed5c5adf757f09191800c6196bd63d5f073 100644
--- a/indra/llplugin/llpluginclassmedia.cpp
+++ b/indra/llplugin/llpluginclassmedia.cpp
@@ -37,6 +37,8 @@
#include "llpluginclassmedia.h"
#include "llpluginmessageclasses.h"
+#include "llqtwebkit.h"
+
static int LOW_PRIORITY_TEXTURE_SIZE_DEFAULT = 256;
static int nextPowerOf2( int value )
@@ -124,7 +126,7 @@ void LLPluginClassMedia::reset()
mCanPaste = false;
mMediaName.clear();
mMediaDescription.clear();
- mBackgroundColor = LLColor4::white;
+ mBackgroundColor = LLColor4(1.0f, 1.0f, 1.0f, 1.0f);
// media_browser class
mNavigateURI.clear();
@@ -134,6 +136,9 @@ void LLPluginClassMedia::reset()
mHistoryForwardAvailable = false;
mStatusText.clear();
mProgressPercent = 0;
+ mClickURL.clear();
+ mClickTarget.clear();
+ mClickTargetType = TARGET_NONE;
// media_time class
mCurrentTime = 0.0f;
@@ -669,6 +674,26 @@ void LLPluginClassMedia::paste()
sendMessage(message);
}
+LLPluginClassMedia::ETargetType getTargetTypeFromLLQtWebkit(int target_type)
+{
+ // convert a LinkTargetType value from llqtwebkit to an ETargetType
+ // so that we don't expose the llqtwebkit header in viewer code
+ switch (target_type)
+ {
+ case LinkTargetType::LTT_TARGET_NONE:
+ return LLPluginClassMedia::TARGET_NONE;
+
+ case LinkTargetType::LTT_TARGET_BLANK:
+ return LLPluginClassMedia::TARGET_BLANK;
+
+ case LinkTargetType::LTT_TARGET_EXTERNAL:
+ return LLPluginClassMedia::TARGET_EXTERNAL;
+
+ default:
+ return LLPluginClassMedia::TARGET_OTHER;
+ }
+}
+
/* virtual */
void LLPluginClassMedia::receivePluginMessage(const LLPluginMessage &message)
{
@@ -921,12 +946,15 @@ void LLPluginClassMedia::receivePluginMessage(const LLPluginMessage &message)
{
mClickURL = message.getValue("uri");
mClickTarget = message.getValue("target");
+ U32 target_type = message.getValueU32("target_type");
+ mClickTargetType = ::getTargetTypeFromLLQtWebkit(target_type);
mediaEvent(LLPluginClassMediaOwner::MEDIA_EVENT_CLICK_LINK_HREF);
}
else if(message_name == "click_nofollow")
{
mClickURL = message.getValue("uri");
mClickTarget.clear();
+ mClickTargetType = TARGET_NONE;
mediaEvent(LLPluginClassMediaOwner::MEDIA_EVENT_CLICK_LINK_NOFOLLOW);
}
else
diff --git a/indra/llplugin/llpluginclassmedia.h b/indra/llplugin/llpluginclassmedia.h
index 5a1928ab1dff6168731bb1da5ade8d24052d6483..ebb9099576699d217b0e76dcf6d9287d05c59135 100644
--- a/indra/llplugin/llpluginclassmedia.h
+++ b/indra/llplugin/llpluginclassmedia.h
@@ -214,6 +214,17 @@ public:
// This is valid after MEDIA_EVENT_CLICK_LINK_HREF
std::string getClickTarget() const { return mClickTarget; };
+ typedef enum
+ {
+ TARGET_NONE, // empty href target string
+ TARGET_BLANK, // target to open link in user's preferred browser
+ TARGET_EXTERNAL, // target to open link in external browser
+ TARGET_OTHER // nonempty and unsupported target type
+ }ETargetType;
+
+ // This is valid after MEDIA_EVENT_CLICK_LINK_HREF
+ ETargetType getClickTargetType() const { return mClickTargetType; };
+
std::string getMediaName() const { return mMediaName; };
std::string getMediaDescription() const { return mMediaDescription; };
@@ -344,6 +355,7 @@ protected:
std::string mLocation;
std::string mClickURL;
std::string mClickTarget;
+ ETargetType mClickTargetType;
/////////////////////////////////////////
// media_time class
diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp
index 845203b420ebb7e29ef5a70372462f6ba61948c1..a17e3063258f65d0c51ce7effbcef99be130e81b 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());
+ }
}
}
@@ -1065,10 +1067,6 @@ void LLFloater::setMinimized(BOOL minimize)
reshape( mExpandedRect.getWidth(), mExpandedRect.getHeight(), TRUE );
}
- // don't show the help button while minimized - it's
- // not very useful when minimized and uses up space
- mButtonsEnabled[BUTTON_HELP] = !minimize;
-
applyTitle ();
make_ui_sound("UISndWindowClose");
@@ -1741,14 +1739,32 @@ void LLFloater::updateButtons()
S32 button_count = 0;
for (S32 i = 0; i < BUTTON_COUNT; i++)
{
- if(!mButtons[i]) continue;
- mButtons[i]->setEnabled(mButtonsEnabled[i]);
+ if (!mButtons[i])
+ {
+ continue;
+ }
- if (mButtonsEnabled[i]
- //*HACK: always render close button for hosted floaters
- // so that users don't accidentally hit the button when closing multiple windows
- // in the chatterbox
- || (i == BUTTON_CLOSE && mButtonScale != 1.f))
+ bool enabled = mButtonsEnabled[i];
+ if (i == BUTTON_HELP)
+ {
+ // don't show the help button if the floater is minimized
+ // or if it is a tear-off hosted floater
+ if (isMinimized() || mButtonsEnabled[BUTTON_TEAR_OFF])
+ {
+ enabled = false;
+ }
+ }
+ if (i == BUTTON_CLOSE && mButtonScale != 1.f)
+ {
+ //*HACK: always render close button for hosted floaters so
+ //that users don't accidentally hit the button when
+ //closing multiple windows in the chatterbox
+ enabled = true;
+ }
+
+ mButtons[i]->setEnabled(enabled);
+
+ if (enabled)
{
button_count++;
@@ -1775,7 +1791,7 @@ void LLFloater::updateButtons()
// the restore button should have a tab stop so that it takes action when you Ctrl-Tab to a minimized floater
mButtons[i]->setTabStop(i == BUTTON_RESTORE);
}
- else if (mButtons[i])
+ else
{
mButtons[i]->setVisible(FALSE);
}
diff --git a/indra/llui/llmenugl.cpp b/indra/llui/llmenugl.cpp
index bd67949c2ae6c577c879759eddd148608321db47..21f3f15739061fb280407f3bf42c1463b0fdc6f6 100644
--- a/indra/llui/llmenugl.cpp
+++ b/indra/llui/llmenugl.cpp
@@ -2966,7 +2966,7 @@ void LLMenuGL::showPopup(LLView* spawning_view, LLMenuGL* menu, S32 x, S32 y)
LLUI::getMousePositionLocal(menu->getParent(), &mouse_x, &mouse_y);
LLMenuHolderGL::sContextMenuSpawnPos.set(mouse_x,mouse_y);
- const LLRect menu_region_rect = LLMenuGL::sMenuContainer->getMenuRect();
+ const LLRect menu_region_rect = LLMenuGL::sMenuContainer->getRect();
const S32 HPAD = 2;
LLRect rect = menu->getRect();
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/media_plugins/webkit/media_plugin_webkit.cpp b/indra/media_plugins/webkit/media_plugin_webkit.cpp
index a0336f6156c2a3d7fde5556160593264f028e3f5..084cdd9561a756e9065e7338bca9ca244e194428 100644
--- a/indra/media_plugins/webkit/media_plugin_webkit.cpp
+++ b/indra/media_plugins/webkit/media_plugin_webkit.cpp
@@ -429,6 +429,7 @@ private:
LLPluginMessage message(LLPLUGIN_MESSAGE_CLASS_MEDIA_BROWSER, "click_href");
message.setValue("uri", event.getStringValue());
message.setValue("target", event.getStringValue2());
+ message.setValueU32("target_type", event.getLinkType());
sendMessage(message);
}
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index 32761dbf275de3978a51d44ea0108c52751417a8..5b4edefbc13811ccd35552a0d1486112859b59d8 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -218,7 +218,6 @@ set(viewer_SOURCE_FILES
llfloaterurldisplay.cpp
llfloaterurlentry.cpp
llfloatervoicedevicesettings.cpp
- llfloatervolumepulldown.cpp
llfloaterwater.cpp
llfloaterwhitelistentry.cpp
llfloaterwindlight.cpp
@@ -256,6 +255,7 @@ set(viewer_SOURCE_FILES
llinspectgroup.cpp
llinspectobject.cpp
llinspectremoteobject.cpp
+ llinspecttoast.cpp
llinventorybridge.cpp
llinventoryclipboard.cpp
llinventoryfilter.cpp
@@ -355,6 +355,7 @@ set(viewer_SOURCE_FILES
llpanelshower.cpp
llpanelteleporthistory.cpp
llpanelvolume.cpp
+ llpanelvolumepulldown.cpp
llparcelselection.cpp
llparticipantlist.cpp
llpatchvertexarray.cpp
@@ -393,6 +394,7 @@ set(viewer_SOURCE_FILES
llspatialpartition.cpp
llspeakbutton.cpp
llspeakers.cpp
+ llspeakingindicatormanager.cpp
llsplitbutton.cpp
llsprite.cpp
llstartup.cpp
@@ -765,6 +767,7 @@ set(viewer_HEADER_FILES
llinspectgroup.h
llinspectobject.h
llinspectremoteobject.h
+ llinspecttoast.h
llinventorybridge.h
llinventoryclipboard.h
llinventoryfilter.h
@@ -860,6 +863,7 @@ set(viewer_HEADER_FILES
llpanelshower.h
llpanelteleporthistory.h
llpanelvolume.h
+ llpanelvolumepulldown.h
llparcelselection.h
llparticipantlist.h
llpatchvertexarray.h
@@ -900,6 +904,7 @@ set(viewer_HEADER_FILES
llspatialpartition.h
llspeakbutton.h
llspeakers.h
+ llspeakingindicatormanager.h
llsplitbutton.h
llsprite.h
llstartup.h
@@ -1770,6 +1775,7 @@ if (INSTALL)
endif (INSTALL)
if (LL_TESTS)
+else (LL_TESTS)
# To add a viewer unit test, just add the test .cpp file below
# This creates a separate test project per file listed.
include(LLAddBuildTest)
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 4bfc6f9e4f8adc82cbf59ca3bd3abedd6c0cc678..db759f052a5eb29d27c6496fcd450c145188a514 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/llagent.cpp b/indra/newview/llagent.cpp
index 5e2e374df65727a51af2d73023872ae1f211659b..5ea253709cf10ead3f79a71f3115d1a6642ce836 100644
--- a/indra/newview/llagent.cpp
+++ b/indra/newview/llagent.cpp
@@ -514,6 +514,8 @@ void LLAgent::resetView(BOOL reset_camera, BOOL change_camera)
}
setFocusOnAvatar(TRUE, ANIMATE);
+
+ mCameraFOVZoomFactor = 0.f;
}
mHUDTargetZoom = 1.f;
@@ -3584,7 +3586,7 @@ F32 LLAgent::calcCameraFOVZoomFactor()
{
return 0.f;
}
- else if (mFocusObject.notNull() && !mFocusObject->isAvatar())
+ else if (mFocusObject.notNull() && !mFocusObject->isAvatar() && !mFocusOnAvatar)
{
// don't FOV zoom on mostly transparent objects
LLVector3 focus_offset = mFocusObjectOffset;
@@ -5157,6 +5159,11 @@ BOOL LLAgent::setUserGroupFlags(const LLUUID& group_id, BOOL accept_notices, BOO
return FALSE;
}
+BOOL LLAgent::canJoinGroups() const
+{
+ return mGroups.count() < MAX_AGENT_GROUPS;
+}
+
LLQuaternion LLAgent::getHeadRotation()
{
if (mAvatarObject.isNull() || !mAvatarObject->mPelvisp || !mAvatarObject->mHeadp)
diff --git a/indra/newview/llagent.h b/indra/newview/llagent.h
index 2e95dc72be1fc0ce3dad966b5e427bdd5b93d42b..beede7fbe34829abf3e639b9c3df658bddd357ba 100644
--- a/indra/newview/llagent.h
+++ b/indra/newview/llagent.h
@@ -972,6 +972,7 @@ public:
BOOL setGroupContribution(const LLUUID& group_id, S32 contribution);
BOOL setUserGroupFlags(const LLUUID& group_id, BOOL accept_notices, BOOL list_in_profile);
const std::string &getGroupName() const { return mGroupName; }
+ BOOL canJoinGroups() const;
private:
std::string mGroupName;
LLUUID mGroupID;
diff --git a/indra/newview/llavatarlist.cpp b/indra/newview/llavatarlist.cpp
index 5df73a994e4d824e5f056c371967c214e81f1aef..19e9e52ddfd84ba001b79e7b6e0423cbdaf859a1 100644
--- a/indra/newview/llavatarlist.cpp
+++ b/indra/newview/llavatarlist.cpp
@@ -82,7 +82,7 @@ void LLAvatarList::setSpeakingIndicatorsVisible(bool visible)
getItems(items);
for( std::vector<LLPanel*>::const_iterator it = items.begin(); it != items.end(); it++)
{
- static_cast<LLAvatarListItem*>(*it)->setSpeakingIndicatorVisible(mShowSpeakingIndicator);
+ static_cast<LLAvatarListItem*>(*it)->showSpeakingIndicator(mShowSpeakingIndicator);
}
}
@@ -323,18 +323,15 @@ boost::signals2::connection LLAvatarList::setRefreshCompleteCallback(const commi
void LLAvatarList::addNewItem(const LLUUID& id, const std::string& name, BOOL is_online, EAddPosition pos)
{
LLAvatarListItem* item = new LLAvatarListItem();
- item->showInfoBtn(true);
- item->showSpeakingIndicator(true);
item->setName(name);
item->setAvatarId(id, mIgnoreOnlineStatus);
item->setOnline(mIgnoreOnlineStatus ? true : is_online);
item->showLastInteractionTime(mShowLastInteractionTime);
- item->childSetVisible("info_btn", false);
item->setAvatarIconVisible(mShowIcons);
item->setShowInfoBtn(mShowInfoBtn);
item->setShowProfileBtn(mShowProfileBtn);
- item->setSpeakingIndicatorVisible(mShowSpeakingIndicator);
+ item->showSpeakingIndicator(mShowSpeakingIndicator);
addItem(item, id, pos);
}
diff --git a/indra/newview/llavatarlistitem.cpp b/indra/newview/llavatarlistitem.cpp
index 6945ac69323318c5f6343733e7464bb227417a28..1043858373cd77d270dc561f4b2afb58ab48c723 100644
--- a/indra/newview/llavatarlistitem.cpp
+++ b/indra/newview/llavatarlistitem.cpp
@@ -44,10 +44,10 @@
#include "llbutton.h"
bool LLAvatarListItem::sStaticInitialized = false;
-S32 LLAvatarListItem::sIconWidth = 0;
-S32 LLAvatarListItem::sInfoBtnWidth = 0;
-S32 LLAvatarListItem::sProfileBtnWidth = 0;
-S32 LLAvatarListItem::sSpeakingIndicatorWidth = 0;
+S32 LLAvatarListItem::sLeftPadding = 0;
+S32 LLAvatarListItem::sRightNamePadding = 0;
+S32 LLAvatarListItem::sChildrenWidths[LLAvatarListItem::ALIC_COUNT];
+
LLAvatarListItem::LLAvatarListItem(bool not_from_ui_factory/* = true*/)
: LLPanel(),
@@ -91,43 +91,25 @@ BOOL LLAvatarListItem::postBuild()
mProfileBtn->setVisible(false);
mProfileBtn->setClickedCallback(boost::bind(&LLAvatarListItem::onProfileBtnClick, this));
- // Remember avatar icon width including its padding from the name text box,
- // so that we can hide and show the icon again later.
if (!sStaticInitialized)
{
- sIconWidth = mAvatarName->getRect().mLeft - mAvatarIcon->getRect().mLeft;
- sInfoBtnWidth = mInfoBtn->getRect().mRight - mSpeakingIndicator->getRect().mRight;
- sProfileBtnWidth = mProfileBtn->getRect().mRight - mInfoBtn->getRect().mRight;
- sSpeakingIndicatorWidth = mSpeakingIndicator->getRect().mRight - mAvatarName->getRect().mRight;
+ // Remember children widths including their padding from the next sibling,
+ // so that we can hide and show them again later.
+ initChildrenWidths(this);
sStaticInitialized = true;
}
-/*
- if(!p.buttons.profile)
- {
- delete mProfile;
- mProfile = NULL;
-
- LLRect rect;
-
- rect.setLeftTopAndSize(mName->getRect().mLeft, mName->getRect().mTop, mName->getRect().getWidth() + 30, mName->getRect().getHeight());
- mName->setRect(rect);
-
- if(mLocator)
- {
- rect.setLeftTopAndSize(mLocator->getRect().mLeft + 30, mLocator->getRect().mTop, mLocator->getRect().getWidth(), mLocator->getRect().getHeight());
- mLocator->setRect(rect);
- }
+ return TRUE;
+}
- if(mInfo)
- {
- rect.setLeftTopAndSize(mInfo->getRect().mLeft + 30, mInfo->getRect().mTop, mInfo->getRect().getWidth(), mInfo->getRect().getHeight());
- mInfo->setRect(rect);
- }
+S32 LLAvatarListItem::notifyParent(const LLSD& info)
+{
+ if (info.has("visibility_changed"))
+ {
+ updateChildren();
}
-*/
- return TRUE;
+ return 0;
}
void LLAvatarListItem::onMouseEnter(S32 x, S32 y, MASK mask)
@@ -137,6 +119,8 @@ void LLAvatarListItem::onMouseEnter(S32 x, S32 y, MASK mask)
mProfileBtn->setVisible(mShowProfileBtn);
LLPanel::onMouseEnter(x, y, mask);
+
+ updateChildren();
}
void LLAvatarListItem::onMouseLeave(S32 x, S32 y, MASK mask)
@@ -146,6 +130,8 @@ void LLAvatarListItem::onMouseLeave(S32 x, S32 y, MASK mask)
mProfileBtn->setVisible(false);
LLPanel::onMouseLeave(x, y, mask);
+
+ updateChildren();
}
// virtual, called by LLAvatarTracker
@@ -215,12 +201,8 @@ void LLAvatarListItem::showLastInteractionTime(bool show)
if (show)
return;
- LLRect name_rect = mAvatarName->getRect();
- LLRect time_rect = mLastInteractionTime->getRect();
-
mLastInteractionTime->setVisible(false);
- name_rect.mRight += (time_rect.mRight - name_rect.mRight);
- mAvatarName->setRect(name_rect);
+ updateChildren();
}
void LLAvatarListItem::setLastInteractionTime(U32 secs_since)
@@ -234,12 +216,6 @@ void LLAvatarListItem::setShowInfoBtn(bool show)
if(mShowInfoBtn == show)
return;
mShowInfoBtn = show;
- S32 width_delta = show ? - sInfoBtnWidth : sInfoBtnWidth;
-
- //Translating speaking indicator
- mSpeakingIndicator->translate(width_delta, 0);
- //Reshaping avatar name
- mAvatarName->reshape(mAvatarName->getRect().getWidth() + width_delta, mAvatarName->getRect().getHeight());
}
void LLAvatarListItem::setShowProfileBtn(bool show)
@@ -248,24 +224,17 @@ void LLAvatarListItem::setShowProfileBtn(bool show)
if(mShowProfileBtn == show)
return;
mShowProfileBtn = show;
- S32 width_delta = show ? - sProfileBtnWidth : sProfileBtnWidth;
-
- //Translating speaking indicator
- mSpeakingIndicator->translate(width_delta, 0);
- //Reshaping avatar name
- mAvatarName->reshape(mAvatarName->getRect().getWidth() + width_delta, mAvatarName->getRect().getHeight());
}
-void LLAvatarListItem::setSpeakingIndicatorVisible(bool visible)
+void LLAvatarListItem::showSpeakingIndicator(bool visible)
{
// Already done? Then do nothing.
if (mSpeakingIndicator->getVisible() == (BOOL)visible)
return;
- mSpeakingIndicator->setVisible(visible);
- S32 width_delta = visible ? - sSpeakingIndicatorWidth : sSpeakingIndicatorWidth;
-
- //Reshaping avatar name
- mAvatarName->reshape(mAvatarName->getRect().getWidth() + width_delta, mAvatarName->getRect().getHeight());
+// Disabled to not contradict with SpeakingIndicatorManager functionality. EXT-3976
+// probably this method should be totally removed.
+// mSpeakingIndicator->setVisible(visible);
+// updateChildren();
}
void LLAvatarListItem::setAvatarIconVisible(bool visible)
@@ -276,36 +245,12 @@ void LLAvatarListItem::setAvatarIconVisible(bool visible)
// Show/hide avatar icon.
mAvatarIcon->setVisible(visible);
-
- // Move the avatar name horizontally by icon size + its distance from the avatar name.
- LLRect name_rect = mAvatarName->getRect();
- name_rect.mLeft += visible ? sIconWidth : -sIconWidth;
- mAvatarName->setRect(name_rect);
+ updateChildren();
}
void LLAvatarListItem::onInfoBtnClick()
{
LLFloaterReg::showInstance("inspect_avatar", LLSD().with("avatar_id", mAvatarId));
-
- /* TODO fix positioning of inspector
- localPointToScreen(mXPos, mYPos, &mXPos, &mYPos);
-
-
- LLRect rect;
-
- // *TODO Vadim: rewrite this. "+= -" looks weird.
- S32 delta = mYPos - inspector->getRect().getHeight();
- if(delta < 0)
- {
- mYPos += -delta;
- }
-
- rect.setLeftTopAndSize(mXPos, mYPos,
- inspector->getRect().getWidth(), inspector->getRect().getHeight());
- inspector->setRect(rect);
- inspector->setFrontmost(true);
- inspector->setVisible(true);
- */
}
void LLAvatarListItem::onProfileBtnClick()
@@ -344,21 +289,6 @@ void LLAvatarListItem::onNameCache(const std::string& first_name, const std::str
setName(name);
}
-void LLAvatarListItem::reshapeAvatarName()
-{
- S32 width_delta = 0;
- width_delta += mShowProfileBtn ? sProfileBtnWidth : 0;
- width_delta += mSpeakingIndicator->getVisible() ? sSpeakingIndicatorWidth : 0;
- width_delta += mAvatarIcon->getVisible() ? sIconWidth : 0;
- width_delta += mShowInfoBtn ? sInfoBtnWidth : 0;
- width_delta += mLastInteractionTime->getVisible() ? mLastInteractionTime->getRect().getWidth() : 0;
-
- S32 height = mAvatarName->getRect().getHeight();
- S32 width = getRect().getWidth() - width_delta;
-
- mAvatarName->reshape(width, height);
-}
-
// Convert given number of seconds to a string like "23 minutes", "15 hours" or "3 years",
// taking i18n into account. The format string to use is taken from the panel XML.
std::string LLAvatarListItem::formatSeconds(U32 secs)
@@ -492,4 +422,133 @@ LLAvatarListItem::icon_color_map_t& LLAvatarListItem::getItemIconColorMap()
return item_icon_color_map;
}
+// static
+void LLAvatarListItem::initChildrenWidths(LLAvatarListItem* avatar_item)
+{
+ //profile btn width + padding
+ S32 profile_btn_width = avatar_item->getRect().getWidth() - avatar_item->mProfileBtn->getRect().mLeft;
+
+ //info btn width + padding
+ S32 info_btn_width = avatar_item->mProfileBtn->getRect().mLeft - avatar_item->mInfoBtn->getRect().mLeft;
+
+ //speaking indicator width + padding
+ S32 speaking_indicator_width = avatar_item->mInfoBtn->getRect().mLeft - avatar_item->mSpeakingIndicator->getRect().mLeft;
+
+ // last interaction time textbox width + padding
+ S32 last_interaction_time_width = avatar_item->mSpeakingIndicator->getRect().mLeft - avatar_item->mLastInteractionTime->getRect().mLeft;
+
+ // icon width + padding
+ S32 icon_width = avatar_item->mAvatarName->getRect().mLeft - avatar_item->mAvatarIcon->getRect().mLeft;
+
+ sLeftPadding = avatar_item->mAvatarIcon->getRect().mLeft;
+ sRightNamePadding = avatar_item->mLastInteractionTime->getRect().mLeft - avatar_item->mAvatarName->getRect().mRight;
+
+ S32 index = ALIC_COUNT;
+ sChildrenWidths[--index] = icon_width;
+ sChildrenWidths[--index] = 0; // for avatar name we don't need its width, it will be calculated as "left available space"
+ sChildrenWidths[--index] = last_interaction_time_width;
+ sChildrenWidths[--index] = speaking_indicator_width;
+ sChildrenWidths[--index] = info_btn_width;
+ sChildrenWidths[--index] = profile_btn_width;
+}
+
+void LLAvatarListItem::updateChildren()
+{
+ LL_DEBUGS("AvatarItemReshape") << LL_ENDL;
+ LL_DEBUGS("AvatarItemReshape") << "Updating for: " << getAvatarName() << LL_ENDL;
+
+ S32 name_new_width = getRect().getWidth();
+ S32 ctrl_new_left = name_new_width;
+ S32 name_new_left = sLeftPadding;
+
+ // iterate through all children and set them into correct position depend on each child visibility
+ // assume that child indexes are in back order: the first in Enum is the last (right) in the item
+ // iterate & set child views starting from right to left
+ for (S32 i = 0; i < ALIC_COUNT; ++i)
+ {
+ // skip "name" textbox, it will be processed out of loop later
+ if (ALIC_NAME == i) continue;
+
+ LLView* control = getItemChildView((EAvatarListItemChildIndex)i);
+
+ LL_DEBUGS("AvatarItemReshape") << "Processing control: " << control->getName() << LL_ENDL;
+ // skip invisible views
+ if (!control->getVisible()) continue;
+
+ S32 ctrl_width = sChildrenWidths[i]; // including space between current & left controls
+
+ // decrease available for
+ name_new_width -= ctrl_width;
+ LL_DEBUGS("AvatarItemReshape") << "width: " << ctrl_width << ", name_new_width: " << name_new_width << LL_ENDL;
+
+ LLRect control_rect = control->getRect();
+ LL_DEBUGS("AvatarItemReshape") << "rect before: " << control_rect << LL_ENDL;
+
+ if (ALIC_ICON == i)
+ {
+ // assume that this is the last iteration,
+ // so it is not necessary to save "ctrl_new_left" value calculated on previous iterations
+ ctrl_new_left = sLeftPadding;
+ name_new_left = ctrl_new_left + ctrl_width;
+ }
+ else
+ {
+ ctrl_new_left -= ctrl_width;
+ }
+
+ LL_DEBUGS("AvatarItemReshape") << "ctrl_new_left: " << ctrl_new_left << LL_ENDL;
+
+ control_rect.setLeftTopAndSize(
+ ctrl_new_left,
+ control_rect.mTop,
+ control_rect.getWidth(),
+ control_rect.getHeight());
+
+ LL_DEBUGS("AvatarItemReshape") << "rect after: " << control_rect << LL_ENDL;
+ control->setShape(control_rect);
+ }
+
+ // set size and position of the "name" child
+ LLView* name_view = getItemChildView(ALIC_NAME);
+ LLRect name_view_rect = name_view->getRect();
+ LL_DEBUGS("AvatarItemReshape") << "name rect before: " << name_view_rect << LL_ENDL;
+
+ // apply paddings
+ name_new_width -= sLeftPadding;
+ name_new_width -= sRightNamePadding;
+
+ name_view_rect.setLeftTopAndSize(
+ name_new_left,
+ name_view_rect.mTop,
+ name_new_width,
+ name_view_rect.getHeight());
+
+ name_view->setShape(name_view_rect);
+
+ LL_DEBUGS("AvatarItemReshape") << "name rect after: " << name_view_rect << LL_ENDL;
+}
+
+LLView* LLAvatarListItem::getItemChildView(EAvatarListItemChildIndex child_view_index)
+{
+ LLView* child_view = mAvatarName;
+ if (child_view_index < 0 || ALIC_COUNT <= child_view_index)
+ {
+ LL_WARNS("AvatarItemReshape") << "Child view index is out of range: " << child_view_index << LL_ENDL;
+ return child_view;
+ }
+ switch (child_view_index)
+ {
+ case ALIC_ICON: child_view = mAvatarIcon; break;
+ case ALIC_NAME: child_view = mAvatarName; break;
+ case ALIC_INTERACTION_TIME: child_view = mLastInteractionTime; break;
+ case ALIC_SPEAKER_INDICATOR: child_view = mSpeakingIndicator; break;
+ case ALIC_INFO_BUTTON: child_view = mInfoBtn; break;
+ case ALIC_PROFILE_BUTTON: child_view = mProfileBtn; break;
+ default:
+ LL_WARNS("AvatarItemReshape") << "Unexpected child view index is passed: " << child_view_index << LL_ENDL;
+ }
+
+ return child_view;
+}
+
// EOF
diff --git a/indra/newview/llavatarlistitem.h b/indra/newview/llavatarlistitem.h
index 96097bc9b52dc2e07c5a5baafb222b3ec745dd8d..f76ffb391d455a9bd1f3c2bfbabe026976dacfce 100644
--- a/indra/newview/llavatarlistitem.h
+++ b/indra/newview/llavatarlistitem.h
@@ -74,6 +74,11 @@ public:
virtual ~LLAvatarListItem();
virtual BOOL postBuild();
+
+ /**
+ * Processes notification from speaker indicator to update children when indicator's visibility is changed.
+ */
+ virtual S32 notifyParent(const LLSD& info);
virtual void onMouseLeave(S32 x, S32 y, MASK mask);
virtual void onMouseEnter(S32 x, S32 y, MASK mask);
virtual void setValue(const LLSD& value);
@@ -88,7 +93,8 @@ public:
//Show/hide profile/info btn, translating speaker indicator and avatar name coordinates accordingly
void setShowProfileBtn(bool show);
void setShowInfoBtn(bool show);
- void setSpeakingIndicatorVisible(bool visible);
+ void showSpeakingIndicator(bool show);
+ void showLastInteractionTime(bool show);
void setAvatarIconVisible(bool visible);
const LLUUID& getAvatarId() const;
@@ -97,17 +103,6 @@ public:
void onInfoBtnClick();
void onProfileBtnClick();
- void showSpeakingIndicator(bool show) { mSpeakingIndicator->setVisible(show); }
- void showInfoBtn(bool show_info_btn) {mInfoBtn->setVisible(show_info_btn); }
- void showLastInteractionTime(bool show);
-
- /**
- * This method was added to fix EXT-2364 (Items in group/ad-hoc IM participant list (avatar names) should be reshaped when adding/removing the "(Moderator)" label)
- * But this is a *HACK. The real reason of it was in incorrect logic while hiding profile/info/speaker buttons
- * *TODO: new reshape method should be provided in lieu of this one to be called when visibility if those buttons is changed
- */
- void reshapeAvatarName();
-
protected:
/**
* Contains indicator to show voice activity.
@@ -124,6 +119,23 @@ private:
E_UNKNOWN,
} EOnlineStatus;
+ /**
+ * Enumeration of item elements in order from right to left.
+ *
+ * updateChildren() assumes that indexes are in the such order to process avatar icon easier.
+ *
+ * @see updateChildren()
+ */
+ typedef enum e_avatar_item_child {
+ ALIC_PROFILE_BUTTON,
+ ALIC_INFO_BUTTON,
+ ALIC_SPEAKER_INDICATOR,
+ ALIC_INTERACTION_TIME,
+ ALIC_NAME,
+ ALIC_ICON,
+ ALIC_COUNT,
+ } EAvatarListItemChildIndex;
+
void setNameInternal(const std::string& name, const std::string& highlight);
void onNameCache(const std::string& first_name, const std::string& last_name);
@@ -135,6 +147,26 @@ private:
typedef std::map<EItemState, LLColor4> icon_color_map_t;
static icon_color_map_t& getItemIconColorMap();
+ /**
+ * Initializes widths of all children to use them while changing visibility of any of them.
+ *
+ * @see updateChildren()
+ */
+ static void initChildrenWidths(LLAvatarListItem* self);
+
+ /**
+ * Updates position and rectangle of visible children to fit all available item's width.
+ */
+ void updateChildren();
+
+ /**
+ * Gets child view specified by index.
+ *
+ * This method implemented via switch by all EAvatarListItemChildIndex values.
+ * It is used to not store children in array or vector to avoid of increasing memory usage.
+ */
+ LLView* getItemChildView(EAvatarListItemChildIndex child_index);
+
LLTextBox* mAvatarName;
LLTextBox* mLastInteractionTime;
LLStyle::Params mAvatarNameStyle;
@@ -151,10 +183,17 @@ private:
bool mShowProfileBtn;
static bool sStaticInitialized; // this variable is introduced to improve code readability
- static S32 sIconWidth; // icon width + padding
- static S32 sInfoBtnWidth; //info btn width + padding
- static S32 sProfileBtnWidth; //profile btn width + padding
- static S32 sSpeakingIndicatorWidth; //speaking indicator width + padding
+ static S32 sLeftPadding; // padding to first left visible child (icon or name)
+ static S32 sRightNamePadding; // right padding from name to next visible child
+
+ /**
+ * Contains widths of each child specified by EAvatarListItemChildIndex
+ * including padding to the next right one.
+ *
+ * @see initChildrenWidths()
+ */
+ static S32 sChildrenWidths[ALIC_COUNT];
+
};
#endif //LL_LLAVATARLISTITEM_H
diff --git a/indra/newview/llbottomtray.cpp b/indra/newview/llbottomtray.cpp
index 976b31250935be56f769cb3ac3d15631994b4d0a..beccefa430161c70ba9324a3befb5744ce53f221 100644
--- a/indra/newview/llbottomtray.cpp
+++ b/indra/newview/llbottomtray.cpp
@@ -161,6 +161,9 @@ void LLBottomTray::sessionAdded(const LLUUID& session_id, const std::string& nam
{
chiclet->setIMSessionName(name);
chiclet->setOtherParticipantId(other_participant_id);
+
+ LLIMFloater::onIMChicletCreated(session_id);
+
}
else
{
@@ -251,14 +254,24 @@ void LLBottomTray::setVisible(BOOL visible)
{
LLView* viewp = *child_it;
std::string name = viewp->getName();
-
- if ("chat_bar" == name || "movement_panel" == name || "cam_panel" == name || "snapshot_panel" == name || "gesture_panel" == name)
+
+ // Chat bar and gesture button are shown even in mouselook mode. But the move, camera and snapshot buttons shouldn't be displayed. See EXT-3988.
+ if ("chat_bar" == name || "gesture_panel" == name || (visibility && ("movement_panel" == name || "cam_panel" == name || "snapshot_panel" == name)))
continue;
else
{
viewp->setVisible(visibility);
}
}
+
+ // Apply the saved settings when we are not in mouselook mode, see EXT-3988.
+ if (visibility)
+ {
+ showCameraButton(gSavedSettings.getBOOL("ShowCameraButton"));
+ showSnapshotButton(gSavedSettings.getBOOL("ShowSnapshotButton"));
+ showMoveButton(gSavedSettings.getBOOL("ShowMoveButton"));
+ showGestureButton(gSavedSettings.getBOOL("ShowGestureButton"));
+ }
}
}
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/llchathistory.cpp b/indra/newview/llchathistory.cpp
index cda3e3a4191c6e6eb80ef9ded69ffc2c82b1a752..2fc83c7e54fbcfbb95f063ab55f49ec42f4e8c08 100644
--- a/indra/newview/llchathistory.cpp
+++ b/indra/newview/llchathistory.cpp
@@ -499,7 +499,24 @@ void LLChatHistory::appendMessage(const LLChat& chat, const bool use_plain_text_
style_params.font.name(font_name);
style_params.font.size(font_size);
style_params.font.style(input_append_params.font.style);
-
+
+ std::string prefix = chat.mText.substr(0, 4);
+
+ //IRC styled /me messages.
+ bool irc_me = prefix == "/me " || prefix == "/me'";
+
+ // Delimiter after a name in header copy/past and in plain text mode
+ std::string delimiter = (chat.mChatType != CHAT_TYPE_SHOUT && chat.mChatType != CHAT_TYPE_WHISPER)
+ ? ": "
+ : " ";
+
+ // Don't add any delimiter after name in irc styled messages
+ if (irc_me || chat.mChatStyle == CHAT_STYLE_IRC)
+ {
+ delimiter = LLStringUtil::null;
+ style_params.font.style = "ITALIC";
+ }
+
if (use_plain_text_chat_history)
{
mEditor->appendText("[" + chat.mTimeStr + "] ", mEditor->getText().size() != 0, style_params);
@@ -512,11 +529,11 @@ void LLChatHistory::appendMessage(const LLChat& chat, const bool use_plain_text_
LLStyle::Params link_params(style_params);
link_params.fillFrom(LLStyleMap::instance().lookupAgent(chat.mFromID));
// Convert the name to a hotlink and add to message.
- mEditor->appendText(chat.mFromName + ": ", false, link_params);
+ mEditor->appendText(chat.mFromName + delimiter, false, link_params);
}
else
{
- mEditor->appendText(chat.mFromName + ": ", false, style_params);
+ mEditor->appendText(chat.mFromName + delimiter, false, style_params);
}
}
}
@@ -562,36 +579,22 @@ void LLChatHistory::appendMessage(const LLChat& chat, const bool use_plain_text_
std::string header_text = "[" + chat.mTimeStr + "] ";
if (utf8str_trim(chat.mFromName).size() != 0 && chat.mFromName != SYSTEM_FROM)
- header_text += chat.mFromName + ": ";
+ header_text += chat.mFromName + delimiter;
mEditor->appendWidget(p, header_text, false);
mLastFromName = chat.mFromName;
mLastFromID = chat.mFromID;
mLastMessageTime = new_message_time;
}
- //Handle IRC styled /me messages.
- std::string prefix = chat.mText.substr(0, 4);
- if (prefix == "/me " || prefix == "/me'")
- {
- style_params.font.style = "ITALIC";
- if (chat.mFromName.size() > 0)
- mEditor->appendText(chat.mFromName, TRUE, style_params);
+ std::string message = irc_me ? chat.mText.substr(3) : chat.mText;
+ if ( message.size() > 0 && !LLStringOps::isSpace(message[message.size() - 1]) )
+ {
// Ensure that message ends with NewLine, to avoid losing of new lines
// while copy/paste from text chat. See EXT-3263.
- mEditor->appendText(chat.mText.substr(3) + NEW_LINE, FALSE, style_params);
- }
- else
- {
- std::string message(chat.mText);
- if ( message.size() > 0 && !LLStringOps::isSpace(message[message.size() - 1]) )
- {
- // Ensure that message ends with NewLine, to avoid losing of new lines
- // while copy/paste from text chat. See EXT-3263.
- message += NEW_LINE;
- }
- mEditor->appendText(message, FALSE, style_params);
+ message += NEW_LINE;
}
+ mEditor->appendText(message, FALSE, style_params);
mEditor->blockUndo();
// automatically scroll to end when receiving chat from myself
diff --git a/indra/newview/llfloaterabout.cpp b/indra/newview/llfloaterabout.cpp
index aa343b2f6972260b26cf926c452e619083648b4f..ef69f39ad2df5b575ecc7aac9d7575b45c638a94 100644
--- a/indra/newview/llfloaterabout.cpp
+++ b/indra/newview/llfloaterabout.cpp
@@ -269,7 +269,7 @@ LLSD LLFloaterAbout::getInfo()
info["VIVOX_VERSION"] = gVoiceClient ? gVoiceClient->getAPIVersion() : LLTrans::getString("NotConnected");
// TODO: Implement media plugin version query
- info["QT_WEBKIT_VERSION"] = "4.5.2 (version number hard-coded)";
+ info["QT_WEBKIT_VERSION"] = "4.6 (version number hard-coded)";
if (gPacketsIn > 0)
{
diff --git a/indra/newview/llfloaterchat.cpp b/indra/newview/llfloaterchat.cpp
index b9e0f928f14dc1271053c3741c86d13073af01be..18b9f0484fd237c4c5662eaeb84b45dd02995180 100644
--- a/indra/newview/llfloaterchat.cpp
+++ b/indra/newview/llfloaterchat.cpp
@@ -190,7 +190,14 @@ void LLFloaterChat::addChatHistory(const LLChat& chat, bool log_to_file)
{
if (log_to_file && (gSavedPerAccountSettings.getBOOL("LogChat")))
{
- LLLogChat::saveHistory("chat", chat.mFromName, chat.mFromID, chat.mText);
+ if (chat.mChatType != CHAT_TYPE_WHISPER && chat.mChatType != CHAT_TYPE_SHOUT)
+ {
+ LLLogChat::saveHistory("chat", chat.mFromName, chat.mFromID, chat.mText);
+ }
+ else
+ {
+ LLLogChat::saveHistory("chat", "", chat.mFromID, chat.mFromName + " " + chat.mText);
+ }
}
LLColor4 color = get_text_color(chat);
@@ -311,8 +318,10 @@ void LLFloaterChat::addChat(const LLChat& chat, BOOL from_instant_message, BOOL
triggerAlerts(chat.mText);
// Add the sender to the list of people with which we've recently interacted.
- if(chat.mSourceType == CHAT_SOURCE_AGENT && chat.mFromID.notNull())
- LLRecentPeople::instance().add(chat.mFromID);
+ // this is not the best place to add _all_ messages to recent list
+ // comment this for now, may remove later on code cleanup
+ //if(chat.mSourceType == CHAT_SOURCE_AGENT && chat.mFromID.notNull())
+ // LLRecentPeople::instance().add(chat.mFromID);
bool add_chat = true;
bool log_chat = true;
diff --git a/indra/newview/llfloatergesture.cpp b/indra/newview/llfloatergesture.cpp
index 5072bc8c8201007f07d82f8293b2716692287b5f..6a9c602db2032d206e4d0d500b8c44a90542ed02 100644
--- a/indra/newview/llfloatergesture.cpp
+++ b/indra/newview/llfloatergesture.cpp
@@ -415,7 +415,7 @@ void LLFloaterGesture::onClickPlay()
LL_DEBUGS("Gesture")<<" Trying to play gesture id: "<< item_id <<LL_ENDL;
if(!LLGestureManager::instance().isGestureActive(item_id))
{
- // we need to inform server about gesture activating to be consistent with LLPreviewGesture and LLGestureComboBox.
+ // we need to inform server about gesture activating to be consistent with LLPreviewGesture and LLGestureComboList.
BOOL inform_server = TRUE;
BOOL deactivate_similar = FALSE;
LLGestureManager::instance().setGestureLoadedCallback(item_id, boost::bind(&LLFloaterGesture::playGesture, this, item_id));
diff --git a/indra/newview/llfloatergroups.cpp b/indra/newview/llfloatergroups.cpp
index 7cb925bc0b09a8d795cc9761cb3f41bc812e0421..29f415bd43904b5288ab32731908e34d4ea080e3 100644
--- a/indra/newview/llfloatergroups.cpp
+++ b/indra/newview/llfloatergroups.cpp
@@ -247,14 +247,7 @@ void LLPanelGroups::enableButtons()
childDisable("IM");
childDisable("Leave");
}
- if(gAgent.mGroups.count() < MAX_AGENT_GROUPS)
- {
- childEnable("Create");
- }
- else
- {
- childDisable("Create");
- }
+ childSetEnabled("Create", gAgent.canJoinGroups());
}
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/llgesturemgr.cpp b/indra/newview/llgesturemgr.cpp
index df7aa9eabf387adbaaa4e192d3a9a53d0f507a52..82293b4aa0b6fcb7a67c076894b9e151357359ad 100644
--- a/indra/newview/llgesturemgr.cpp
+++ b/indra/newview/llgesturemgr.cpp
@@ -417,6 +417,16 @@ BOOL LLGestureManager::isGesturePlaying(const LLUUID& item_id)
return gesture->mPlaying;
}
+BOOL LLGestureManager::isGesturePlaying(LLMultiGesture* gesture)
+{
+ if(!gesture)
+ {
+ return FALSE;
+ }
+
+ return gesture->mPlaying;
+}
+
void LLGestureManager::replaceGesture(const LLUUID& item_id, LLMultiGesture* new_gesture, const LLUUID& asset_id)
{
const LLUUID& base_item_id = get_linked_uuid(item_id);
diff --git a/indra/newview/llgesturemgr.h b/indra/newview/llgesturemgr.h
index e80eea9ae90accc48d0c310da5f828e979e68d41..c562587c6fd75f9b6734b3815e82b3d143837f45 100644
--- a/indra/newview/llgesturemgr.h
+++ b/indra/newview/llgesturemgr.h
@@ -103,6 +103,8 @@ public:
BOOL isGesturePlaying(const LLUUID& item_id);
+ BOOL isGesturePlaying(LLMultiGesture* gesture);
+
const item_map_t& getActiveGestures() const { return mActive; }
// Force a gesture to be played, for example, if it is being
// previewed.
diff --git a/indra/newview/llgroupactions.cpp b/indra/newview/llgroupactions.cpp
index 7dd8ea694e9b061f2721b36870ddd523ccfaf4dc..d6e2bb0445f47ff2e90d9bedd67e91dec101faaf 100644
--- a/indra/newview/llgroupactions.cpp
+++ b/indra/newview/llgroupactions.cpp
@@ -146,6 +146,12 @@ void LLGroupActions::startCall(const LLUUID& group_id)
// static
void LLGroupActions::join(const LLUUID& group_id)
{
+ if (!gAgent.canJoinGroups())
+ {
+ LLNotificationsUtil::add("JoinedTooManyGroups");
+ return;
+ }
+
LLGroupMgrGroupData* gdatap =
LLGroupMgr::getInstance()->getGroupData(group_id);
@@ -226,7 +232,9 @@ void LLGroupActions::activate(const LLUUID& group_id)
static bool isGroupUIVisible()
{
- LLPanel* panel = LLSideTray::getInstance()->findChild<LLPanel>("panel_group_info_sidetray");
+ static LLPanel* panel = 0;
+ if(!panel)
+ panel = LLSideTray::getInstance()->findChild<LLPanel>("panel_group_info_sidetray");
if(!panel)
return false;
return panel->isInVisibleChain();
diff --git a/indra/newview/llimfloater.cpp b/indra/newview/llimfloater.cpp
index b05568f353f07dd9fd966785e9b26bc103aec941..aee34eb0af54b6f060eb1a6af83fa1f1820cdc16 100644
--- a/indra/newview/llimfloater.cpp
+++ b/indra/newview/llimfloater.cpp
@@ -361,35 +361,7 @@ LLIMFloater* LLIMFloater::show(const LLUUID& session_id)
{
if (!gIMMgr->hasSession(session_id)) return NULL;
- // we should make sure all related chiclets are in place when the session is a voice call
- // chiclets come firts, then comes IM window
- if (gIMMgr->isVoiceCall(session_id))
- {
- LLIMModel* im_model = LLIMModel::getInstance();
- LLBottomTray* b_tray = LLBottomTray::getInstance();
-
- //*TODO hide that into Bottom tray
- if (!b_tray->getChicletPanel()->findChiclet<LLChiclet>(session_id))
- {
- LLIMChiclet* chiclet = b_tray->createIMChiclet(session_id);
- if(chiclet)
- {
- chiclet->setIMSessionName(im_model->getName(session_id));
- chiclet->setOtherParticipantId(im_model->getOtherParticipantID(session_id));
- }
- }
-
- LLIMWellWindow::getInstance()->addIMRow(session_id);
- }
-
- bool not_existed = true;
-
- if(isChatMultiTab())
- {
- LLIMFloater* target_floater = findInstance(session_id);
- not_existed = NULL == target_floater;
- }
- else
+ if(!isChatMultiTab())
{
//hide all
LLFloaterReg::const_instance_list_t& inst_list = LLFloaterReg::getFloaterList("impanel");
@@ -404,19 +376,33 @@ LLIMFloater* LLIMFloater::show(const LLUUID& session_id)
}
}
- LLIMFloater* floater = LLFloaterReg::showTypedInstance<LLIMFloater>("impanel", session_id);
+ bool exist = findInstance(session_id);
+
+ LLIMFloater* floater = getInstance(session_id);
+ if (!floater) return NULL;
if(isChatMultiTab())
{
+ LLIMFloaterContainer* floater_container = LLIMFloaterContainer::getInstance();
+
// do not add existed floaters to avoid adding torn off instances
- if (not_existed)
+ if (!exist)
{
// LLTabContainer::eInsertionPoint i_pt = user_initiated ? LLTabContainer::RIGHT_OF_CURRENT : LLTabContainer::END;
// TODO: mantipov: use LLTabContainer::RIGHT_OF_CURRENT if it exists
LLTabContainer::eInsertionPoint i_pt = LLTabContainer::END;
+
+ if (floater_container)
+ {
+ floater_container->addFloater(floater, TRUE, i_pt);
+ }
+ }
- LLIMFloaterContainer* floater_container = LLFloaterReg::showTypedInstance<LLIMFloaterContainer>("im_container");
- floater_container->addFloater(floater, TRUE, i_pt);
+ if (floater_container)
+ {
+ //selecting the panel resets a chiclet's counter
+ floater_container->selectFloater(floater);
+ floater_container->setVisible(TRUE);
}
}
else
@@ -443,8 +429,8 @@ LLIMFloater* LLIMFloater::show(const LLUUID& session_id)
}
// window is positioned, now we can show it.
- floater->setVisible(true);
}
+ floater->setVisible(TRUE);
return floater;
}
@@ -484,16 +470,6 @@ void LLIMFloater::setDocked(bool docked, bool pop_on_undock)
}
}
-void LLIMFloater::setTornOff(bool torn_off)
-{
- // When IM Floater isn't torn off, "close" button should be hidden.
- // This call will just disables it, since there is a hack in LLFloater::updateButton,
- // which prevents hiding of close button in that case.
- setCanClose(torn_off);
-
- LLTransientDockableFloater::setTornOff(torn_off);
-}
-
void LLIMFloater::setVisible(BOOL visible)
{
LLNotificationsUI::LLScreenChannel* channel = dynamic_cast<LLNotificationsUI::LLScreenChannel*>
@@ -548,6 +524,11 @@ LLIMFloater* LLIMFloater::findInstance(const LLUUID& session_id)
return LLFloaterReg::findTypedInstance<LLIMFloater>("impanel", session_id);
}
+LLIMFloater* LLIMFloater::getInstance(const LLUUID& session_id)
+{
+ return LLFloaterReg::getTypedInstance<LLIMFloater>("impanel", session_id);
+}
+
void LLIMFloater::sessionInitReplyReceived(const LLUUID& im_session_id)
{
mSessionInitialized = true;
@@ -1026,3 +1007,20 @@ void LLIMFloater::sRemoveTypingIndicator(const LLSD& data)
floater->removeTypingIndicator();
}
+
+void LLIMFloater::onIMChicletCreated( const LLUUID& session_id )
+{
+
+ if (isChatMultiTab())
+ {
+ LLIMFloaterContainer* im_box = LLIMFloaterContainer::getInstance();
+ if (!im_box) return;
+
+ if (LLIMFloater::findInstance(session_id)) return;
+
+ LLIMFloater* new_tab = LLIMFloater::getInstance(session_id);
+
+ im_box->addFloater(new_tab, FALSE, LLTabContainer::END);
+ }
+
+}
diff --git a/indra/newview/llimfloater.h b/indra/newview/llimfloater.h
index bc7a43e852a2a9da3dc49f8e4c4e644873b453ab..d9db385d06a0fb581ece415e524650113d9a34e2 100644
--- a/indra/newview/llimfloater.h
+++ b/indra/newview/llimfloater.h
@@ -64,7 +64,6 @@ public:
// LLFloater overrides
/*virtual*/ void onClose(bool app_quitting);
/*virtual*/ void setDocked(bool docked, bool pop_on_undock = true);
- /*virtual*/ void setTornOff(bool torn_off);
// Make IM conversion visible and update the message history
static LLIMFloater* show(const LLUUID& session_id);
@@ -75,6 +74,8 @@ public:
static LLIMFloater* findInstance(const LLUUID& session_id);
+ static LLIMFloater* getInstance(const LLUUID& session_id);
+
void sessionInitReplyReceived(const LLUUID& im_session_id);
// get new messages from LLIMModel
@@ -113,6 +114,8 @@ public:
//used as a callback on receiving new IM message
static void sRemoveTypingIndicator(const LLSD& data);
+ static void onIMChicletCreated(const LLUUID& session_id);
+
private:
// process focus events to set a currently active session
/* virtual */ void onFocusLost();
diff --git a/indra/newview/llimfloatercontainer.cpp b/indra/newview/llimfloatercontainer.cpp
index 2d7333f7e47b6745bd7ab7c767716f00a11202c7..6cc985aef494dbefd9d63593336e734a84a86860 100644
--- a/indra/newview/llimfloatercontainer.cpp
+++ b/indra/newview/llimfloatercontainer.cpp
@@ -34,6 +34,7 @@
#include "llviewerprecompiledheaders.h"
#include "llimfloatercontainer.h"
+#include "llfloaterreg.h"
//
// LLIMFloaterContainer
@@ -93,4 +94,14 @@ void LLIMFloaterContainer::addFloater(LLFloater* floaterp,
}
}
+LLIMFloaterContainer* LLIMFloaterContainer::findInstance()
+{
+ return LLFloaterReg::findTypedInstance<LLIMFloaterContainer>("im_container");
+}
+
+LLIMFloaterContainer* LLIMFloaterContainer::getInstance()
+{
+ return LLFloaterReg::getTypedInstance<LLIMFloaterContainer>("im_container");
+}
+
// EOF
diff --git a/indra/newview/llimfloatercontainer.h b/indra/newview/llimfloatercontainer.h
index ead7cf473096e998206268d536236eaa1614560f..d4a542dfc22c449da8d184b3ca3254cb422b5175 100644
--- a/indra/newview/llimfloatercontainer.h
+++ b/indra/newview/llimfloatercontainer.h
@@ -52,7 +52,11 @@ public:
LLTabContainer::eInsertionPoint insertion_point = LLTabContainer::END);
static LLFloater* getCurrentVoiceFloater();
-
+
+ static LLIMFloaterContainer* findInstance();
+
+ static LLIMFloaterContainer* getInstance();
+
protected:
LLFloater* mActiveVoiceFloater;
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp
index daabf1f7178361308155ca4232624ca673192c2f..e9661003ea07fce98569ff412fcd139d3f46ff64 100644
--- a/indra/newview/llimview.cpp
+++ b/indra/newview/llimview.cpp
@@ -382,10 +382,6 @@ void LLIMModel::LLIMSession::addMessage(const std::string& from, const LLUUID& f
mSpeakers->speakerChatted(from_id);
mSpeakers->setSpeakerTyping(from_id, FALSE);
}
-
- if( mSessionType == P2P_SESSION ||
- mSessionType == ADHOC_SESSION)
- LLRecentPeople::instance().add(from_id);
}
void LLIMModel::LLIMSession::addMessagesFromHistory(const std::list<LLSD>& history)
@@ -684,6 +680,12 @@ bool LLIMModel::addMessage(const LLUUID& session_id, const std::string& from, co
LLIMSession* session = addMessageSilently(session_id, from, from_id, utf8_text, log2file);
if (!session) return false;
+ //good place to add some1 to recent list
+ //other places may be called from message history.
+ if( !from_id.isNull() &&
+ ( session->isP2PSessionType() || session->isAdHocSessionType() ) )
+ LLRecentPeople::instance().add(from_id);
+
// notify listeners
LLSD arg;
arg["session_id"] = session_id;
@@ -1377,7 +1379,7 @@ void LLCallDialogManager::onVoiceChannelChanged(const LLUUID &session_id)
}
sSession = session;
- sSession->mVoiceChannel->setStateChangedCallback(LLCallDialogManager::onVoiceChannelStateChanged);
+ sSession->mVoiceChannel->setStateChangedCallback(boost::bind(LLCallDialogManager::onVoiceChannelStateChanged, _1, _2, _3));
if(sCurrentSessionlName != session->mName)
{
sPreviousSessionlName = sCurrentSessionlName;
@@ -1601,7 +1603,12 @@ void LLOutgoingCallDialog::show(const LLSD& key)
if (!mPayload["disconnected_channel_name"].asString().empty())
{
- childSetTextArg("nearby", "[VOICE_CHANNEL_NAME]", mPayload["disconnected_channel_name"].asString());
+ std::string channel_name = mPayload["disconnected_channel_name"].asString();
+ if (LLIMModel::LLIMSession::AVALINE_SESSION == mPayload["session_type"].asInteger())
+ {
+ channel_name = LLTextUtil::formatPhoneNumber(channel_name);
+ }
+ childSetTextArg("nearby", "[VOICE_CHANNEL_NAME]", channel_name);
childSetTextArg("nearby_P2P", "[VOICE_CHANNEL_NAME]", mPayload["disconnected_channel_name"].asString());
}
diff --git a/indra/newview/llimview.h b/indra/newview/llimview.h
index 20d8e28392747d508de8f57efab7ace39611b901..e72bda6c2bfc96976385f4f45a5be885728ae683 100644
--- a/indra/newview/llimview.h
+++ b/indra/newview/llimview.h
@@ -78,6 +78,11 @@ public:
bool isP2P();
bool isOtherParticipantAvaline();
+ bool isP2PSessionType() const { return mSessionType == P2P_SESSION;}
+ bool isAdHocSessionType() const { return mSessionType == ADHOC_SESSION;}
+ bool isGroupSessionType() const { return mSessionType == GROUP_SESSION;}
+ bool isAvalineSessionType() const { return mSessionType == AVALINE_SESSION;}
+
LLUUID mSessionID;
std::string mName;
EInstantMessage mType;
diff --git a/indra/newview/llinspectavatar.cpp b/indra/newview/llinspectavatar.cpp
index 8f4fba244d2b3cbec53a573937a0cf6e932ea218..0374a1d25b0ad15cf1c389b2d8127c79ab149421 100644
--- a/indra/newview/llinspectavatar.cpp
+++ b/indra/newview/llinspectavatar.cpp
@@ -418,6 +418,7 @@ void LLInspectAvatar::updateModeratorPanel()
LLPointer<LLSpeaker> selected_speakerp = speaker_mgr->findSpeaker(mAvatarID);
if(speaker_mgr->isVoiceActive() && selected_speakerp &&
+ selected_speakerp->isInVoiceChannel() &&
((self_speakerp && self_speakerp->mIsModerator) || gAgent.isGodlike()))
{
getChild<LLUICtrl>("enable_voice")->setVisible(selected_speakerp->mModeratorMutedVoice);
diff --git a/indra/newview/llinspecttoast.cpp b/indra/newview/llinspecttoast.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..3ca8fa2f56e14c6eaf3ec50fe10db827f73c8f9d
--- /dev/null
+++ b/indra/newview/llinspecttoast.cpp
@@ -0,0 +1,122 @@
+/**
+ * @file llinspecttoast.cpp
+ * @brief Toast inspector implementation.
+ *
+ * $LicenseInfo:firstyear=2003&license=viewergpl$
+ *
+ * Copyright (c) 2003-2009, Linden Research, Inc.
+ *
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab. Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ *
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ *
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ *
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+#include "llviewerprecompiledheaders.h" // must be first include
+
+#include "llinspecttoast.h"
+#include "llinspect.h"
+#include "llfloaterreg.h"
+#include "llscreenchannel.h"
+#include "llchannelmanager.h"
+#include "lltransientfloatermgr.h"
+
+using namespace LLNotificationsUI;
+
+/**
+ * Represents inspectable toast .
+ */
+class LLInspectToast: public LLInspect
+{
+public:
+
+ LLInspectToast(const LLSD& notification_idl);
+ virtual ~LLInspectToast();
+
+ /*virtual*/ void onOpen(const LLSD& notification_id);
+private:
+ void onToastDestroy(LLToast * toast);
+
+private:
+ LLPanel* mPanel;
+ LLScreenChannel* mScreenChannel;
+};
+
+LLInspectToast::LLInspectToast(const LLSD& notification_id) :
+ LLInspect(LLSD()), mPanel(NULL)
+{
+ LLScreenChannelBase* channel = LLChannelManager::getInstance()->findChannelByID(
+ LLUUID(gSavedSettings.getString("NotificationChannelUUID")));
+ mScreenChannel = dynamic_cast<LLScreenChannel*>(channel);
+ if(NULL == mScreenChannel)
+ {
+ llwarns << "Could not get requested screen channel." << llendl;
+ return;
+ }
+
+ LLTransientFloaterMgr::getInstance()->addControlView(this);
+}
+LLInspectToast::~LLInspectToast()
+{
+ LLTransientFloaterMgr::getInstance()->removeControlView(this);
+}
+
+void LLInspectToast::onOpen(const LLSD& notification_id)
+{
+ LLInspect::onOpen(notification_id);
+ LLToast* toast = mScreenChannel->getToastByNotificationID(notification_id);
+ if (toast == NULL)
+ {
+ llwarns << "Could not get requested toast from screen channel." << llendl;
+ return;
+ }
+ toast->setOnToastDestroyedCallback(boost::bind(&LLInspectToast::onToastDestroy, this, _1));
+
+ LLPanel * panel = toast->getPanel();
+ panel->setVisible(TRUE);
+ panel->setMouseOpaque(FALSE);
+ if(mPanel != NULL && mPanel->getParent() == this)
+ {
+ removeChild(mPanel);
+ }
+ addChild(panel);
+ panel->setFocus(TRUE);
+ mPanel = panel;
+
+
+ LLRect panel_rect;
+ panel_rect = panel->getRect();
+ reshape(panel_rect.getWidth(), panel_rect.getHeight());
+
+ LLUI::positionViewNearMouse(this);
+}
+
+void LLInspectToast::onToastDestroy(LLToast * toast)
+{
+ closeFloater(false);
+}
+
+void LLNotificationsUI::registerFloater()
+{
+ LLFloaterReg::add("inspect_toast", "inspect_toast.xml",
+ &LLFloaterReg::build<LLInspectToast>);
+}
+
diff --git a/indra/newview/llinspecttoast.h b/indra/newview/llinspecttoast.h
new file mode 100644
index 0000000000000000000000000000000000000000..ff547154b837107ae35d577d393b92b0c978e9bf
--- /dev/null
+++ b/indra/newview/llinspecttoast.h
@@ -0,0 +1,40 @@
+/**
+ * @file llinspecttoast.h
+ *
+ * $LicenseInfo:firstyear=2003&license=viewergpl$
+ *
+ * Copyright (c) 2003-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_LLINSPECTTOAST_H
+#define LL_LLINSPECTTOAST_H
+
+namespace LLNotificationsUI
+{
+void registerFloater();
+}
+
+#endif
diff --git a/indra/newview/llinventorymodel.cpp b/indra/newview/llinventorymodel.cpp
index 711114173c915b98e5bdb73d6914ca1f1a0ebdb4..a468a9a95c40e636675c504dc574007a057020ab 100644
--- a/indra/newview/llinventorymodel.cpp
+++ b/indra/newview/llinventorymodel.cpp
@@ -2001,14 +2001,16 @@ void LLInventoryModel::accountForUpdate(const LLCategoryUpdate& update) const
}
if(!accounted)
{
- lldebugs << "No accounting for: '" << cat->getName() << "' "
+ // Error condition, this means that the category did not register that
+ // it got new descendents (perhaps because it is still being loaded)
+ // which means its descendent count will be wrong.
+ llwarns << "Accounting failed for '" << cat->getName() << "' version:"
<< version << llendl;
}
}
else
{
- llwarns << "No category found for update " << update.mCategoryID
- << llendl;
+ llwarns << "No category found for update " << update.mCategoryID << llendl;
}
}
diff --git a/indra/newview/llinventoryobserver.cpp b/indra/newview/llinventoryobserver.cpp
index 2d9ea21b5f2ccc390edad2323de7688197107bdb..2fb8aea4e947db0272649e926fe1b59390fae1da 100644
--- a/indra/newview/llinventoryobserver.cpp
+++ b/indra/newview/llinventoryobserver.cpp
@@ -311,10 +311,10 @@ bool LLInventoryFetchDescendentsObserver::isEverythingComplete() const
bool LLInventoryFetchDescendentsObserver::isComplete(LLViewerInventoryCategory* cat)
{
- S32 version = cat->getVersion();
- S32 descendents = cat->getDescendentCount();
- if((LLViewerInventoryCategory::VERSION_UNKNOWN == version)
- || (LLViewerInventoryCategory::DESCENDENT_COUNT_UNKNOWN == descendents))
+ const S32 version = cat->getVersion();
+ const S32 expected_num_descendents = cat->getDescendentCount();
+ if ((version == LLViewerInventoryCategory::VERSION_UNKNOWN) ||
+ (expected_num_descendents == LLViewerInventoryCategory::DESCENDENT_COUNT_UNKNOWN))
{
return false;
}
@@ -325,15 +325,28 @@ bool LLInventoryFetchDescendentsObserver::isComplete(LLViewerInventoryCategory*
gInventory.getDirectDescendentsOf(cat->getUUID(), cats, items);
if(!cats || !items)
{
- // bit of a hack - pretend we're done if they are gone or
- // incomplete. should never know, but it would suck if this
- // kept tight looping because of a corrupt memory state.
+ llwarns << "Category '" << cat->getName() << "' descendents corrupted, fetch failed." << llendl;
+ // NULL means the call failed -- cats/items map doesn't exist (note: this does NOT mean
+ // that the cat just doesn't have any items or subfolders).
+ // Unrecoverable, so just return done so that this observer can be cleared
+ // from memory.
return true;
}
- S32 known = cats->count() + items->count();
- if(descendents == known)
+ const S32 current_num_known_descendents = cats->count() + items->count();
+
+ // Got the number of descendents that we were expecting, so we're done.
+ if (current_num_known_descendents == expected_num_descendents)
+ {
+ return true;
+ }
+
+ // Error condition, but recoverable. This happens if something was added to the
+ // category before it was initialized, so accountForUpdate didn't update descendent
+ // count and thus the category thinks it has fewer descendents than it actually has.
+ if (current_num_known_descendents >= expected_num_descendents)
{
- // hey - we're done.
+ llwarns << "Category '" << cat->getName() << "' expected descendentcount:" << expected_num_descendents << " descendents but got descendentcount:" << current_num_known_descendents << llendl;
+ cat->setDescendentCount(current_num_known_descendents);
return true;
}
return false;
@@ -352,7 +365,7 @@ void LLInventoryFetchComboObserver::changed(U32 mask)
continue;
}
if(item->isComplete())
- {
+ {
mCompleteItems.push_back(*it);
it = mIncompleteItems.erase(it);
continue;
diff --git a/indra/newview/llmediactrl.cpp b/indra/newview/llmediactrl.cpp
index 6b0f9b709d1f784b4ec132409b8760fe527bfa93..87ebce1d34744e165a31069de48826460f02a14b 100644
--- a/indra/newview/llmediactrl.cpp
+++ b/indra/newview/llmediactrl.cpp
@@ -84,7 +84,6 @@ LLMediaCtrl::LLMediaCtrl( const Params& p) :
mHomePageUrl( "" ),
mIgnoreUIScale( true ),
mAlwaysRefresh( false ),
- mExternalUrl( "" ),
mMediaSource( 0 ),
mTakeFocusOnClick( true ),
mCurrentNavUrl( "" ),
@@ -877,9 +876,27 @@ bool LLMediaCtrl::onClickLinkExternalTarget(const LLSD& notification, const LLSD
S32 option = LLNotificationsUtil::getSelectedOption(notification, response);
if ( 0 == option )
{
- // open in external browser because we don't support
- // creation of our own secondary browser windows
- LLWeb::loadURLExternal( notification["payload"]["external_url"].asString() );
+ LLSD payload = notification["payload"];
+ std::string url = payload["url"].asString();
+ S32 target_type = payload["target_type"].asInteger();
+
+ switch (target_type)
+ {
+ case LLPluginClassMedia::TARGET_EXTERNAL:
+ // load target in an external browser
+ LLWeb::loadURLExternal(url);
+ break;
+
+ case LLPluginClassMedia::TARGET_BLANK:
+ // load target in the user's preferred browser
+ LLWeb::loadURL(url);
+ break;
+
+ default:
+ // unsupported link target - shouldn't happen
+ LL_WARNS("LinkTarget") << "Unsupported link target type" << LL_ENDL;
+ break;
+ }
}
return false;
}
@@ -993,20 +1010,18 @@ void LLMediaCtrl::handleMediaEvent(LLPluginClassMedia* self, EMediaEvent event)
void LLMediaCtrl::onClickLinkHref( LLPluginClassMedia* self )
{
// retrieve the event parameters
- std::string target = self->getClickTarget();
std::string url = self->getClickURL();
+ U32 target_type = self->getClickTargetType();
- // if there is a value for the target
- if ( !target.empty() )
+ // is there is a target specified for the link?
+ if (target_type == LLPluginClassMedia::TARGET_EXTERNAL ||
+ target_type == LLPluginClassMedia::TARGET_BLANK)
{
- if ( target == "_external" )
- {
- mExternalUrl = url;
- LLSD payload;
- payload["external_url"] = mExternalUrl;
- LLNotificationsUtil::add( "WebLaunchExternalTarget", LLSD(), payload, onClickLinkExternalTarget);
- return;
- }
+ LLSD payload;
+ payload["url"] = url;
+ payload["target_type"] = LLSD::Integer(target_type);
+ LLNotificationsUtil::add( "WebLaunchExternalTarget", LLSD(), payload, onClickLinkExternalTarget);
+ return;
}
const std::string protocol1( "http://" );
diff --git a/indra/newview/llmediactrl.h b/indra/newview/llmediactrl.h
index 8f9e6e71797a846676090c1f8a217768eb9e539c..b0aca3cfa46b890f7adbdeca325bb190a4bd69f6 100644
--- a/indra/newview/llmediactrl.h
+++ b/indra/newview/llmediactrl.h
@@ -182,7 +182,6 @@ public:
bool mOpenLinksInInternalBrowser;
bool mTrusted;
std::string mHomePageUrl;
- std::string mExternalUrl;
std::string mCurrentNavUrl;
bool mIgnoreUIScale;
bool mAlwaysRefresh;
diff --git a/indra/newview/llnamebox.cpp b/indra/newview/llnamebox.cpp
index 2f4a266198589eee65b46582dfced718ca421cb2..d4340178049d67fa7b2b63a75d65f8a222160d12 100644
--- a/indra/newview/llnamebox.cpp
+++ b/indra/newview/llnamebox.cpp
@@ -52,6 +52,7 @@ LLNameBox::LLNameBox(const Params& p)
: LLTextBox(p)
{
mNameID = LLUUID::null;
+ mLink = p.link;
LLNameBox::sInstances.insert(this);
setText(LLStringUtil::null);
}
@@ -76,7 +77,7 @@ void LLNameBox::setNameID(const LLUUID& name_id, BOOL is_group)
gCacheName->getGroupName(name_id, name);
}
- setText(name);
+ setName(name, is_group);
}
void LLNameBox::refresh(const LLUUID& id, const std::string& firstname,
@@ -93,7 +94,7 @@ void LLNameBox::refresh(const LLUUID& id, const std::string& firstname,
{
name = firstname;
}
- setText(name);
+ setName(name, is_group);
}
}
@@ -109,3 +110,22 @@ void LLNameBox::refreshAll(const LLUUID& id, const std::string& firstname,
box->refresh(id, firstname, lastname, is_group);
}
}
+
+void LLNameBox::setName(const std::string& name, BOOL is_group)
+{
+ if (mLink)
+ {
+ std::string url;
+
+ if (is_group)
+ url = "[secondlife:///app/group/" + LLURI::escape(name) + "/about " + name + "]";
+ else
+ url = "[secondlife:///app/agent/" + mNameID.asString() + "/about " + name + "]";
+
+ setText(url);
+ }
+ else
+ {
+ setText(name);
+ }
+}
diff --git a/indra/newview/llnamebox.h b/indra/newview/llnamebox.h
index 3edb36883f9fec4a403b65e50509a16a189f99a7..0109525e85628101f515a1c3678de6973d86fa61 100644
--- a/indra/newview/llnamebox.h
+++ b/indra/newview/llnamebox.h
@@ -47,9 +47,11 @@ public:
struct Params : public LLInitParam::Block<Params, LLTextBox::Params>
{
Optional<bool> is_group;
+ Optional<bool> link;
Params()
: is_group("is_group", false)
+ , link("link", false)
{}
};
@@ -67,10 +69,13 @@ protected:
friend class LLUICtrlFactory;
private:
+ void setName(const std::string& name, BOOL is_group);
+
static std::set<LLNameBox*> sInstances;
private:
LLUUID mNameID;
+ BOOL mLink;
};
diff --git a/indra/newview/llnearbychat.cpp b/indra/newview/llnearbychat.cpp
index fc0e51b76d1c082d0b16206257c9307d31f8e6de..a7c1e73328e6e1e3b6908f7ac8ffb408b0033c92 100644
--- a/indra/newview/llnearbychat.cpp
+++ b/indra/newview/llnearbychat.cpp
@@ -179,27 +179,7 @@ void LLNearbyChat::addMessage(const LLChat& chat,bool archive)
if (!chat.mMuted)
{
tmp_chat.mFromName = chat.mFromName;
-
- if (chat.mChatStyle == CHAT_STYLE_IRC)
- {
- LLColor4 txt_color = LLUIColorTable::instance().getColor("White");
- LLViewerChat::getChatColor(chat,txt_color);
- LLFontGL* fontp = LLViewerChat::getChatFont();
- std::string font_name = LLFontGL::nameFromFont(fontp);
- std::string font_size = LLFontGL::sizeFromFont(fontp);
- LLStyle::Params append_style_params;
- append_style_params.color(txt_color);
- append_style_params.readonly_color(txt_color);
- append_style_params.font.name(font_name);
- append_style_params.font.size(font_size);
- append_style_params.font.style = "ITALIC";
-
- mChatHistory->appendMessage(chat, use_plain_text_chat_history, append_style_params);
- }
- else
- {
- mChatHistory->appendMessage(chat, use_plain_text_chat_history);
- }
+ mChatHistory->appendMessage(chat, use_plain_text_chat_history);
}
if(archive)
diff --git a/indra/newview/llnearbychatbar.cpp b/indra/newview/llnearbychatbar.cpp
index 8dbaa5ac53a4d0e67e620c463b536fefeb629fd5..6cf8bcb4178786108a86cf48f9bbe1ae7d32b793 100644
--- a/indra/newview/llnearbychatbar.cpp
+++ b/indra/newview/llnearbychatbar.cpp
@@ -48,13 +48,16 @@
#include "llcommandhandler.h"
#include "llviewercontrol.h"
#include "llnavigationbar.h"
+#include "llwindow.h"
+#include "llviewerwindow.h"
+#include "llrootview.h"
S32 LLNearbyChatBar::sLastSpecialChatChannel = 0;
// legacy callback glue
void send_chat_from_viewer(const std::string& utf8_out_text, EChatType type, S32 channel);
-static LLDefaultChildRegistry::Register<LLGestureComboBox> r("gesture_combo_box");
+static LLDefaultChildRegistry::Register<LLGestureComboList> r("gesture_combo_list");
struct LLChatTypeTrigger {
std::string name;
@@ -66,13 +69,42 @@ static LLChatTypeTrigger sChatTypeTriggers[] = {
{ "/shout" , CHAT_TYPE_SHOUT}
};
-LLGestureComboBox::LLGestureComboBox(const LLGestureComboBox::Params& p)
- : LLComboBox(p)
- , mGestureLabelTimer()
+LLGestureComboList::Params::Params()
+: combo_button("combo_button"),
+ combo_list("combo_list")
+{
+}
+
+LLGestureComboList::LLGestureComboList(const LLGestureComboList::Params& p)
+: LLUICtrl(p)
, mLabel(p.label)
, mViewAllItemIndex(0)
{
- setCommitCallback(boost::bind(&LLGestureComboBox::onCommitGesture, this));
+ LLButton::Params button_params = p.combo_button;
+ button_params.follows.flags(FOLLOWS_LEFT|FOLLOWS_BOTTOM|FOLLOWS_RIGHT);
+
+ mButton = LLUICtrlFactory::create<LLButton>(button_params);
+ mButton->reshape(getRect().getWidth(),getRect().getHeight());
+ mButton->setCommitCallback(boost::bind(&LLGestureComboList::onButtonCommit, this));
+
+ addChild(mButton);
+
+ LLScrollListCtrl::Params params = p.combo_list;
+ params.name("GestureComboList");
+ params.commit_callback.function(boost::bind(&LLGestureComboList::onItemSelected, this, _2));
+ params.visible(false);
+ params.commit_on_keyboard_movement(false);
+
+ mList = LLUICtrlFactory::create<LLScrollListCtrl>(params);
+
+ // *HACK: adding list as a child to NonSideTrayView to make it fully visible without
+ // making it top control (because it would cause problems).
+ gViewerWindow->getNonSideTrayView()->addChild(mList);
+ mList->setVisible(FALSE);
+
+ //****************************Gesture Part********************************/
+
+ setCommitCallback(boost::bind(&LLGestureComboList::onCommitGesture, this));
// now register us as observer since we have a place to put the results
LLGestureManager::instance().addObserver(this);
@@ -80,23 +112,139 @@ LLGestureComboBox::LLGestureComboBox(const LLGestureComboBox::Params& p)
// refresh list from current active gestures
refreshGestures();
- // This forces using of halign from xml, since LLComboBox
- // sets it to LLFontGL::LEFT, if text entry is disabled
- mButton->setHAlign(p.drop_down_button.font_halign);
+ setFocusLostCallback(boost::bind(&LLGestureComboList::hideList, this));
}
-LLGestureComboBox::~LLGestureComboBox()
+BOOL LLGestureComboList::handleKey(KEY key, MASK mask, BOOL called_from_parent)
{
- LLGestureManager::instance().removeObserver(this);
+ BOOL handled = FALSE;
+
+ if (key == KEY_ESCAPE && mask == MASK_NONE )
+ {
+ hideList();
+ handled = TRUE;
+ }
+ else
+ {
+ handled = mList->handleKey(key, mask, called_from_parent);
+ }
+
+ return handled;
+}
+
+void LLGestureComboList::showList()
+{
+ LLRect rect = mList->getRect();
+ LLRect screen;
+ mButton->localRectToScreen(getRect(), &screen);
+
+ // Calculating amount of space between the navigation bar and gestures combo
+ LLNavigationBar* nb = LLNavigationBar::getInstance();
+
+ S32 x, nb_bottom;
+ nb->localPointToScreen(0, 0, &x, &nb_bottom);
+
+ S32 max_height = nb_bottom - screen.mTop;
+ mList->calcColumnWidths();
+ rect.setOriginAndSize(screen.mLeft, screen.mTop, llmax(mList->getMaxContentWidth(),mButton->getRect().getWidth()), max_height);
+
+ mList->setRect(rect);
+ mList->fitContents( llmax(mList->getMaxContentWidth(),mButton->getRect().getWidth()), max_height);
+
+ gFocusMgr.setKeyboardFocus(this);
+
+ // Show the list and push the button down
+ mButton->setToggleState(TRUE);
+ mList->setVisible(TRUE);
+}
+
+void LLGestureComboList::onButtonCommit()
+{
+ if (!mList->getVisible())
+ {
+ // highlight the last selected item from the original selection before potentially selecting a new item
+ // as visual cue to original value of combo box
+ LLScrollListItem* last_selected_item = mList->getLastSelectedItem();
+ if (last_selected_item)
+ {
+ mList->mouseOverHighlightNthItem(mList->getItemIndex(last_selected_item));
+ }
+
+ if (mList->getItemCount() != 0)
+ {
+ showList();
+ }
+ }
+ else
+ {
+ hideList();
+ }
+}
+
+void LLGestureComboList::hideList()
+{
+ if (mList->getVisible())
+ {
+ mButton->setToggleState(FALSE);
+ mList->setVisible(FALSE);
+ mList->mouseOverHighlightNthItem(-1);
+ gFocusMgr.setKeyboardFocus(NULL);
+ }
+}
+
+S32 LLGestureComboList::getCurrentIndex() const
+{
+ LLScrollListItem* item = mList->getFirstSelected();
+ if( item )
+ {
+ return mList->getItemIndex( item );
+ }
+ return -1;
+}
+
+void LLGestureComboList::onItemSelected(const LLSD& data)
+{
+ const std::string name = mList->getSelectedItemLabel();
+
+ S32 cur_id = getCurrentIndex();
+ mLastSelectedIndex = cur_id;
+ if (cur_id != mList->getItemCount()-1 && cur_id != -1)
+ {
+ mButton->setLabel(name);
+ }
+
+ // hiding the list reasserts the old value stored in the text editor/dropdown button
+ hideList();
+
+ // commit does the reverse, asserting the value in the list
+ onCommit();
+}
+
+void LLGestureComboList::sortByName(bool ascending)
+{
+ mList->sortOnce(0, ascending);
+}
+
+LLSD LLGestureComboList::getValue() const
+{
+ LLScrollListItem* item = mList->getFirstSelected();
+ if( item )
+ {
+ return item->getValue();
+ }
+ else
+ {
+ return LLSD();
+ }
}
-void LLGestureComboBox::refreshGestures()
+void LLGestureComboList::refreshGestures()
{
//store current selection so we can maintain it
LLSD cur_gesture = getValue();
- selectFirstItem();
- // clear
- clearRows();
+
+ mList->selectFirstItem();
+ mList->clearRows();
mGestures.clear();
LLGestureManager::item_map_t::const_iterator it;
@@ -107,7 +255,7 @@ void LLGestureComboBox::refreshGestures()
LLMultiGesture* gesture = (*it).second;
if (gesture)
{
- addSimpleElement(gesture->mName, ADD_BOTTOM, LLSD(idx));
+ mList->addSimpleElement(gesture->mName, ADD_BOTTOM, LLSD(idx));
mGestures.push_back(gesture);
idx++;
}
@@ -117,23 +265,42 @@ void LLGestureComboBox::refreshGestures()
// store index followed by the last added Gesture and add View All item at bottom
mViewAllItemIndex = idx;
- addSimpleElement(LLTrans::getString("ViewAllGestures"), ADD_BOTTOM, LLSD(mViewAllItemIndex));
+
+ mList->addSimpleElement(LLTrans::getString("ViewAllGestures"), ADD_BOTTOM, LLSD(mViewAllItemIndex));
// Insert label after sorting, at top, with separator below it
- addSeparator(ADD_TOP);
- addSimpleElement(mLabel, ADD_TOP);
+ mList->addSeparator(ADD_TOP);
+ mList->addSimpleElement(mLabel, ADD_TOP);
if (cur_gesture.isDefined())
{
- selectByValue(cur_gesture);
+ mList->selectByValue(cur_gesture);
+
}
else
{
- selectFirstItem();
+ mList->selectFirstItem();
}
+
+ LLCtrlListInterface* gestures = getListInterface();
+ LLMultiGesture* gesture = NULL;
+
+ if (gestures)
+ {
+ S32 index = gestures->getSelectedValue().asInteger();
+ if(index > 0)
+ gesture = mGestures.at(index);
+ }
+
+ if(gesture && LLGestureManager::instance().isGesturePlaying(gesture))
+ {
+ return;
+ }
+
+ mButton->setLabel(mLabel);
}
-void LLGestureComboBox::onCommitGesture()
+void LLGestureComboList::onCommitGesture()
{
LLCtrlListInterface* gestures = getListInterface();
if (gestures)
@@ -164,50 +331,11 @@ void LLGestureComboBox::onCommitGesture()
}
}
}
-
- mGestureLabelTimer.start();
- // free focus back to chat bar
- setFocus(FALSE);
}
-//virtual
-void LLGestureComboBox::draw()
+LLGestureComboList::~LLGestureComboList()
{
- // HACK: Leave the name of the gesture in place for a few seconds.
- const F32 SHOW_GESTURE_NAME_TIME = 2.f;
- if (mGestureLabelTimer.getStarted() && mGestureLabelTimer.getElapsedTimeF32() > SHOW_GESTURE_NAME_TIME)
- {
- LLCtrlListInterface* gestures = getListInterface();
- if (gestures) gestures->selectFirstItem();
- mGestureLabelTimer.stop();
- }
-
- LLComboBox::draw();
-}
-
-//virtual
-void LLGestureComboBox::showList()
-{
- LLComboBox::showList();
-
- // Calculating amount of space between the navigation bar and gestures combo
- LLNavigationBar* nb = LLNavigationBar::getInstance();
- S32 x, nb_bottom;
- nb->localPointToScreen(0, 0, &x, &nb_bottom);
-
- S32 list_bottom;
- mList->localPointToScreen(0, 0, &x, &list_bottom);
-
- S32 max_height = nb_bottom - list_bottom;
-
- LLRect rect = mList->getRect();
- // List overlapped navigation bar, downsize it
- if (rect.getHeight() > max_height)
- {
- rect.setOriginAndSize(rect.mLeft, rect.mBottom, rect.getWidth(), max_height);
- mList->setRect(rect);
- mList->reshape(rect.getWidth(), rect.getHeight());
- }
+ LLGestureManager::instance().removeObserver(this);
}
LLNearbyChatBar::LLNearbyChatBar()
diff --git a/indra/newview/llnearbychatbar.h b/indra/newview/llnearbychatbar.h
index 224118e088d6db9300babb35076c74593b4ad1a5..d9a7403611a0e80fea6fe5ec3977d3f1fc93fd5b 100644
--- a/indra/newview/llnearbychatbar.h
+++ b/indra/newview/llnearbychatbar.h
@@ -42,33 +42,52 @@
#include "llspeakers.h"
-class LLGestureComboBox
- : public LLComboBox
- , public LLGestureManagerObserver
+class LLGestureComboList
+ : public LLGestureManagerObserver
+ , public LLUICtrl
{
public:
- struct Params : public LLInitParam::Block<Params, LLComboBox::Params> { };
+ struct Params : public LLInitParam::Block<Params, LLUICtrl::Params>
+ {
+ Optional<LLButton::Params> combo_button;
+ Optional<LLScrollListCtrl::Params> combo_list;
+
+ Params();
+ };
+
protected:
- LLGestureComboBox(const Params&);
+
friend class LLUICtrlFactory;
+ LLGestureComboList(const Params&);
+ std::vector<LLMultiGesture*> mGestures;
+ std::string mLabel;
+ LLSD::Integer mViewAllItemIndex;
+
public:
- ~LLGestureComboBox();
+ ~LLGestureComboList();
+
+ LLCtrlListInterface* getListInterface() { return (LLCtrlListInterface*)mList; };
+ virtual void showList();
+ virtual void hideList();
+ virtual BOOL handleKey(KEY key, MASK mask, BOOL called_from_parent);
+
+ S32 getCurrentIndex() const;
+ void onItemSelected(const LLSD& data);
+ void sortByName(bool ascending = true);
void refreshGestures();
void onCommitGesture();
- virtual void draw();
+ void onButtonCommit();
+ virtual LLSD getValue() const;
// LLGestureManagerObserver trigger
virtual void changed() { refreshGestures(); }
-protected:
-
- virtual void showList();
+private:
- LLFrameTimer mGestureLabelTimer;
- std::vector<LLMultiGesture*> mGestures;
- std::string mLabel;
- LLSD::Integer mViewAllItemIndex;
+ LLButton* mButton;
+ LLScrollListCtrl* mList;
+ S32 mLastSelectedIndex;
};
class LLNearbyChatBar
diff --git a/indra/newview/llnearbychathandler.cpp b/indra/newview/llnearbychathandler.cpp
index 9e13a626b44059efe8250c847955d6972c5bb755..96442fafcc6e3f85cc5e0a451f8db6e46b4cee4d 100644
--- a/indra/newview/llnearbychathandler.cpp
+++ b/indra/newview/llnearbychathandler.cpp
@@ -180,6 +180,11 @@ void LLNearbyChatScreenChannel::addNotification(LLSD& notification)
if(panel && panel->messageID() == fromID && panel->canAddText())
{
+ if (CHAT_STYLE_IRC == notification["chat_style"].asInteger())
+ {
+ notification["message"] = notification["from"].asString() + notification["message"].asString();
+ }
+
panel->addMessage(notification);
toast->reshapeToPanel();
toast->resetTimer();
@@ -302,7 +307,6 @@ LLNearbyChatHandler::LLNearbyChatHandler(e_notification_type type, const LLSD& i
channel->setCreatePanelCallback(callback);
mChannel = LLChannelManager::getInstance()->addChannel(channel);
- mChannel->setOverflowFormatString("You have %d unread nearby chat messages");
}
LLNearbyChatHandler::~LLNearbyChatHandler()
@@ -332,25 +336,22 @@ void LLNearbyChatHandler::processChat(const LLChat& chat_msg)
LLChat& tmp_chat = const_cast<LLChat&>(chat_msg);
- if (tmp_chat.mChatStyle == CHAT_STYLE_IRC)
- {
- if(!tmp_chat.mFromName.empty())
- tmp_chat.mText = tmp_chat.mFromName + tmp_chat.mText.substr(3);
- else
- tmp_chat.mText = tmp_chat.mText.substr(3);
- }
-
+ LLNearbyChat* nearby_chat = LLFloaterReg::getTypedInstance<LLNearbyChat>("nearby_chat", LLSD());
{
//sometimes its usefull to have no name at all...
//if(tmp_chat.mFromName.empty() && tmp_chat.mFromID!= LLUUID::null)
// tmp_chat.mFromName = tmp_chat.mFromID.asString();
}
-
- LLNearbyChat* nearby_chat = LLFloaterReg::getTypedInstance<LLNearbyChat>("nearby_chat", LLSD());
nearby_chat->addMessage(chat_msg);
if(nearby_chat->getVisible())
return;//no need in toast if chat is visible
-
+
+ // Handle irc styled messages for toast panel
+ if (tmp_chat.mChatStyle == CHAT_STYLE_IRC)
+ {
+ tmp_chat.mText = tmp_chat.mText.substr(3);
+ }
+
// arrange a channel on a screen
if(!mChannel->getVisible())
{
diff --git a/indra/newview/lloutputmonitorctrl.cpp b/indra/newview/lloutputmonitorctrl.cpp
index 63803469dd1519e25dcfa9b686fc1eea81d5801e..f816dc589d68e0c6d73b81fc22986b32b6c6fd6d 100644
--- a/indra/newview/lloutputmonitorctrl.cpp
+++ b/indra/newview/lloutputmonitorctrl.cpp
@@ -77,7 +77,9 @@ LLOutputMonitorCtrl::LLOutputMonitorCtrl(const LLOutputMonitorCtrl::Params& p)
mImageLevel3(p.image_level_3),
mAutoUpdate(p.auto_update),
mSpeakerId(p.speaker_id),
- mIsAgentControl(false)
+ mIsAgentControl(false),
+ mIsSwitchDirty(false),
+ mShouldSwitchOn(false)
{
//static LLUIColor output_monitor_muted_color = LLUIColorTable::instance().getColor("OutputMonitorMutedColor", LLColor4::orange);
//static LLUIColor output_monitor_overdriven_color = LLUIColorTable::instance().getColor("OutputMonitorOverdrivenColor", LLColor4::red);
@@ -108,6 +110,7 @@ LLOutputMonitorCtrl::LLOutputMonitorCtrl(const LLOutputMonitorCtrl::Params& p)
LLOutputMonitorCtrl::~LLOutputMonitorCtrl()
{
LLMuteList::getInstance()->removeObserver(this);
+ LLSpeakingIndicatorManager::unregisterSpeakingIndicator(mSpeakerId, this);
}
void LLOutputMonitorCtrl::setPower(F32 val)
@@ -117,6 +120,26 @@ void LLOutputMonitorCtrl::setPower(F32 val)
void LLOutputMonitorCtrl::draw()
{
+ // see also switchIndicator()
+ if (mIsSwitchDirty)
+ {
+ mIsSwitchDirty = false;
+ if (mShouldSwitchOn)
+ {
+ // just notify parent visibility may have changed
+ notifyParentVisibilityChanged();
+ }
+ else
+ {
+ // make itself invisible and notify parent about this
+ setVisible(FALSE);
+ notifyParentVisibilityChanged();
+
+ // no needs to render for invisible element
+ return;
+ }
+ }
+
// Copied from llmediaremotectrl.cpp
// *TODO: Give the LLOutputMonitorCtrl an agent-id to monitor, then
// call directly into gVoiceClient to ask if that agent-id is muted, is
@@ -229,6 +252,7 @@ void LLOutputMonitorCtrl::setSpeakerId(const LLUUID& speaker_id)
if (speaker_id.isNull() || speaker_id == mSpeakerId) return;
mSpeakerId = speaker_id;
+ LLSpeakingIndicatorManager::registerSpeakingIndicator(mSpeakerId, this);
//mute management
if (mAutoUpdate)
@@ -251,3 +275,42 @@ void LLOutputMonitorCtrl::onChange()
// check only blocking on voice. EXT-3542
setIsMuted(LLMuteList::getInstance()->isMuted(mSpeakerId, LLMute::flagVoiceChat));
}
+
+// virtual
+void LLOutputMonitorCtrl::switchIndicator(bool switch_on)
+{
+ // ensure indicator is visible in case it is not in visible chain
+ // to be called when parent became visible next time to notify parent that visibility is changed.
+ setVisible(TRUE);
+
+ // if parent is in visible chain apply switch_on state and notify it immediately
+ if (getParent() && getParent()->isInVisibleChain())
+ {
+ LL_DEBUGS("SpeakingIndicator") << "Indicator is in visible chain, notifying parent: " << mSpeakerId << LL_ENDL;
+ setVisible((BOOL)switch_on);
+ notifyParentVisibilityChanged();
+ }
+
+ // otherwise remember necessary state and mark itself as dirty.
+ // State will be applied i next draw when parents chain became visible.
+ else
+ {
+ LL_DEBUGS("SpeakingIndicator") << "Indicator is not in visible chain, parent won't be notified: " << mSpeakerId << LL_ENDL;
+ mIsSwitchDirty = true;
+ mShouldSwitchOn = switch_on;
+ }
+}
+
+//////////////////////////////////////////////////////////////////////////
+// PRIVATE SECTION
+//////////////////////////////////////////////////////////////////////////
+void LLOutputMonitorCtrl::notifyParentVisibilityChanged()
+{
+ LL_DEBUGS("SpeakingIndicator") << "Notify parent that visibility was changed: " << mSpeakerId << " ,new_visibility: " << getVisible() << LL_ENDL;
+
+ LLSD params = LLSD().with("visibility_changed", getVisible());
+
+ notifyParent(params);
+}
+
+// EOF
diff --git a/indra/newview/lloutputmonitorctrl.h b/indra/newview/lloutputmonitorctrl.h
index 85ea552a572b049fbf796b0f914fcabb9481f7d5..2bbfa251e9d8e2624b3e1bd1881ce951b0868495 100644
--- a/indra/newview/lloutputmonitorctrl.h
+++ b/indra/newview/lloutputmonitorctrl.h
@@ -36,6 +36,7 @@
#include "v4color.h"
#include "llview.h"
#include "llmutelist.h"
+#include "llspeakingindicatormanager.h"
class LLTextBox;
class LLUICtrlFactory;
@@ -45,7 +46,7 @@ class LLUICtrlFactory;
//
class LLOutputMonitorCtrl
-: public LLView, LLMuteListObserver
+: public LLView, public LLSpeakingIndicator, LLMuteListObserver
{
public:
struct Params : public LLInitParam::Block<Params, LLView::Params>
@@ -90,7 +91,29 @@ public:
//called by mute list
virtual void onChange();
+ /**
+ * Implementation of LLSpeakingIndicator interface.
+ * Behavior is implemented via changing visibility.
+ *
+ * If instance is in visible chain now (all parents are visible) it changes visibility
+ * and notify parent about this.
+ *
+ * Otherwise it marks an instance as dirty and stores necessary visibility.
+ * It will be applied in next draw and parent will be notified.
+ */
+ virtual void switchIndicator(bool switch_on);
+
private:
+
+ /**
+ * Notifies parent about changed visibility.
+ *
+ * Passes LLSD with "visibility_changed" => <current visibility> value.
+ * For now it is processed by LLAvatarListItem to update (reshape) its children.
+ * Implemented fo complete EXT-3976
+ */
+ void notifyParentVisibilityChanged();
+
//static LLColor4 sColorMuted;
//static LLColor4 sColorNormal;
//static LLColor4 sColorOverdriven;
@@ -117,6 +140,10 @@ private:
/** uuid of a speaker being monitored */
LLUUID mSpeakerId;
+
+ /** indicates if the instance is dirty and should notify parent */
+ bool mIsSwitchDirty;
+ bool mShouldSwitchOn;
};
#endif
diff --git a/indra/newview/llpanelavatar.cpp b/indra/newview/llpanelavatar.cpp
index fb898f7cdf6110826e6c0b23daad32d9efb35ab7..85e95ca1d65bcc502c04795c2e853ba8fb5d9eeb 100644
--- a/indra/newview/llpanelavatar.cpp
+++ b/indra/newview/llpanelavatar.cpp
@@ -52,6 +52,7 @@
#include "llfloaterreg.h"
#include "llnotificationsutil.h"
#include "llvoiceclient.h"
+#include "llnamebox.h"
//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
// Class LLDropTarget
@@ -595,7 +596,10 @@ void LLPanelAvatarProfile::processGroupProperties(const LLAvatarGroups* avatar_g
groups += ", ";
std::string group_name = LLURI::escape(it->first);
- std::string group_url="[secondlife:///app/group/" + it->second.asString() + "/about " + group_name + "]";
+ std::string group_url= it->second.notNull()
+ ? "[secondlife:///app/group/" + it->second.asString() + "/about " + group_name + "]"
+ : getString("no_group_text");
+
groups += group_url;
}
@@ -621,19 +625,15 @@ void LLPanelAvatarProfile::fillCommonData(const LLAvatarData* avatar_data)
void LLPanelAvatarProfile::fillPartnerData(const LLAvatarData* avatar_data)
{
+ LLNameBox* name_box = getChild<LLNameBox>("partner_text");
if (avatar_data->partner_id.notNull())
{
- std::string first, last;
- BOOL found = gCacheName->getName(avatar_data->partner_id, first, last);
- if (found)
- {
- childSetTextArg("partner_text", "[FIRST]", first);
- childSetTextArg("partner_text", "[LAST]", last);
- }
+ name_box->setNameID(avatar_data->partner_id, FALSE);
}
else
{
- childSetTextArg("partner_text", "[FIRST]", getString("no_partner_text"));
+ name_box->setNameID(LLUUID::null, FALSE);
+ name_box->setText(getString("no_partner_text"));
}
}
diff --git a/indra/newview/llpanelgroup.cpp b/indra/newview/llpanelgroup.cpp
index 94de17c17d8fd4f96cd0f3098d3f888975461a12..daec793d75691f221e62a727fdef5a2417c5ff87 100644
--- a/indra/newview/llpanelgroup.cpp
+++ b/indra/newview/llpanelgroup.cpp
@@ -151,6 +151,11 @@ BOOL LLPanelGroup::postBuild()
button->setVisible(true);
button->setEnabled(false);
+ button = getChild<LLButton>("btn_call");
+ button->setClickedCallback(onBtnGroupCallClicked, this);
+
+ button = getChild<LLButton>("btn_chat");
+ button->setClickedCallback(onBtnGroupChatClicked, this);
button = getChild<LLButton>("btn_join");
button->setVisible(false);
@@ -215,6 +220,8 @@ void LLPanelGroup::reposButtons()
reposButton("btn_create");
reposButton("btn_refresh");
reposButton("btn_cancel");
+ reposButton("btn_chat");
+ reposButton("btn_call");
}
void LLPanelGroup::reshape(S32 width, S32 height, BOOL called_from_parent )
@@ -262,6 +269,18 @@ void LLPanelGroup::onBtnApply(void* user_data)
self->apply();
}
+void LLPanelGroup::onBtnGroupCallClicked(void* user_data)
+{
+ LLPanelGroup* self = static_cast<LLPanelGroup*>(user_data);
+ self->callGroup();
+}
+
+void LLPanelGroup::onBtnGroupChatClicked(void* user_data)
+{
+ LLPanelGroup* self = static_cast<LLPanelGroup*>(user_data);
+ self->chatGroup();
+}
+
void LLPanelGroup::onBtnJoin()
{
lldebugs << "joining group: " << mID << llendl;
@@ -349,6 +368,8 @@ void LLPanelGroup::setGroupID(const LLUUID& group_id)
LLButton* button_create = findChild<LLButton>("btn_create");
LLButton* button_join = findChild<LLButton>("btn_join");
LLButton* button_cancel = findChild<LLButton>("btn_cancel");
+ LLButton* button_call = findChild<LLButton>("btn_call");
+ LLButton* button_chat = findChild<LLButton>("btn_chat");
bool is_null_group_id = group_id == LLUUID::null;
@@ -362,6 +383,11 @@ void LLPanelGroup::setGroupID(const LLUUID& group_id)
if(button_cancel)
button_cancel->setVisible(!is_null_group_id);
+ if(button_call)
+ button_call->setVisible(!is_null_group_id);
+ if(button_chat)
+ button_chat->setVisible(!is_null_group_id);
+
getChild<LLUICtrl>("prepend_founded_by")->setVisible(!is_null_group_id);
LLAccordionCtrl* tab_ctrl = findChild<LLAccordionCtrl>("group_accordion");
@@ -423,12 +449,15 @@ void LLPanelGroup::setGroupID(const LLUUID& group_id)
getChild<LLUICtrl>("group_name")->setVisible(true);
getChild<LLUICtrl>("group_name_editor")->setVisible(false);
+
+ if(button_apply)
+ button_apply->setVisible(is_member);
}
reposButtons();
}
-bool LLPanelGroup::apply(LLPanelGroupTab* tab)
+bool LLPanelGroup::apply(LLPanelGroupTab* tab)
{
if(!tab)
return false;
@@ -471,12 +500,17 @@ void LLPanelGroup::draw()
childEnable("btn_refresh");
}
- bool enable = false;
- std::string mesg;
- for(std::vector<LLPanelGroupTab* >::iterator it = mTabs.begin();it!=mTabs.end();++it)
- enable = enable || (*it)->needsApply(mesg);
+ LLButton* button_apply = findChild<LLButton>("btn_apply");
+
+ if(button_apply && button_apply->getVisible())
+ {
+ bool enable = false;
+ std::string mesg;
+ for(std::vector<LLPanelGroupTab* >::iterator it = mTabs.begin();it!=mTabs.end();++it)
+ enable = enable || (*it)->needsApply(mesg);
- childSetEnabled("btn_apply", enable);
+ childSetEnabled("btn_apply", enable);
+ }
}
void LLPanelGroup::refreshData()
@@ -491,6 +525,15 @@ void LLPanelGroup::refreshData()
mRefreshTimer.setTimerExpirySec(5);
}
+void LLPanelGroup::callGroup()
+{
+ LLGroupActions::startCall(getID());
+}
+
+void LLPanelGroup::chatGroup()
+{
+ LLGroupActions::startIM(getID());
+}
void LLPanelGroup::showNotice(const std::string& subject,
const std::string& message,
diff --git a/indra/newview/llpanelgroup.h b/indra/newview/llpanelgroup.h
index f6aefdb676d85cc043262d1a7376b32e4ad124e0..7ea5e67b44f30be8911de4ffbb0e1f133076e0d3 100644
--- a/indra/newview/llpanelgroup.h
+++ b/indra/newview/llpanelgroup.h
@@ -74,6 +74,8 @@ public:
bool apply();
void refreshData();
+ void callGroup();
+ void chatGroup();
virtual void reshape(S32 width, S32 height, BOOL called_from_parent = TRUE);
@@ -103,6 +105,8 @@ protected:
static void onBtnApply(void*);
static void onBtnRefresh(void*);
+ static void onBtnGroupCallClicked(void*);
+ static void onBtnGroupChatClicked(void*);
void reposButton(const std::string& name);
void reposButtons();
diff --git a/indra/newview/llpanelgroupgeneral.cpp b/indra/newview/llpanelgroupgeneral.cpp
index 31dfdde887c1841590ca4eb49687062dd053c6e7..21b253223f0332e853b1b1273c9ae0b97b054562 100644
--- a/indra/newview/llpanelgroupgeneral.cpp
+++ b/indra/newview/llpanelgroupgeneral.cpp
@@ -580,7 +580,6 @@ void LLPanelGroupGeneral::update(LLGroupChange gc)
}
}
- mComboActiveTitle->resetDirty();
}
// If this was just a titles update, we are done.
@@ -595,8 +594,6 @@ void LLPanelGroupGeneral::update(LLGroupChange gc)
{
mCtrlShowInGroupList->set(gdatap->mShowInList);
mCtrlShowInGroupList->setEnabled(mAllowEdit && can_change_ident);
- mCtrlShowInGroupList->resetDirty();
-
}
if (mComboMature)
{
@@ -610,19 +607,16 @@ void LLPanelGroupGeneral::update(LLGroupChange gc)
}
mComboMature->setEnabled(mAllowEdit && can_change_ident);
mComboMature->setVisible( !gAgent.isTeen() );
- mComboMature->resetDirty();
}
if (mCtrlOpenEnrollment)
{
mCtrlOpenEnrollment->set(gdatap->mOpenEnrollment);
mCtrlOpenEnrollment->setEnabled(mAllowEdit && can_change_member_opts);
- mCtrlOpenEnrollment->resetDirty();
}
if (mCtrlEnrollmentFee)
{
mCtrlEnrollmentFee->set(gdatap->mMembershipFee > 0);
mCtrlEnrollmentFee->setEnabled(mAllowEdit && can_change_member_opts);
- mCtrlEnrollmentFee->resetDirty();
}
if (mSpinEnrollmentFee)
@@ -632,7 +626,6 @@ void LLPanelGroupGeneral::update(LLGroupChange gc)
mSpinEnrollmentFee->setEnabled( mAllowEdit &&
(fee > 0) &&
can_change_member_opts);
- mSpinEnrollmentFee->resetDirty();
}
if (mCtrlReceiveNotices)
{
@@ -641,7 +634,6 @@ void LLPanelGroupGeneral::update(LLGroupChange gc)
{
mCtrlReceiveNotices->setEnabled(mAllowEdit);
}
- mCtrlReceiveNotices->resetDirty();
}
@@ -665,7 +657,6 @@ void LLPanelGroupGeneral::update(LLGroupChange gc)
if (mEditCharter)
{
mEditCharter->setText(gdatap->mCharter);
- mEditCharter->resetDirty();
}
if (mListVisibleMembers)
@@ -693,6 +684,8 @@ void LLPanelGroupGeneral::update(LLGroupChange gc)
mListVisibleMembers->addElement(row);
}
}
+
+ resetDirty();
}
void LLPanelGroupGeneral::updateMembers()
diff --git a/indra/newview/llpanelgrouproles.cpp b/indra/newview/llpanelgrouproles.cpp
index 29b647415c3414d7cd20596404d41ea4aeb2d537..0e55ff3214d6e4c2b9ee45c9714ad74fe02bcb61 100644
--- a/indra/newview/llpanelgrouproles.cpp
+++ b/indra/newview/llpanelgrouproles.cpp
@@ -460,17 +460,8 @@ LLPanelGroupSubTab::~LLPanelGroupSubTab()
{
}
-BOOL LLPanelGroupSubTab::postBuild()
-{
- // Hook up the search widgets.
- bool recurse = true;
- mSearchEditor = getChild<LLFilterEditor>("filter_input", recurse);
-
- if (!mSearchEditor)
- return FALSE;
-
- mSearchEditor->setCommitCallback(boost::bind(&LLPanelGroupSubTab::setSearchFilter, this, _2));
-
+BOOL LLPanelGroupSubTab::postBuildSubTab(LLView* root)
+{
// Get icons for later use.
mActionIcons.clear();
@@ -488,6 +479,19 @@ BOOL LLPanelGroupSubTab::postBuild()
{
mActionIcons["partial"] = getString("power_partial_icon");
}
+ return TRUE;
+}
+
+BOOL LLPanelGroupSubTab::postBuild()
+{
+ // Hook up the search widgets.
+ bool recurse = true;
+ mSearchEditor = getChild<LLFilterEditor>("filter_input", recurse);
+
+ if (!mSearchEditor)
+ return FALSE;
+
+ mSearchEditor->setCommitCallback(boost::bind(&LLPanelGroupSubTab::setSearchFilter, this, _2));
return LLPanelGroupTab::postBuild();
}
@@ -567,7 +571,6 @@ bool LLPanelGroupSubTab::matchesActionSearchFilter(std::string action)
void LLPanelGroupSubTab::buildActionsList(LLScrollListCtrl* ctrl,
U64 allowed_by_some,
U64 allowed_by_all,
- icon_map_t& icons,
LLUICtrl::commit_callback_t commit_callback,
BOOL show_all,
BOOL filter,
@@ -588,7 +591,6 @@ void LLPanelGroupSubTab::buildActionsList(LLScrollListCtrl* ctrl,
allowed_by_some,
allowed_by_all,
(*ras_it),
- icons,
commit_callback,
show_all,
filter,
@@ -600,7 +602,6 @@ void LLPanelGroupSubTab::buildActionCategory(LLScrollListCtrl* ctrl,
U64 allowed_by_some,
U64 allowed_by_all,
LLRoleActionSet* action_set,
- icon_map_t& icons,
LLUICtrl::commit_callback_t commit_callback,
BOOL show_all,
BOOL filter,
@@ -614,26 +615,26 @@ void LLPanelGroupSubTab::buildActionCategory(LLScrollListCtrl* ctrl,
LLSD row;
row["columns"][0]["column"] = "icon";
- icon_map_t::iterator iter = icons.find("folder");
- if (iter != icons.end())
+ row["columns"][0]["type"] = "icon";
+
+ icon_map_t::iterator iter = mActionIcons.find("folder");
+ if (iter != mActionIcons.end())
{
- row["columns"][0]["type"] = "icon";
row["columns"][0]["value"] = (*iter).second;
}
row["columns"][1]["column"] = "action";
+ row["columns"][1]["type"] = "text";
row["columns"][1]["value"] = action_set->mActionSetData->mName;
row["columns"][1]["font"]["name"] = "SANSSERIF_SMALL";
- row["columns"][1]["font"]["style"] = "BOLD";
+
LLScrollListItem* title_row = ctrl->addElement(row, ADD_BOTTOM, action_set->mActionSetData);
- LLScrollListText* name_textp = dynamic_cast<LLScrollListText*>(title_row->getColumn(1));
+ LLScrollListText* name_textp = dynamic_cast<LLScrollListText*>(title_row->getColumn(2)); //?? I have no idea fix getColumn(1) return column spacer...
if (name_textp)
name_textp->setFontStyle(LLFontGL::BOLD);
-
-
bool category_matches_filter = (filter) ? matchesActionSearchFilter(action_set->mActionSetData->mName) : true;
std::vector<LLRoleAction*>::iterator ra_it = action_set->mActions.begin();
@@ -686,8 +687,8 @@ void LLPanelGroupSubTab::buildActionCategory(LLScrollListCtrl* ctrl,
{
if (show_full_strength)
{
- icon_map_t::iterator iter = icons.find("full");
- if (iter != icons.end())
+ icon_map_t::iterator iter = mActionIcons.find("full");
+ if (iter != mActionIcons.end())
{
row["columns"][column_index]["column"] = "checkbox";
row["columns"][column_index]["type"] = "icon";
@@ -697,8 +698,8 @@ void LLPanelGroupSubTab::buildActionCategory(LLScrollListCtrl* ctrl,
}
else
{
- icon_map_t::iterator iter = icons.find("partial");
- if (iter != icons.end())
+ icon_map_t::iterator iter = mActionIcons.find("partial");
+ if (iter != mActionIcons.end())
{
row["columns"][column_index]["column"] = "checkbox";
row["columns"][column_index]["type"] = "icon";
@@ -792,6 +793,8 @@ LLPanelGroupMembersSubTab::~LLPanelGroupMembersSubTab()
BOOL LLPanelGroupMembersSubTab::postBuildSubTab(LLView* root)
{
+ LLPanelGroupSubTab::postBuildSubTab(root);
+
// Upcast parent so we can ask it for sibling controls.
LLPanelGroupRoles* parent = (LLPanelGroupRoles*) root;
@@ -888,7 +891,6 @@ void LLPanelGroupMembersSubTab::handleMemberSelect()
buildActionsList(mAllowedActionsList,
allowed_by_some,
allowed_by_all,
- mActionIcons,
NULL,
FALSE,
FALSE,
@@ -1211,7 +1213,6 @@ void LLPanelGroupMembersSubTab::handleRoleCheck(const LLUUID& role_id,
buildActionsList(mAllowedActionsList,
powers_some_have,
powers_all_have,
- mActionIcons,
NULL,
FALSE,
FALSE,
@@ -1684,6 +1685,8 @@ LLPanelGroupRolesSubTab::~LLPanelGroupRolesSubTab()
BOOL LLPanelGroupRolesSubTab::postBuildSubTab(LLView* root)
{
+ LLPanelGroupSubTab::postBuildSubTab(root);
+
// Upcast parent so we can ask it for sibling controls.
LLPanelGroupRoles* parent = (LLPanelGroupRoles*) root;
@@ -1994,7 +1997,6 @@ void LLPanelGroupRolesSubTab::handleRoleSelect()
buildActionsList(mAllowedActionsList,
rd.mRolePowers,
0LL,
- mActionIcons,
boost::bind(&LLPanelGroupRolesSubTab::handleActionCheck, this, _1, false),
TRUE,
FALSE,
@@ -2381,6 +2383,8 @@ LLPanelGroupActionsSubTab::~LLPanelGroupActionsSubTab()
BOOL LLPanelGroupActionsSubTab::postBuildSubTab(LLView* root)
{
+ LLPanelGroupSubTab::postBuildSubTab(root);
+
// Upcast parent so we can ask it for sibling controls.
LLPanelGroupRoles* parent = (LLPanelGroupRoles*) root;
@@ -2448,7 +2452,6 @@ void LLPanelGroupActionsSubTab::update(LLGroupChange gc)
buildActionsList(mActionList,
GP_ALL_POWERS,
GP_ALL_POWERS,
- mActionIcons,
NULL,
FALSE,
TRUE,
diff --git a/indra/newview/llpanelgrouproles.h b/indra/newview/llpanelgrouproles.h
index bb3c9096cf406b5479c2da6122697f460efdc9b8..2f81900e609512888e038fdbfa5c9aabcfbe9c0f 100644
--- a/indra/newview/llpanelgrouproles.h
+++ b/indra/newview/llpanelgrouproles.h
@@ -108,7 +108,7 @@ public:
virtual BOOL postBuild();
// This allows sub-tabs to collect child widgets from a higher level in the view hierarchy.
- virtual BOOL postBuildSubTab(LLView* root) { return TRUE; }
+ virtual BOOL postBuildSubTab(LLView* root);
virtual void setSearchFilter( const std::string& filter );
@@ -117,10 +117,15 @@ public:
// Helper functions
bool matchesActionSearchFilter(std::string action);
+
+
+ void setFooterEnabled(BOOL enable);
+
+ virtual void setGroupID(const LLUUID& id);
+protected:
void buildActionsList(LLScrollListCtrl* ctrl,
U64 allowed_by_some,
U64 allowed_by_all,
- icon_map_t& icons,
LLUICtrl::commit_callback_t commit_callback,
BOOL show_all,
BOOL filter,
@@ -129,15 +134,11 @@ public:
U64 allowed_by_some,
U64 allowed_by_all,
LLRoleActionSet* action_set,
- icon_map_t& icons,
LLUICtrl::commit_callback_t commit_callback,
BOOL show_all,
BOOL filter,
BOOL is_owner_role);
- void setFooterEnabled(BOOL enable);
-
- virtual void setGroupID(const LLUUID& id);
protected:
LLPanel* mHeader;
LLPanel* mFooter;
diff --git a/indra/newview/llpanelimcontrolpanel.cpp b/indra/newview/llpanelimcontrolpanel.cpp
index b547997e7aaf75854db77704e59e22fbfde69e19..0cfe501fab52edba818aaaa80fa6979a8f296ac2 100644
--- a/indra/newview/llpanelimcontrolpanel.cpp
+++ b/indra/newview/llpanelimcontrolpanel.cpp
@@ -302,7 +302,7 @@ void LLPanelGroupControlPanel::setSessionId(const LLUUID& session_id)
{
LLPanelChatControlPanel::setSessionId(session_id);
- mGroupID = LLIMModel::getInstance()->getOtherParticipantID(session_id);
+ mGroupID = session_id;
// for group and Ad-hoc chat we need to include agent into list
if(!mParticipantList)
diff --git a/indra/newview/llpanelpeople.cpp b/indra/newview/llpanelpeople.cpp
index e14a5778adc47fbe9cc6613cf7d777e121b6e198..03cc870a59572bcdefe78f470f5c166bdd493ef9 100644
--- a/indra/newview/llpanelpeople.cpp
+++ b/indra/newview/llpanelpeople.cpp
@@ -35,6 +35,7 @@
// libs
#include "llfloaterreg.h"
#include "llmenugl.h"
+#include "llnotificationsutil.h"
#include "llfiltereditor.h"
#include "lltabcontainer.h"
#include "lluictrlfactory.h"
@@ -750,7 +751,6 @@ void LLPanelPeople::updateButtons()
LLPanel* groups_panel = mTabContainer->getCurrentPanel();
groups_panel->childSetEnabled("activate_btn", item_selected && !cur_group_active); // "none" or a non-active group selected
- groups_panel->childSetEnabled("plus_btn", item_selected);
groups_panel->childSetEnabled("minus_btn", item_selected && selected_id.notNull());
}
else
@@ -1138,6 +1138,12 @@ void LLPanelPeople::onAvatarPicked(
void LLPanelPeople::onGroupPlusButtonClicked()
{
+ if (!gAgent.canJoinGroups())
+ {
+ LLNotificationsUtil::add("JoinedTooManyGroups");
+ return;
+ }
+
LLMenuGL* plus_menu = (LLMenuGL*)mGroupPlusMenuHandle.get();
if (!plus_menu)
return;
diff --git a/indra/newview/llpanelpick.cpp b/indra/newview/llpanelpick.cpp
index 7a4dd3569d5465be477f2b2949a93aaf6684ecf7..e7615929c82851807b61435c0fbcd3f05cab87fb 100644
--- a/indra/newview/llpanelpick.cpp
+++ b/indra/newview/llpanelpick.cpp
@@ -35,24 +35,30 @@
// profile.
#include "llviewerprecompiledheaders.h"
-#include "llpanel.h"
+
+#include "llpanelpick.h"
+
#include "message.h"
-#include "llagent.h"
-#include "llagentpicksinfo.h"
+
+#include "llparcel.h"
+
#include "llbutton.h"
+#include "llfloaterreg.h"
#include "lliconctrl.h"
#include "lllineeditor.h"
-#include "llparcel.h"
-#include "llviewerparcelmgr.h"
+#include "llpanel.h"
+#include "llscrollcontainer.h"
#include "lltexteditor.h"
+
+#include "llagent.h"
+#include "llagentpicksinfo.h"
+#include "llavatarpropertiesprocessor.h"
+#include "llfloaterworldmap.h"
#include "lltexturectrl.h"
#include "lluiconstants.h"
+#include "llviewerparcelmgr.h"
#include "llviewerregion.h"
#include "llworldmap.h"
-#include "llfloaterworldmap.h"
-#include "llfloaterreg.h"
-#include "llavatarpropertiesprocessor.h"
-#include "llpanelpick.h"
#define XML_PANEL_EDIT_PICK "panel_edit_pick.xml"
@@ -93,6 +99,10 @@ LLPanelPickInfo::LLPanelPickInfo()
, mPickId(LLUUID::null)
, mParcelId(LLUUID::null)
, mRequestedId(LLUUID::null)
+ , mScrollingPanelMinHeight(0)
+ , mScrollingPanelWidth(0)
+ , mScrollingPanel(NULL)
+ , mScrollContainer(NULL)
{
}
@@ -146,9 +156,35 @@ BOOL LLPanelPickInfo::postBuild()
childSetAction("show_on_map_btn", boost::bind(&LLPanelPickInfo::onClickMap, this));
childSetAction("back_btn", boost::bind(&LLPanelPickInfo::onClickBack, this));
+ mScrollingPanel = getChild<LLPanel>("scroll_content_panel");
+ mScrollContainer = getChild<LLScrollContainer>("profile_scroll");
+
+ mScrollingPanelMinHeight = mScrollContainer->getScrolledViewRect().getHeight();
+ mScrollingPanelWidth = mScrollingPanel->getRect().getWidth();
+
return TRUE;
}
+void LLPanelPickInfo::reshape(S32 width, S32 height, BOOL called_from_parent)
+{
+ LLPanel::reshape(width, height, called_from_parent);
+
+ if (!mScrollContainer || !mScrollingPanel)
+ return;
+
+ static LLUICachedControl<S32> scrollbar_size ("UIScrollbarSize", 0);
+
+ S32 scroll_height = mScrollContainer->getRect().getHeight();
+ if (mScrollingPanelMinHeight >= scroll_height)
+ {
+ mScrollingPanel->reshape(mScrollingPanelWidth, mScrollingPanelMinHeight);
+ }
+ else
+ {
+ mScrollingPanel->reshape(mScrollingPanelWidth + scrollbar_size, scroll_height);
+ }
+}
+
void LLPanelPickInfo::processProperties(void* data, EAvatarProcessorType type)
{
if(APT_PICK_INFO != type)
@@ -284,7 +320,6 @@ void LLPanelPickInfo::setPickName(const std::string& name)
void LLPanelPickInfo::setPickDesc(const std::string& desc)
{
childSetValue(XML_DESC, desc);
- updateContentPanelRect();
}
void LLPanelPickInfo::setPickLocation(const std::string& location)
@@ -292,31 +327,6 @@ void LLPanelPickInfo::setPickLocation(const std::string& location)
childSetValue(XML_LOCATION, location);
}
-void LLPanelPickInfo::updateContentPanelRect()
-{
- LLTextBox* desc = getChild<LLTextBox>(XML_DESC);
-
- S32 text_height = desc->getTextPixelHeight();
- LLRect text_rect = desc->getRect();
-
- // let text-box height fit text height
- text_rect.set(text_rect.mLeft, text_rect.mTop, text_rect.mRight, text_rect.mTop - text_height);
- desc->setRect(text_rect);
- desc->reshape(text_rect.getWidth(), text_rect.getHeight());
- // force reflow
- desc->setText(desc->getText());
-
- // bottom of description text-box will be bottom of content panel
- desc->localRectToOtherView(desc->getLocalRect(), &text_rect, getChild<LLView>("profile_scroll"));
-
- LLPanel* content_panel = getChild<LLPanel>("scroll_content_panel");
- LLRect content_rect = content_panel->getRect();
- content_rect.set(content_rect.mLeft, content_rect.mTop, content_rect.mRight, text_rect.mBottom);
- // Somehow setRect moves all elements down.
- // Single reshape() updates rect and does not move anything.
- content_panel->reshape(content_rect.getWidth(), content_rect.getHeight());
-}
-
void LLPanelPickInfo::onClickMap()
{
LLFloaterWorldMap::getInstance()->trackLocation(getPosGlobal());
diff --git a/indra/newview/llpanelpick.h b/indra/newview/llpanelpick.h
index 12b5a116b48e33bc5795fb0d8d8d068c061cf5ac..62c3b20c0da9c958fb6dd560a129c79338efac6f 100644
--- a/indra/newview/llpanelpick.h
+++ b/indra/newview/llpanelpick.h
@@ -43,6 +43,7 @@
class LLIconCtrl;
class LLTextureCtrl;
+class LLScrollContainer;
class LLMessageSystem;
class LLAvatarPropertiesObserver;
@@ -69,6 +70,8 @@ public:
/*virtual*/ BOOL postBuild();
+ /*virtual*/ void reshape(S32 width, S32 height, BOOL called_from_parent = TRUE);
+
/*virtual*/ void processProperties(void* data, EAvatarProcessorType type);
/**
@@ -139,15 +142,6 @@ protected:
virtual void setPosGlobal(const LLVector3d& pos) { mPosGlobal = pos; }
virtual LLVector3d& getPosGlobal() { return mPosGlobal; }
- /**
- * Reshapes content panel to fit all elements.
- *
- * Assume that description text-box is the last element of panel.
- * Reshape text-box to fit text height and then reshape content panel to fit
- * text-box bottom. EXT-1326
- */
- void updateContentPanelRect();
-
/**
* Callback for "Map" button, opens Map
*/
@@ -162,7 +156,11 @@ protected:
protected:
- LLTextureCtrl* mSnapshotCtrl;
+ S32 mScrollingPanelMinHeight;
+ S32 mScrollingPanelWidth;
+ LLScrollContainer* mScrollContainer;
+ LLPanel* mScrollingPanel;
+ LLTextureCtrl* mSnapshotCtrl;
LLUUID mAvatarId;
LLVector3d mPosGlobal;
diff --git a/indra/newview/llpanelplaces.h b/indra/newview/llpanelplaces.h
index 5ee87049926cd55545d6538c9ebf44e37621b431..b134cf0cba63fd9064f96ec5834ba7111e59a8fa 100644
--- a/indra/newview/llpanelplaces.h
+++ b/indra/newview/llpanelplaces.h
@@ -71,6 +71,10 @@ public:
void setItem(LLInventoryItem* item);
+ LLInventoryItem* getItem() { return mItem; }
+
+ std::string getPlaceInfoType() { return mPlaceInfoType; }
+
private:
void onLandmarkLoaded(LLLandmark* landmark);
void onFilterEdit(const std::string& search_string, bool force_filter);
diff --git a/indra/newview/llpanelteleporthistory.cpp b/indra/newview/llpanelteleporthistory.cpp
index 65a3d9d41b9fdc216d1c154fe02b7ef97c9e29ea..0a2217fc51c4f70407c21a3f7c828611306e6aff 100644
--- a/indra/newview/llpanelteleporthistory.cpp
+++ b/indra/newview/llpanelteleporthistory.cpp
@@ -550,7 +550,7 @@ void LLTeleportHistoryPanel::updateVerbs()
LLTeleportHistoryFlatItem* itemp = dynamic_cast<LLTeleportHistoryFlatItem *> (mLastSelectedFlatlList->getSelectedItem());
- mTeleportBtn->setEnabled(NULL != itemp && itemp->getIndex() < (S32)mTeleportHistory->getItems().size() - 1);
+ mTeleportBtn->setEnabled(NULL != itemp);
mShowOnMapBtn->setEnabled(NULL != itemp);
}
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/llparticipantlist.cpp b/indra/newview/llparticipantlist.cpp
index e2da4c44758626666d1ba10a35d4f43d0a9e10bd..b6f78d08f1227b609212f73a56ec76e93abfc6aa 100644
--- a/indra/newview/llparticipantlist.cpp
+++ b/indra/newview/llparticipantlist.cpp
@@ -166,7 +166,6 @@ void LLParticipantList::onAvatarListRefreshed(LLUICtrl* ctrl, const LLSD& param)
{
name.erase(found, moderator_indicator_len);
item->setName(name);
- item->reshapeAvatarName();
}
}
}
@@ -188,7 +187,6 @@ void LLParticipantList::onAvatarListRefreshed(LLUICtrl* ctrl, const LLSD& param)
name += " ";
name += moderator_indicator;
item->setName(name);
- item->reshapeAvatarName();
}
}
}
@@ -279,6 +277,9 @@ bool LLParticipantList::onModeratorUpdateEvent(LLPointer<LLOldEvents::LLEvent> e
mModeratorList.erase(id);
}
}
+
+ // apply changes immediately
+ onAvatarListRefreshed(mAvatarList, LLSD());
}
}
return true;
@@ -592,8 +593,7 @@ bool LLParticipantList::LLParticipantListMenu::enableContextMenuItem(const LLSD&
if (speakerp.notNull())
{
// not in voice participants can not be moderated
- return speakerp->mStatus == LLSpeaker::STATUS_VOICE_ACTIVE
- || speakerp->mStatus == LLSpeaker::STATUS_MUTED;
+ return speakerp->isInVoiceChannel();
}
}
return false;
diff --git a/indra/newview/llscreenchannel.cpp b/indra/newview/llscreenchannel.cpp
index da3f1543ddaf7cd72b32543637fb076edd2d4116..027f3daffbde09b67f1e6dc3a6333adbd6069ec0 100644
--- a/indra/newview/llscreenchannel.cpp
+++ b/indra/newview/llscreenchannel.cpp
@@ -59,17 +59,14 @@ bool LLScreenChannel::mWasStartUpToastShown = false;
// LLScreenChannelBase
//////////////////////
LLScreenChannelBase::LLScreenChannelBase(const LLUUID& id) :
- mOverflowToastPanel(NULL)
- ,mToastAlignment(NA_BOTTOM)
+ mToastAlignment(NA_BOTTOM)
,mCanStoreToasts(true)
,mHiddenToastsNum(0)
- ,mOverflowToastHidden(false)
,mHoveredToast(NULL)
,mControlHovering(false)
,mShowToasts(true)
{
mID = id;
- mOverflowFormatString = LLTrans::getString("OverflowInfoChannelString");
mWorldViewRectConnection = gViewerWindow->setOnWorldViewRectUpdated(boost::bind(&LLScreenChannelBase::updatePositionAndSize, this, _1, _2));
setMouseOpaque( false );
setVisible(FALSE);
@@ -217,11 +214,6 @@ void LLScreenChannel::addToast(const LLToast::Params& p)
ToastElem new_toast_elem(p);
- // reset HIDDEN flags for the Overflow Toast
- mOverflowToastHidden = false;
- if(mOverflowToastPanel)
- mOverflowToastPanel->setIsHidden(false);
-
new_toast_elem.toast->setOnFadeCallback(boost::bind(&LLScreenChannel::onToastFade, this, _1));
new_toast_elem.toast->setOnToastDestroyedCallback(boost::bind(&LLScreenChannel::onToastDestroyed, this, _1));
if(mControlHovering)
@@ -322,8 +314,6 @@ void LLScreenChannel::loadStoredToastsToChannel()
if(mStoredToastList.size() == 0)
return;
-
- mOverflowToastHidden = false;
for(it = mStoredToastList.begin(); it != mStoredToastList.end(); ++it)
{
@@ -344,8 +334,6 @@ void LLScreenChannel::loadStoredToastByNotificationIDToChannel(LLUUID id)
if( it == mStoredToastList.end() )
return;
- mOverflowToastHidden = false;
-
LLToast* toast = (*it).toast;
if(toast->getVisible())
@@ -357,7 +345,6 @@ void LLScreenChannel::loadStoredToastByNotificationIDToChannel(LLUUID id)
toast->setIsHidden(false);
toast->resetTimer();
mToastList.push_back((*it));
- mStoredToastList.erase(it);
redrawToasts();
}
@@ -491,7 +478,7 @@ void LLScreenChannel::showToastsBottom()
if(floater && floater->overlapsScreenChannel())
{
LLRect world_rect = gViewerWindow->getWorldViewRectScaled();
- if(toast_rect.mTop + getOverflowToastHeight() + toast_margin > world_rect.mTop)
+ if(toast_rect.mTop > world_rect.mTop)
{
break;
}
@@ -527,7 +514,7 @@ void LLScreenChannel::showToastsBottom()
}
}
- if(it != mToastList.rend() && !mOverflowToastHidden)
+ if(it != mToastList.rend())
{
mHiddenToastsNum = 0;
for(; it != mToastList.rend(); it++)
@@ -536,7 +523,6 @@ void LLScreenChannel::showToastsBottom()
(*it).toast->setVisible(FALSE);
mHiddenToastsNum++;
}
- createOverflowToast(bottom, gSavedSettings.getS32("NotificationTipToastLifeTime"));
}
else
{
@@ -566,94 +552,6 @@ void LLScreenChannel::showToastsTop()
{
}
-//--------------------------------------------------------------------------
-void LLScreenChannel::createOverflowToast(S32 bottom, F32 timer)
-{
- LLRect toast_rect;
- LLToast::Params p;
- p.lifetime_secs = timer;
-
- if(!mOverflowToastPanel)
- mOverflowToastPanel = new LLToast(p);
-
- if(!mOverflowToastPanel)
- return;
-
- mOverflowToastPanel->startFading();
- mOverflowToastPanel->setOnFadeCallback(boost::bind(&LLScreenChannel::onOverflowToastHide, this));
-
- LLTextBox* text_box = mOverflowToastPanel->getChild<LLTextBox>("toast_text");
- std::string text = llformat(mOverflowFormatString.c_str(),mHiddenToastsNum);
- if(mHiddenToastsNum == 1)
- {
- text += ".";
- }
- else
- {
- text += "s.";
- }
-
- toast_rect = mOverflowToastPanel->getRect();
- mOverflowToastPanel->reshape(getRect().getWidth(), toast_rect.getHeight(), true);
- toast_rect.setLeftTopAndSize(getRect().mLeft, bottom + toast_rect.getHeight()+gSavedSettings.getS32("ToastGap"), getRect().getWidth(), toast_rect.getHeight());
- mOverflowToastPanel->setRect(toast_rect);
-
- // don't show overflow toast if there is not enough space for it.
- LLDockableFloater* floater = dynamic_cast<LLDockableFloater*>(LLDockableFloater::getInstanceHandle().get());
- if(floater && floater->overlapsScreenChannel())
- {
- LLRect world_rect = gViewerWindow->getWorldViewRectScaled();
- if(toast_rect.mTop > world_rect.mTop)
- {
- closeOverflowToastPanel();
- return;
- }
- }
-
- text_box->setValue(text);
- text_box->setVisible(TRUE);
-
- mOverflowToastPanel->setVisible(TRUE);
-}
-
-//--------------------------------------------------------------------------
-void LLScreenChannel::onOverflowToastHide()
-{
- mOverflowToastHidden = true;
-
- // remove all hidden toasts from channel and save interactive notifications
- for(std::vector<ToastElem>::iterator it = mToastList.begin(); it != mToastList.end();)
- {
- if(!(*it).toast->getVisible())
- {
- if((*it).toast->getCanBeStored())
- {
- storeToast((*it));
- }
- else
- {
- deleteToast((*it).toast);
- }
-
- it = mToastList.erase(it);
- }
- else
- {
- ++it;
- }
- }
-}
-
-//--------------------------------------------------------------------------
-void LLScreenChannel::closeOverflowToastPanel()
-{
- if(mOverflowToastPanel != NULL)
- {
- mOverflowToastPanel->setVisible(FALSE);
- mOverflowToastPanel->stopFading();
- }
-}
-
//--------------------------------------------------------------------------
void LLScreenChannel::createStartUpToast(S32 notif_num, F32 timer)
{
@@ -699,24 +597,6 @@ F32 LLScreenChannel::getHeightRatio()
return ratio;
}
-S32 LLScreenChannel::getOverflowToastHeight()
-{
- if(mOverflowToastPanel)
- {
- return mOverflowToastPanel->getRect().getHeight();
- }
-
- static S32 height = 0;
- if(0 == height)
- {
- LLToast::Params p;
- LLToast* toast = new LLToast(p);
- height = toast->getRect().getHeight();
- delete toast;
- }
- return height;
-}
-
//--------------------------------------------------------------------------
void LLScreenChannel::updateStartUpString(S32 num)
{
@@ -778,6 +658,19 @@ void LLScreenChannel::hideToastsFromScreen()
(*it).toast->setVisible(FALSE);
}
+//--------------------------------------------------------------------------
+void LLScreenChannel::hideToast(const LLUUID& notification_id)
+{
+ std::vector<ToastElem>::iterator it = find(mToastList.begin(), mToastList.end(), notification_id);
+ if(mToastList.end() != it)
+ {
+ ToastElem te = *it;
+ te.toast->setVisible(FALSE);
+ te.toast->stopTimer();
+ mToastList.erase(it);
+ }
+}
+
//--------------------------------------------------------------------------
void LLScreenChannel::removeToastsFromChannel()
{
@@ -896,3 +789,13 @@ void LLScreenChannel::updateShowToastsState()
//--------------------------------------------------------------------------
+LLToast* LLScreenChannel::getToastByNotificationID(LLUUID id)
+{
+ std::vector<ToastElem>::iterator it = find(mStoredToastList.begin(),
+ mStoredToastList.end(), id);
+
+ if (it == mStoredToastList.end())
+ return NULL;
+
+ return it->toast;
+}
diff --git a/indra/newview/llscreenchannel.h b/indra/newview/llscreenchannel.h
index 38f27f756b6e1269709a75ee490610bbfba5d33b..88053d87d9dedacad96f6cb5a71c55cc4f1e0184 100644
--- a/indra/newview/llscreenchannel.h
+++ b/indra/newview/llscreenchannel.h
@@ -72,8 +72,7 @@ public:
virtual void setToastAlignment(EToastAlignment align) {mToastAlignment = align;}
virtual void setChannelAlignment(EChannelAlignment align) {mChannelAlignment = align;}
- virtual void setOverflowFormatString ( const std::string& str) { mOverflowFormatString = str; }
-
+
// kill or modify a toast by its ID
virtual void killToastByNotificationID(LLUUID id) {};
virtual void modifyToastNotificationByID(LLUUID id, LLSD data) {};
@@ -121,17 +120,13 @@ protected:
LLToast* mHoveredToast;
bool mCanStoreToasts;
bool mDisplayToastsAlways;
- bool mOverflowToastHidden;
// controls whether a channel shows toasts or not
bool mShowToasts;
//
EToastAlignment mToastAlignment;
EChannelAlignment mChannelAlignment;
- // attributes for the Overflow Toast
S32 mHiddenToastsNum;
- LLToast* mOverflowToastPanel;
- std::string mOverflowFormatString;
// channel's ID
LLUUID mID;
@@ -176,6 +171,8 @@ public:
void modifyToastByNotificationID(LLUUID id, LLPanel* panel);
// hide all toasts from screen, but not remove them from a channel
void hideToastsFromScreen();
+ // hide toast by notification id
+ void hideToast(const LLUUID& notification_id);
// removes all toasts from a channel
void removeToastsFromChannel();
// show all toasts in a channel
@@ -190,8 +187,6 @@ public:
void removeToastsBySessionID(LLUUID id);
// remove all storable toasts from screen and store them
void removeAndStoreAllStorableToasts();
- // close the Overflow Toast
- void closeOverflowToastPanel();
// close the StartUp Toast
void closeStartUpToast();
@@ -214,6 +209,8 @@ public:
// update number of notifications in the StartUp Toast
void updateStartUpString(S32 num);
+ LLToast* getToastByNotificationID(LLUUID id);
+
// Channel's signals
// signal on storing of faded toasts event
typedef boost::function<void (LLPanel* info_panel, const LLUUID id)> store_tost_callback_t;
@@ -257,7 +254,6 @@ private:
void onToastHover(LLToast* toast, bool mouse_enter);
void onToastFade(LLToast* toast);
void onToastDestroyed(LLToast* toast);
- void onOverflowToastHide();
void onStartUpToastHide();
//
@@ -270,9 +266,6 @@ private:
void showToastsCentre();
void showToastsTop();
- // create the Overflow Toast
- void createOverflowToast(S32 bottom, F32 timer);
-
// create the StartUp Toast
void createStartUpToast(S32 notif_num, F32 timer);
@@ -281,8 +274,6 @@ private:
*/
static F32 getHeightRatio();
- S32 getOverflowToastHeight();
-
// Channel's flags
static bool mWasStartUpToastShown;
diff --git a/indra/newview/llspeakers.cpp b/indra/newview/llspeakers.cpp
index 010dfd1b331e13f9a07c870f2865f38a289255f5..0dd9203c6d9992774c82dde2190034f36197d846 100644
--- a/indra/newview/llspeakers.cpp
+++ b/indra/newview/llspeakers.cpp
@@ -88,6 +88,11 @@ void LLSpeaker::onAvatarNameLookup(const LLUUID& id, const std::string& first, c
mDisplayName = first + " " + last;
}
+bool LLSpeaker::isInVoiceChannel()
+{
+ return mStatus == LLSpeaker::STATUS_VOICE_ACTIVE || mStatus == LLSpeaker::STATUS_MUTED;
+}
+
LLSpeakerUpdateModeratorEvent::LLSpeakerUpdateModeratorEvent(LLSpeaker* source)
: LLEvent(source, "Speaker add moderator event"),
mSpeakerID (source->mID),
diff --git a/indra/newview/llspeakers.h b/indra/newview/llspeakers.h
index 1a8c23f56a222de07168a7d8875da4cb0e7dabe5..da8dfdf548e639dbaf949c8065bc7ca4fe568cd5 100644
--- a/indra/newview/llspeakers.h
+++ b/indra/newview/llspeakers.h
@@ -67,6 +67,8 @@ public:
void onAvatarNameLookup(const LLUUID& id, const std::string& first, const std::string& last, BOOL is_group);
+ bool isInVoiceChannel();
+
ESpeakerStatus mStatus; // current activity status in speech group
F32 mLastSpokeTime; // timestamp when this speaker last spoke
F32 mSpeechVolume; // current speech amplitude (timea average rms amplitude?)
diff --git a/indra/newview/llspeakingindicatormanager.cpp b/indra/newview/llspeakingindicatormanager.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..42db6bf9c3f43373563385410a0f6911da7106e1
--- /dev/null
+++ b/indra/newview/llspeakingindicatormanager.cpp
@@ -0,0 +1,254 @@
+/**
+ * @file llspeakingindicatormanager.cpp
+ * @author Mike Antipov
+ * @brief Implementation of SpeackerIndicatorManager class to process registered LLSpeackerIndicator
+ * depend on avatars are in the same voice channel.
+ *
+ * $LicenseInfo:firstyear=2010&license=viewergpl$
+ *
+ * Copyright (c) 2010, 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 "llspeakingindicatormanager.h"
+
+
+#include "llagentdata.h"
+#include "llvoicechannel.h"
+#include "llvoiceclient.h"
+
+/**
+ * This class intended to control visibility of avatar speaking indicators depend on whether avatars
+ * are in the same voice channel.
+ *
+ * Speaking indicator should be visible for avatars in the same voice channel. See EXT-3976.
+ *
+ * It stores passed instances of LLOutputMonitorCtrl in a multimap by avatar LLUUID.
+ * It observes changing of voice channel and changing of participant list in voice channel.
+ * When voice channel or voice participant list is changed it updates visibility of an appropriate
+ * speaking indicator.
+ *
+ * Several indicators can be registered for the same avatar.
+ */
+class SpeakingIndicatorManager : public LLSingleton<SpeakingIndicatorManager>, LLVoiceClientParticipantObserver
+{
+ LOG_CLASS(SpeakingIndicatorManager);
+public:
+
+ /**
+ * Stores passed speaking indicator to control its visibility.
+ *
+ * Registered indicator is set visible if an appropriate avatar is in the same voice channel with Agent.
+ * It ignores instances of Agent's indicator.
+ *
+ * @param speaker_id LLUUID of an avatar whose speaking indicator is registered.
+ * @param speaking_indicator instance of the speaking indicator to be registered.
+ */
+ void registerSpeakingIndicator(const LLUUID& speaker_id, LLSpeakingIndicator* const speaking_indicator);
+
+ /**
+ * Removes passed speaking indicator from observing.
+ *
+ * @param speaker_id LLUUID of an avatar whose speaking indicator should be unregistered.
+ * @param speaking_indicator instance of the speaking indicator to be unregistered.
+ */
+ void unregisterSpeakingIndicator(const LLUUID& speaker_id, const LLSpeakingIndicator* const speaking_indicator);
+
+private:
+ typedef std::set<LLUUID> speaker_ids_t;
+ typedef std::multimap<LLUUID, LLSpeakingIndicator*> speaking_indicators_mmap_t;
+ typedef speaking_indicators_mmap_t::value_type speaking_indicator_value_t;
+ typedef speaking_indicators_mmap_t::const_iterator indicator_const_iterator;
+ typedef std::pair<indicator_const_iterator, indicator_const_iterator> indicator_range_t;
+
+ friend class LLSingleton<SpeakingIndicatorManager>;
+ SpeakingIndicatorManager();
+ ~SpeakingIndicatorManager();
+
+ /**
+ * Callback to determine when voice channel is changed.
+ *
+ * It switches all registered speaking indicators off.
+ * To reduce overheads only switched on indicators are processed.
+ */
+ void sOnCurrentChannelChanged(const LLUUID& session_id);
+
+ /**
+ * Callback of changing voice participant list (from LLVoiceClientParticipantObserver).
+ *
+ * Switches off indicators had been switched on and switches on indicators of current participants list.
+ * There is only a few indicators in lists should be switched off/on.
+ * So, method does not calculate difference between these list it only switches off already
+ * switched on indicators and switches on indicators of voice channel participants
+ */
+ void onChange();
+
+ /**
+ * Changes state of indicators specified by LLUUIDs
+ *
+ * @param speakers_uuids - avatars' LLUUIDs whose speaking indicators should be switched
+ * @param switch_on - if TRUE specified indicator will be switched on, off otherwise.
+ */
+ void switchSpeakerIndicators(const speaker_ids_t& speakers_uuids, BOOL switch_on);
+
+ /**
+ * Multimap with all registered speaking indicators
+ */
+ speaking_indicators_mmap_t mSpeakingIndicators;
+
+ /**
+ * LUUIDs of avatar for which we have speaking indicators switched on.
+ *
+ * Is used to switch off all previously ON indicators when voice participant list is changed.
+ *
+ * @see onChange()
+ */
+ speaker_ids_t mSwitchedIndicatorsOn;
+};
+
+//////////////////////////////////////////////////////////////////////////
+// PUBLIC SECTION
+//////////////////////////////////////////////////////////////////////////
+void SpeakingIndicatorManager::registerSpeakingIndicator(const LLUUID& speaker_id, LLSpeakingIndicator* const speaking_indicator)
+{
+ if (speaker_id == gAgentID) return;
+
+ LL_DEBUGS("SpeakingIndicator") << "Registering indicator: " << speaker_id << LL_ENDL;
+ speaking_indicator_value_t value_type(speaker_id, speaking_indicator);
+ mSpeakingIndicators.insert(value_type);
+
+ speaker_ids_t speakers_uuids;
+ BOOL is_in_same_voice = LLVoiceClient::getInstance()->findParticipantByID(speaker_id) != NULL;
+
+ speakers_uuids.insert(speaker_id);
+ switchSpeakerIndicators(speakers_uuids, is_in_same_voice);
+}
+
+void SpeakingIndicatorManager::unregisterSpeakingIndicator(const LLUUID& speaker_id, const LLSpeakingIndicator* const speaking_indicator)
+{
+ speaking_indicators_mmap_t::iterator it;
+ it = mSpeakingIndicators.find(speaker_id);
+ for (;it != mSpeakingIndicators.end(); ++it)
+ {
+ if (it->second == speaking_indicator)
+ {
+ mSpeakingIndicators.erase(it);
+ break;
+ }
+ }
+}
+
+//////////////////////////////////////////////////////////////////////////
+// PRIVATE SECTION
+//////////////////////////////////////////////////////////////////////////
+SpeakingIndicatorManager::SpeakingIndicatorManager()
+{
+ LLVoiceChannel::setCurrentVoiceChannelChangedCallback(boost::bind(&SpeakingIndicatorManager::sOnCurrentChannelChanged, this, _1));
+ LLVoiceClient::getInstance()->addObserver(this);
+}
+
+SpeakingIndicatorManager::~SpeakingIndicatorManager()
+{
+ // Don't use LLVoiceClient::getInstance() here without check
+ // singleton MAY have already been destroyed.
+ if(LLVoiceClient::instanceExists())
+ {
+ LLVoiceClient::getInstance()->removeObserver(this);
+ }
+}
+
+void SpeakingIndicatorManager::sOnCurrentChannelChanged(const LLUUID& /*session_id*/)
+{
+ switchSpeakerIndicators(mSwitchedIndicatorsOn, FALSE);
+ mSwitchedIndicatorsOn.clear();
+}
+
+void SpeakingIndicatorManager::onChange()
+{
+ LL_DEBUGS("SpeakingIndicator") << "Voice participant list was changed, updating indicators" << LL_ENDL;
+
+ speaker_ids_t speakers_uuids;
+ LLVoiceClient::getInstance()->getParticipantsUUIDSet(speakers_uuids);
+
+ LL_DEBUGS("SpeakingIndicator") << "Switching all OFF, count: " << mSwitchedIndicatorsOn.size() << LL_ENDL;
+ // switch all indicators off
+ switchSpeakerIndicators(mSwitchedIndicatorsOn, FALSE);
+ mSwitchedIndicatorsOn.clear();
+
+ LL_DEBUGS("SpeakingIndicator") << "Switching all ON, count: " << speakers_uuids.size() << LL_ENDL;
+ // then switch current voice participants indicators on
+ switchSpeakerIndicators(speakers_uuids, TRUE);
+}
+
+void SpeakingIndicatorManager::switchSpeakerIndicators(const speaker_ids_t& speakers_uuids, BOOL switch_on)
+{
+ speaker_ids_t::const_iterator it_uuid = speakers_uuids.begin();
+ for (; it_uuid != speakers_uuids.end(); ++it_uuid)
+ {
+ LL_DEBUGS("SpeakingIndicator") << "Looking for indicator: " << *it_uuid << LL_ENDL;
+ indicator_range_t it_range = mSpeakingIndicators.equal_range(*it_uuid);
+ indicator_const_iterator it_indicator = it_range.first;
+ bool was_found = false;
+ for (; it_indicator != it_range.second; ++it_indicator)
+ {
+ was_found = true;
+ LLSpeakingIndicator* indicator = (*it_indicator).second;
+ indicator->switchIndicator(switch_on);
+ }
+
+ if (was_found)
+ {
+ LL_DEBUGS("SpeakingIndicator") << mSpeakingIndicators.count(*it_uuid) << " indicators where found" << LL_ENDL;
+
+ if (switch_on)
+ {
+ // store switched on indicator to be able switch it off
+ mSwitchedIndicatorsOn.insert(*it_uuid);
+ }
+ }
+ else
+ {
+ LL_WARNS("SpeakingIndicator") << "indicator was not found among registered: " << *it_uuid << LL_ENDL;
+ }
+ }
+}
+
+/************************************************************************/
+/* LLSpeakingIndicatorManager namespace implementation */
+/************************************************************************/
+
+void LLSpeakingIndicatorManager::registerSpeakingIndicator(const LLUUID& speaker_id, LLSpeakingIndicator* const speaking_indicator)
+{
+ SpeakingIndicatorManager::instance().registerSpeakingIndicator(speaker_id, speaking_indicator);
+}
+
+void LLSpeakingIndicatorManager::unregisterSpeakingIndicator(const LLUUID& speaker_id, const LLSpeakingIndicator* const speaking_indicator)
+{
+ SpeakingIndicatorManager::instance().unregisterSpeakingIndicator(speaker_id, speaking_indicator);
+}
+
+// EOF
+
diff --git a/indra/newview/llspeakingindicatormanager.h b/indra/newview/llspeakingindicatormanager.h
new file mode 100644
index 0000000000000000000000000000000000000000..ce0158f7d86d1adfec641a4131673f239dec5854
--- /dev/null
+++ b/indra/newview/llspeakingindicatormanager.h
@@ -0,0 +1,67 @@
+/**
+ * @file llspeakingindicatormanager.h
+ * @author Mike Antipov
+ * @brief Interfeace of LLSpeackerIndicator class to be processed depend on avatars are in the same voice channel.
+ * Also register/unregister methods for this class are declared
+ *
+ * $LicenseInfo:firstyear=2010&license=viewergpl$
+ *
+ * Copyright (c) 2010, 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_LLSPEAKINGINDICATORMANAGER_H
+#define LL_LLSPEAKINGINDICATORMANAGER_H
+
+class LLSpeakingIndicator
+{
+public:
+ virtual void switchIndicator(bool switch_on) = 0;
+};
+
+// See EXT-3976.
+namespace LLSpeakingIndicatorManager
+{
+ /**
+ * Stores passed speaking indicator to control its visibility.
+ *
+ * Registered indicator is set visible if an appropriate avatar is in the same voice channel with Agent.
+ * It ignores instances of Agent's indicator.
+ *
+ * @param speaker_id LLUUID of an avatar whose speaker indicator is registered.
+ * @param speaking_indicator instance of the speaker indicator to be registered.
+ */
+ void registerSpeakingIndicator(const LLUUID& speaker_id, LLSpeakingIndicator* const speaking_indicator);
+
+ /**
+ * Removes passed speaking indicator from observing.
+ *
+ * @param speaker_id LLUUID of an avatar whose speaker indicator should be unregistered.
+ * @param speaking_indicator instance of the speaker indicator to be unregistered.
+ */
+ void unregisterSpeakingIndicator(const LLUUID& speaker_id, const LLSpeakingIndicator* const speaking_indicator);
+}
+
+#endif // LL_LLSPEAKINGINDICATORMANAGER_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 @@ private:
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/llsyswellitem.cpp b/indra/newview/llsyswellitem.cpp
index eef84350064797fb50bd908135e2241825f47c10..0cfcfdc634564cc97724acacb925ffc709e92b16 100644
--- a/indra/newview/llsyswellitem.cpp
+++ b/indra/newview/llsyswellitem.cpp
@@ -77,10 +77,11 @@ void LLSysWellItem::onClickCloseBtn()
//---------------------------------------------------------------------------------
BOOL LLSysWellItem::handleMouseDown(S32 x, S32 y, MASK mask)
{
+ BOOL res = LLPanel::handleMouseDown(x, y, mask);
if(!mCloseBtn->getRect().pointInRect(x, y))
mOnItemClick(this);
- return LLPanel::handleMouseDown(x, y, mask);
+ return res;
}
//---------------------------------------------------------------------------------
diff --git a/indra/newview/llsyswellwindow.cpp b/indra/newview/llsyswellwindow.cpp
index 44cf82540a08d6b711927439ca656164faaf13f7..ba15053381cf97e2013e03cffaf7a818c56b4a8b 100644
--- a/indra/newview/llsyswellwindow.cpp
+++ b/indra/newview/llsyswellwindow.cpp
@@ -700,8 +700,7 @@ void LLNotificationWellWindow::connectListUpdaterToSignal(std::string notificati
void LLNotificationWellWindow::onItemClick(LLSysWellItem* item)
{
LLUUID id = item->getID();
- if(mChannel)
- mChannel->loadStoredToastByNotificationIDToChannel(id);
+ LLFloaterReg::showInstance("inspect_toast", id);
}
void LLNotificationWellWindow::onItemClose(LLSysWellItem* item)
diff --git a/indra/newview/llsyswellwindow.h b/indra/newview/llsyswellwindow.h
index ded3abcbf400ad111fc08bd8565b1472ca618034..0c81d1f369bcee27e16ff028cb93b7229819824c 100644
--- a/indra/newview/llsyswellwindow.h
+++ b/indra/newview/llsyswellwindow.h
@@ -162,6 +162,9 @@ private:
void onItemClick(LLSysWellItem* item);
void onItemClose(LLSysWellItem* item);
+ // ID of a toast loaded by user (by clicking notification well item)
+ LLUUID mLoadedToastId;
+
};
/**
diff --git a/indra/newview/llteleporthistorystorage.cpp b/indra/newview/llteleporthistorystorage.cpp
index d3bbda1c72c458448ac791eaff0a3b93479edefb..c635f914239d6a8d64a88a4c52540a2945d625df 100644
--- a/indra/newview/llteleporthistorystorage.cpp
+++ b/indra/newview/llteleporthistorystorage.cpp
@@ -246,13 +246,6 @@ void LLTeleportHistoryStorage::goToItem(S32 idx)
dump();
return;
}
-
- if (idx == (S32)mItems.size() - 1)
- {
- llwarns << "Will not teleport to the same location." << llendl;
- dump();
- return;
- }
// Attempt to teleport to the requested item.
gAgent.teleportViaLocation(mItems[idx].mGlobalPos);
diff --git a/indra/newview/lltoastnotifypanel.cpp b/indra/newview/lltoastnotifypanel.cpp
index 766cf83a01218b76e9269dea3bc3565f9bc9197a..d0c125eb771a9a0f706994571c49f4657b73889e 100644
--- a/indra/newview/lltoastnotifypanel.cpp
+++ b/indra/newview/lltoastnotifypanel.cpp
@@ -179,7 +179,9 @@ void LLToastNotifyPanel::adjustPanelForScriptNotice(const LLNotificationFormPtr
//adjust layout
LLRect button_rect = mControlPanel->getRect();
reshape(getRect().getWidth(), mInfoPanel->getRect().getHeight() + button_panel_height);
+ button_rect.set(0, button_rect.mBottom + button_panel_height, button_rect.getWidth(), button_rect.mBottom);
mControlPanel->reshape(button_rect.getWidth(), button_panel_height);
+ mControlPanel->setRect(button_rect);
}
// static
@@ -217,7 +219,7 @@ LLButton* LLToastNotifyPanel::addButton(const std::string& name, const std::stri
S32 ignore_pad = 0;
S32 button_index = mNumButtons;
S32 index = button_index;
- S32 x = (HPAD * 4) + 32;
+ S32 x = HPAD * 2; // *2 - to make a nice offset
if (mIsScriptDialog)
{
diff --git a/indra/newview/llviewerdisplay.cpp b/indra/newview/llviewerdisplay.cpp
index 66451f47a308ef7d32db5f9fc903b233000d2ead..b16134cc28e116ffb2a0b9331e75436260f24c91 100644
--- a/indra/newview/llviewerdisplay.cpp
+++ b/indra/newview/llviewerdisplay.cpp
@@ -1005,7 +1005,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();
@@ -1013,13 +1013,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;
}
@@ -1039,12 +1039,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;
@@ -1294,8 +1294,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 801c2d0fd24286fcbf5badc81d6f02ef9496d1aa..0edd4ac0256e1ef72d05ba84d8dca59c055321a5 100644
--- a/indra/newview/llviewerfloaterreg.cpp
+++ b/indra/newview/llviewerfloaterreg.cpp
@@ -107,7 +107,6 @@
#include "llfloateruipreview.h"
#include "llfloaterurldisplay.h"
#include "llfloatervoicedevicesettings.h"
-#include "llfloatervolumepulldown.h"
#include "llfloaterwater.h"
#include "llfloaterwhitelistentry.h"
#include "llfloaterwindlight.h"
@@ -118,6 +117,7 @@
#include "llinspectgroup.h"
#include "llinspectobject.h"
#include "llinspectremoteobject.h"
+#include "llinspecttoast.h"
#include "llmediaremotectrl.h"
#include "llmoveview.h"
#include "llnearbychat.h"
@@ -189,6 +189,7 @@ void LLViewerFloaterReg::registerFloaters()
LLInspectGroupUtil::registerFloater();
LLInspectObjectUtil::registerFloater();
LLInspectRemoteObjectUtil::registerFloater();
+ LLNotificationsUI::registerFloater();
LLFloaterReg::add("lagmeter", "floater_lagmeter.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterLagMeter>);
LLFloaterReg::add("land_holdings", "floater_land_holdings.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterLandHoldings>);
@@ -260,7 +261,7 @@ 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("upload_model", "floater_model_preview.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterModelPreview>, "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/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index 42c45589c084830374e105988735660dfba8e4e3..43c75748300d22ad6a20b6cc47e209aca2035859 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -904,7 +904,19 @@ void open_inventory_offer(const std::vector<LLUUID>& items, const std::string& f
LLPanelPlaces *places_panel = dynamic_cast<LLPanelPlaces*>(LLSideTray::getInstance()->showPanel("panel_places", LLSD()));
if (places_panel)
{
- places_panel->setItem(item);
+ // we are creating a landmark
+ if("create_landmark" == places_panel->getPlaceInfoType() && !places_panel->getItem())
+ {
+ places_panel->setItem(item);
+ }
+ // we are opening a group notice attachment
+ else
+ {
+ LLSD args;
+ args["type"] = "landmark";
+ args["id"] = item_id;
+ LLSideTray::getInstance()->showPanel("panel_places", args);
+ }
}
}
}
@@ -1098,28 +1110,6 @@ bool LLOfferInfo::inventory_offer_callback(const LLSD& notification, const LLSD&
gCacheName->get(mFromID, mFromGroup, boost::bind(&inventory_offer_mute_callback,_1,_2,_3,_4,this));
}
- // *NOTE dzaporozhan
- // Restored from viewer-1-23 to fix EXT-3520
- // Saves Group Notice Attachments to inventory.
- LLMessageSystem* msg = gMessageSystem;
- msg->newMessageFast(_PREHASH_ImprovedInstantMessage);
- msg->nextBlockFast(_PREHASH_AgentData);
- msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
- msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
- msg->nextBlockFast(_PREHASH_MessageBlock);
- msg->addBOOLFast(_PREHASH_FromGroup, FALSE);
- msg->addUUIDFast(_PREHASH_ToAgentID, mFromID);
- msg->addU8Fast(_PREHASH_Offline, IM_ONLINE);
- msg->addUUIDFast(_PREHASH_ID, mTransactionID);
- msg->addU32Fast(_PREHASH_Timestamp, NO_TIMESTAMP); // no timestamp necessary
- std::string name;
- LLAgentUI::buildFullname(name);
- msg->addStringFast(_PREHASH_FromAgentName, name);
- msg->addStringFast(_PREHASH_Message, "");
- msg->addU32Fast(_PREHASH_ParentEstateID, 0);
- msg->addUUIDFast(_PREHASH_RegionID, LLUUID::null);
- msg->addVector3Fast(_PREHASH_Position, gAgent.getPositionAgent());
-
std::string from_string; // Used in the pop-up.
std::string chatHistory_string; // Used in chat history.
@@ -1155,8 +1145,10 @@ bool LLOfferInfo::inventory_offer_callback(const LLSD& notification, const LLSD&
}
}
break;
- case IM_TASK_INVENTORY_OFFERED:
case IM_GROUP_NOTICE:
+ send_auto_receive_response();
+ break;
+ case IM_TASK_INVENTORY_OFFERED:
case IM_GROUP_NOTICE_REQUESTED:
// This is an offer from a task or group.
// We don't use a new instance of an opener
@@ -1171,10 +1163,6 @@ bool LLOfferInfo::inventory_offer_callback(const LLSD& notification, const LLSD&
// end switch (mIM)
case IOR_ACCEPT:
- msg->addU8Fast(_PREHASH_Dialog, (U8)(mIM + 1));
- msg->addBinaryDataFast(_PREHASH_BinaryBucket, &(mFolderID.mData), sizeof(mFolderID.mData));
- msg->sendReliable(mHost);
-
//don't spam them if they are getting flooded
if (check_offer_throttle(mFromName, true))
{
@@ -1197,7 +1185,10 @@ bool LLOfferInfo::inventory_offer_callback(const LLSD& notification, const LLSD&
{
chat.mMuted = TRUE;
}
- LLFloaterChat::addChatHistory(chat);
+
+ // *NOTE dzaporozhan
+ // Disabled logging to old chat floater to fix crash in group notices - EXT-4149
+ // LLFloaterChat::addChatHistory(chat);
LLInventoryFetchComboObserver::folder_ref_t folders;
LLInventoryFetchComboObserver::item_ref_t items;
@@ -1768,10 +1759,9 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
}
else if (from_id.isNull())
{
- // Messages from "Second Life" ID don't go to IM history
- // messages which should be routed to IM window come from a user ID with name=SYSTEM_NAME
- chat.mText = name + ": " + message;
- LLFloaterChat::addChat(chat, FALSE, FALSE);
+ LLSD args;
+ args["MESSAGE"] = message;
+ LLNotificationsUtil::add("SystemMessage", args);
}
else if (to_id.isNull())
{
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp
index 9285ab94dcb277d5d3549d5f5c4307ee87584df2..33bfee798a1592980341e9a729eb925c2e676f53 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/llvoiceclient.cpp b/indra/newview/llvoiceclient.cpp
index 423c46e14c75ce3204840189e240a8ec078cd3de..42b8a1c2b6bee3ceca36d236e2a8f5ec69946f7b 100644
--- a/indra/newview/llvoiceclient.cpp
+++ b/indra/newview/llvoiceclient.cpp
@@ -5004,6 +5004,17 @@ LLVoiceClient::participantMap *LLVoiceClient::getParticipantList(void)
return result;
}
+void LLVoiceClient::getParticipantsUUIDSet(std::set<LLUUID>& participant_uuids)
+{
+ if (NULL == mAudioSession) return;
+
+ participantUUIDMap::const_iterator it = mAudioSession->mParticipantsByUUID.begin(),
+ it_end = mAudioSession->mParticipantsByUUID.end();
+ for (; it != it_end; ++it)
+ {
+ participant_uuids.insert((*(*it).first));
+ }
+}
LLVoiceClient::participantState *LLVoiceClient::sessionState::findParticipant(const std::string &uri)
{
diff --git a/indra/newview/llvoiceclient.h b/indra/newview/llvoiceclient.h
index 724179847dc2dcb97271e0e5ccbe3d660660a0e5..6231c6ba29f47b3bb92090a2d93ba986779bd32a 100644
--- a/indra/newview/llvoiceclient.h
+++ b/indra/newview/llvoiceclient.h
@@ -354,6 +354,7 @@ static void updatePosition(void);
participantState *findParticipantByID(const LLUUID& id);
participantMap *getParticipantList(void);
+ void getParticipantsUUIDSet(std::set<LLUUID>& participant_uuids);
typedef std::map<const std::string*, sessionState*, stringMapComparitor> sessionMap;
typedef std::set<sessionState*> sessionSet;
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 db60b90a93010d519ec0961d102da1ce9e9f8872..cfa7479fa98c3275b1371aed3c0f6b492eb36796 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" />
@@ -650,6 +650,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" />
@@ -678,8 +684,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" />
@@ -698,7 +702,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="inv_folder_mesh.tga"/>
@@ -719,27 +722,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/de/floater_buy_currency.xml b/indra/newview/skins/default/xui/de/floater_buy_currency.xml
index 3c336cc40b08b36331f677c1501e8c1e18e8f173..c320e796c207b75e214687235de5a2998c1c4fe8 100644
--- a/indra/newview/skins/default/xui/de/floater_buy_currency.xml
+++ b/indra/newview/skins/default/xui/de/floater_buy_currency.xml
@@ -46,7 +46,7 @@
[AMT] L$
</text>
<text name="currency_links">
- [http://www.secondlife.com/ payment method] | [http://www.secondlife.com/ currency] | [http://www.secondlife.com exchange rate]
+ [http://www.secondlife.com/my/account/payment_method_management.php?lang=de-DE payment method] | [http://www.secondlife.com/my/account/currency.php?lang=de-DE currency] | [http://www.secondlife.com/my/account/exchange_rates.php?lang=de-DE exchange rate]
</text>
<text name="exchange_rate_note">
Geben Sie den Betrag erneut ein, um die aktuellste Umtauschrate anzuzeigen.
diff --git a/indra/newview/skins/default/xui/de/floater_help_browser.xml b/indra/newview/skins/default/xui/de/floater_help_browser.xml
index 53bddcced134b5b91cae14503147f189cfc274c2..2344d6f412af60c1d49e4bf8649ec964b7c9b7c0 100644
--- a/indra/newview/skins/default/xui/de/floater_help_browser.xml
+++ b/indra/newview/skins/default/xui/de/floater_help_browser.xml
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="floater_help_browser" title="HILFE-BROWSER">
<floater.string name="home_page_url">
- http://www.secondlife.com
+ http://de.secondlife.com
</floater.string>
<floater.string name="support_page_url">
- http://support.secondlife.com
+ http://de.secondlife.com/support
</floater.string>
<layout_stack name="stack1">
<layout_panel name="external_controls">
diff --git a/indra/newview/skins/default/xui/de/strings.xml b/indra/newview/skins/default/xui/de/strings.xml
index 809ac33e15400213f1f5aa32dfe88463298c6d7e..e93a38f187a775b64b967bc91e2ba4b793481790 100644
--- a/indra/newview/skins/default/xui/de/strings.xml
+++ b/indra/newview/skins/default/xui/de/strings.xml
@@ -166,7 +166,7 @@
<string name="TooltipSLAPP">
Anklicken, um Befehl secondlife:// auszuführen
</string>
- <string name="CurrentURL" value="CurrentURL: [CurrentURL]"/>
+ <string name="CurrentURL" value=" CurrentURL: [CurrentURL]"/>
<string name="SLurlLabelTeleport">
Teleportieren nach
</string>
@@ -821,46 +821,46 @@
<string name="InventoryNoTexture">
Sie haben keine Kopie dieser Textur in Ihrem Inventar.
</string>
- <string name="no_transfer" value="(kein Transferieren)"/>
- <string name="no_modify" value="(kein Bearbeiten)"/>
- <string name="no_copy" value="(kein Kopieren)"/>
- <string name="worn" value="(getragen)"/>
- <string name="link" value="(Link)"/>
- <string name="broken_link" value="(unvollständiger_Link)"/>
+ <string name="no_transfer" value=" (kein Transferieren)"/>
+ <string name="no_modify" value=" (kein Bearbeiten)"/>
+ <string name="no_copy" value=" (kein Kopieren)"/>
+ <string name="worn" value=" (getragen)"/>
+ <string name="link" value=" (Link)"/>
+ <string name="broken_link" value=" (unvollständiger_Link)"/>
<string name="LoadingContents">
Inhalte werden geladen...
</string>
<string name="NoContents">
Keine Inhalte
</string>
- <string name="WornOnAttachmentPoint" value="(getragen am [ATTACHMENT_POINT])"/>
+ <string name="WornOnAttachmentPoint" value=" (getragen am [ATTACHMENT_POINT])"/>
<string name="PermYes">
Ja
</string>
<string name="PermNo">
Nein
</string>
- <string name="Chat" value="Chat:"/>
- <string name="Sound" value="Sound:"/>
- <string name="Wait" value="--- Warten:"/>
- <string name="AnimFlagStop" value="Animation stoppen:"/>
- <string name="AnimFlagStart" value="Animation starten:"/>
- <string name="Wave" value="Winken"/>
- <string name="HelloAvatar" value="Hallo Avatar!"/>
- <string name="ViewAllGestures" value="Alle anzeigen >>"/>
- <string name="Animations" value="Animationen,"/>
- <string name="Calling Cards" value="Visitenkarten,"/>
- <string name="Clothing" value="Kleidung,"/>
- <string name="Gestures" value="Gesten,"/>
- <string name="Landmarks" value="Landmarken,"/>
- <string name="Notecards" value="Notizkarten,"/>
- <string name="Objects" value="Objekte,"/>
- <string name="Scripts" value="Skripts,"/>
- <string name="Sounds" value="Sounds,"/>
- <string name="Textures" value="Texturen,"/>
- <string name="Snapshots" value="Fotos,"/>
- <string name="No Filters" value="Nein"/>
- <string name="Since Logoff" value="- Seit Abmeldung"/>
+ <string name="Chat" value=" Chat:"/>
+ <string name="Sound" value=" Sound:"/>
+ <string name="Wait" value=" --- Warten:"/>
+ <string name="AnimFlagStop" value=" Animation stoppen:"/>
+ <string name="AnimFlagStart" value=" Animation starten:"/>
+ <string name="Wave" value=" Winken"/>
+ <string name="HelloAvatar" value=" Hallo Avatar!"/>
+ <string name="ViewAllGestures" value=" Alle anzeigen >>"/>
+ <string name="Animations" value=" Animationen,"/>
+ <string name="Calling Cards" value=" Visitenkarten,"/>
+ <string name="Clothing" value=" Kleidung,"/>
+ <string name="Gestures" value=" Gesten,"/>
+ <string name="Landmarks" value=" Landmarken,"/>
+ <string name="Notecards" value=" Notizkarten,"/>
+ <string name="Objects" value=" Objekte,"/>
+ <string name="Scripts" value=" Skripts,"/>
+ <string name="Sounds" value=" Sounds,"/>
+ <string name="Textures" value=" Texturen,"/>
+ <string name="Snapshots" value=" Fotos,"/>
+ <string name="No Filters" value="Nein "/>
+ <string name="Since Logoff" value=" - Seit Abmeldung"/>
<string name="InvFolder My Inventory">
Mein Inventar
</string>
@@ -1239,13 +1239,13 @@
<string name="GroupsNone">
keine
</string>
- <string name="Group" value="(Gruppe)"/>
+ <string name="Group" value=" (Gruppe)"/>
<string name="Unknown">
(unbekannt)
</string>
- <string name="SummaryForTheWeek" value="Zusammenfassung für diese Woche, beginnend am"/>
- <string name="NextStipendDay" value="Der nächste Stipendium-Tag ist"/>
- <string name="GroupIndividualShare" value="Gruppenanteil Einzelanteil"/>
+ <string name="SummaryForTheWeek" value="Zusammenfassung für diese Woche, beginnend am "/>
+ <string name="NextStipendDay" value="Der nächste Stipendium-Tag ist "/>
+ <string name="GroupIndividualShare" value=" Gruppenanteil Einzelanteil"/>
<string name="Balance">
Kontostand
</string>
@@ -1324,8 +1324,8 @@
<string name="covenant_last_modified">
Zuletzt geändert:
</string>
- <string name="none_text" value="(keiner)"/>
- <string name="never_text" value="(nie)"/>
+ <string name="none_text" value=" (keiner)"/>
+ <string name="never_text" value=" (nie)"/>
<string name="GroupOwned">
In Gruppenbesitz
</string>
@@ -1616,7 +1616,7 @@ Falls der Fehler dann weiterhin auftritt, müssen Sie [APP_NAME] von Ihrem Syste
Unbehebbarer Fehler
</string>
<string name="MBRequiresAltiVec">
- [APP_NAME] erfordert einen Prozessor mit AltiVec (G4 oder später).
+ [APP_NAME] erfordert einen Prozessor mit AltiVec (G4 oder später).
</string>
<string name="MBAlreadyRunning">
[APP_NAME] läuft bereits.
diff --git a/indra/newview/skins/default/xui/en/floater_about.xml b/indra/newview/skins/default/xui/en/floater_about.xml
index 82ed1a7d7fba6360a6c24680b2d9b07cb7cc573d..9806f45bc4fe6552933c5b887c30adc235de9939 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/inspect_toast.xml b/indra/newview/skins/default/xui/en/inspect_toast.xml
new file mode 100644
index 0000000000000000000000000000000000000000..0221397a8ca2fd5050395a8bc7fead6487376600
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/inspect_toast.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<!--
+ Not can_close / no title to avoid window chrome
+ Single instance - only have one at a time, recycle it each spawn
+-->
+<floater
+ legacy_header_height="25"
+ bevel_style="in"
+ bg_opaque_image="Inspector_Background"
+ can_close="false"
+ can_minimize="false"
+ height="148"
+ layout="topleft"
+ name="inspect_toast"
+ single_instance="true"
+ sound_flags="0"
+ visible="true"
+ width="228">
+</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 eb82dd4a7f080ebb3fd42f3661f0705f4fa3d32e..5ec8018eaeccec75e781a67f7e447eeb0cec23d0 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"
@@ -2915,6 +2916,16 @@ You have reached your maximum number of groups. Please leave another group befor
yestext="Join"/>
</notification>
+ <notification
+ icon="alert.tga"
+ name="JoinedTooManyGroups"
+ type="alert">
+You have reached your maximum number of groups. Please leave some group before joining or creating a new one.
+ <usetemplate
+ name="okbutton"
+ yestext="OK"/>
+ </notification>
+
<notification
icon="alert.tga"
name="KickUser"
@@ -3553,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
@@ -4543,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>
@@ -4693,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
@@ -4974,7 +4985,7 @@ No valid parcel could be found.
icon="notify.tga"
name="ObjectGiveItem"
type="offer">
-An object named [OBJECTFROMNAME] owned by [NAME_SLURL] has given you [OBJECTTYPE]:
+An object named [OBJECTFROMNAME] owned by [NAME_SLURL] has given you this [OBJECTTYPE]:
[ITEM_SLURL]
<form name="form">
<button
@@ -4996,7 +5007,7 @@ An object named [OBJECTFROMNAME] owned by [NAME_SLURL] has given you [OBJECTTYPE
icon="notify.tga"
name="ObjectGiveItemUnknownUser"
type="offer">
-An object named [OBJECTFROMNAME] owned by (an unknown Resident) has given you [OBJECTTYPE]:
+An object named [OBJECTFROMNAME] owned by (an unknown Resident) has given you this [OBJECTTYPE]:
[ITEM_SLURL]
<form name="form">
<button
@@ -5018,7 +5029,7 @@ An object named [OBJECTFROMNAME] owned by (an unknown Resident) has given you [O
icon="notify.tga"
name="UserGiveItem"
type="offer">
-[NAME_SLURL] has given you [OBJECTTYPE]:
+[NAME_SLURL] has given you this [OBJECTTYPE]:
[ITEM_SLURL]
<form name="form">
<button
@@ -5181,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_adhoc_control_panel.xml b/indra/newview/skins/default/xui/en/panel_adhoc_control_panel.xml
index 6c54532a3a8d201191021265d589afe316cf668c..28a6995186b150581771c914d1e881f11370094b 100644
--- a/indra/newview/skins/default/xui/en/panel_adhoc_control_panel.xml
+++ b/indra/newview/skins/default/xui/en/panel_adhoc_control_panel.xml
@@ -4,7 +4,7 @@
follows="all"
height="215"
name="panel_im_control_panel"
- width="180">
+ width="150">
<layout_stack
mouse_opaque="false"
border_size="0"
@@ -16,15 +16,16 @@
name="vertical_stack"
orientation="vertical"
top="0"
- width="177">
+ width="147">
<layout_panel
auto_resize="true"
follows="top|left"
height="130"
layout="topleft"
+ left="0"
min_height="0"
mouse_opaque="false"
- width="180"
+ width="147"
top="0"
name="speakers_list_panel"
user_resize="false">
@@ -39,7 +40,7 @@
show_info_btn="false"
show_profile_btn="false"
show_speaking_indicator="false"
- width="180" />
+ width="147" />
</layout_panel>
<layout_panel
auto_resize="false"
@@ -47,7 +48,7 @@
height="25"
layout="topleft"
min_height="25"
- width="160"
+ width="130"
name="call_btn_panel"
user_resize="false"
visible="false">
@@ -56,7 +57,7 @@
height="20"
label="Call"
name="call_btn"
- width="160"
+ width="130"
top="5" />
</layout_panel>
<layout_panel
@@ -65,7 +66,7 @@
height="25"
layout="topleft"
min_height="25"
- width="160"
+ width="130"
name="end_call_btn_panel"
user_resize="false"
visible="false">
@@ -82,7 +83,7 @@
height="25"
layout="topleft"
min_height="25"
- width="160"
+ width="130"
name="voice_ctrls_btn_panel"
user_resize="false"
visible="false">
diff --git a/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml
index 45f9d9c7b6550e765503708d0136bac55b82ab1d..615ade99a2bcbe90456786b8ffb25df48f6f2900 100644
--- a/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml
@@ -58,13 +58,13 @@
top="6"
use_ellipses="true"
value="Unknown"
- width="182" />
+ width="180" />
<text
follows="right"
font="SansSerifSmall"
height="15"
layout="topleft"
- left_pad="8"
+ left_pad="5"
name="last_interaction"
text_color="LtGray_50"
value="0s"
@@ -75,7 +75,7 @@
draw_border="false"
height="16"
layout="topleft"
- left_pad="0"
+ left_pad="5"
mouse_opaque="true"
name="speaking_indicator"
visible="true"
@@ -98,6 +98,7 @@
left_pad="5"
right="-3"
name="profile_btn"
+ tool_tip="View profile"
top_delta="-2"
width="20" />
</panel>
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_bottomtray.xml b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
index aeaa049f1ff68bf6a3852decdf8a9be1ae86c80a..4b39210f30c98aa3bda133bcef1a5d1d39c7da78 100644
--- a/indra/newview/skins/default/xui/en/panel_bottomtray.xml
+++ b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
@@ -33,10 +33,10 @@
height="10"
image_name="spacer24.tga"
layout="topleft"
- min_width="4"
+ min_width="2"
left="0"
top="0"
- width="4" />
+ width="2" />
<layout_panel
mouse_opaque="false"
auto_resize="false"
@@ -71,7 +71,7 @@
layout="topleft"
left="0"
name="talk"
- top="4"
+ top="5"
width="100">
<show_button>
<show_button.init_callback
@@ -103,20 +103,20 @@
min_width="52"
name="gesture_panel"
user_resize="false">
- <gesture_combo_box
+ <gesture_combo_list
follows="left|right"
height="23"
label="Gesture"
layout="topleft"
name="Gesture"
left="0"
- top="4"
+ top="5"
width="82"
tool_tip="Shows/hides gestures">
- <gesture_combo_box.drop_down_button
+ <gesture_combo_list.combo_button
pad_right="10"
use_ellipses="true" />
- </gesture_combo_box>
+ </gesture_combo_list>
</layout_panel>
<icon
auto_resize="false"
@@ -153,7 +153,7 @@
layout="topleft"
name="movement_btn"
tool_tip="Shows/hides movement controls"
- top="4"
+ top="5"
width="80">
<button.init_callback
function="Button.SetDockableFloaterToggle"
@@ -195,7 +195,7 @@
layout="topleft"
left="0"
tool_tip="Shows/hides camera controls"
- top="4"
+ top="5"
name="camera_btn"
width="80">
<button.init_callback
@@ -235,7 +235,7 @@
layout="topleft"
name="snapshots"
width="36"
- top="4"
+ top="5"
is_toggle="true"
image_overlay="Snapshot_Off"
tool_tip="Take snapshot">
@@ -338,7 +338,7 @@ as for parent layout_panel (chiclet_list_panel) to resize bottom tray properly.
layout="topleft"
left="0"
name="im_well"
- top="4"
+ top="5"
width="35">
<!--
Emulate 4 states of button by background images, see details in EXT-3147. The same should be for notification_well button
@@ -362,8 +362,6 @@ image_pressed_selected "Lit" + "Selected" - there are new messages and the Well
label_color="Black"
left="0"
name="Unread IM messages"
- pad_left="0"
- pad_right="0"
tool_tip="Conversations"
width="35" >
<button.init_callback
@@ -381,8 +379,8 @@ image_pressed_selected "Lit" + "Selected" - there are new messages and the Well
top="0"
left_pad="3"
name="notification_well_panel"
- width="35"
- min_width="35"
+ width="40"
+ min_width="40"
user_resize="false">
<chiclet_notification
flash_period="0.25"
@@ -392,7 +390,7 @@ image_pressed_selected "Lit" + "Selected" - there are new messages and the Well
left="0"
max_displayed_count="99"
name="notification_well"
- top="4"
+ top="5"
width="35">
<button
bottom_pad="3"
@@ -405,11 +403,11 @@ image_pressed_selected "Lit" + "Selected" - there are new messages and the Well
follows="right"
flash_color="ChicletFlashColor"
label_color="Black"
- left="5"
+ left="0"
name="Unread"
image_overlay="Notices_Unread"
image_overlay_alignment="center"
- pad_right="5"
+ pad_right="15"
tool_tip="Notifications"
width="35" >
<button.init_callback
@@ -418,16 +416,5 @@ image_pressed_selected "Lit" + "Selected" - there are new messages and the Well
</button>
</chiclet_notification>
</layout_panel>
- <icon
- auto_resize="false"
- color="0 0 0 0"
- follows="left|right"
- height="10"
- image_name="spacer24.tga"
- layout="topleft"
- min_width="4"
- right="-1"
- top="0"
- width="4"/>
</layout_stack>
</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_edit_pick.xml b/indra/newview/skins/default/xui/en/panel_edit_pick.xml
index d6de5af32d3808aa92d4f9898ae8dbba71881527..7769189219c7584b8eebbba1f7e9b71caebe7042 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_pick.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_pick.xml
@@ -38,28 +38,27 @@
<scroll_container
color="DkGray2"
follows="all"
- height="510"
+ height="500"
layout="topleft"
left="10"
top_pad="10"
name="profile_scroll"
- reserve_scroll_corner="false"
opaque="true"
width="313">
<panel
name="scroll_content_panel"
- follows="left|top"
+ follows="left|top|right"
min_height="300"
layout="topleft"
top="0"
background_visible="false"
- height="510"
+ height="500"
left="0"
- width="295">
+ width="285">
<texture_picker
follows="left|top|right"
height="197"
- width="290"
+ width="280"
layout="topleft"
top="20"
left="10"
@@ -77,7 +76,7 @@
<text
type="string"
length="1"
- follows="left|top"
+ follows="left|top|right"
height="15"
font="SansSerifSmall"
font.style="BOLD"
@@ -86,7 +85,7 @@
top="215"
name="Name:"
text_color="white"
- width="290">
+ width="280">
Title:
</text>
<line_editor
@@ -99,11 +98,11 @@
max_length="63"
name="pick_name"
text_color="black"
- width="290" />
+ width="280" />
<text
type="string"
length="1"
- follows="left|top"
+ follows="left|top|right"
height="15"
font="SansSerifSmall"
font.style="BOLD"
@@ -112,13 +111,13 @@
top_pad="20"
name="description_label"
text_color="white"
- width="290">
+ width="280">
Description:
</text>
<text_editor
follows="left|top|right"
height="100"
- width="290"
+ width="280"
hide_scrollbar="false"
layout="topleft"
left="10"
@@ -132,27 +131,26 @@
length="1"
font="SansSerifSmall"
font.style="BOLD"
- follows="left|top"
+ follows="left|top|right"
height="15"
layout="topleft"
left="10"
name="location_label"
text_color="white"
top_pad="20"
- width="290">
+ width="280">
Location:
</text>
<text
type="string"
length="1"
- follows="left|top"
+ follows="left|top|right"
height="50"
layout="topleft"
left="10"
name="pick_location"
- right="-10"
top_pad="2"
- width="290"
+ width="280"
word_wrap="true">
loading...
</text>
diff --git a/indra/newview/skins/default/xui/en/panel_edit_profile.xml b/indra/newview/skins/default/xui/en/panel_edit_profile.xml
index be3c0bbd9697199543219187558d37f9dbce3e6d..172cf18fc4be1a8d20045459019aa9c63cbf5b35 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_profile.xml
@@ -301,14 +301,13 @@
left="10"
name="partner_data_panel"
width="285">
- <text
+ <name_box
follows="left|top|right"
height="30"
layout="topleft"
left="0"
name="partner_text"
top="0"
- value="[FIRST] [LAST]"
width="285"
word_wrap="true" />
</panel>
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_control_panel.xml b/indra/newview/skins/default/xui/en/panel_group_control_panel.xml
index 4073ef158bbc054363e793381d13c8769748ecb1..aa7d621e4c8c4339e93346e414723df213be64b8 100644
--- a/indra/newview/skins/default/xui/en/panel_group_control_panel.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_control_panel.xml
@@ -4,7 +4,7 @@
follows="all"
height="238"
name="panel_im_control_panel"
- width="180">
+ width="150">
<layout_stack
mouse_opaque="false"
border_size="0"
@@ -16,7 +16,7 @@
name="vertical_stack"
orientation="vertical"
top="0"
- width="175">
+ width="145">
<layout_panel
auto_resize="true"
follows="top|left"
@@ -24,7 +24,7 @@
layout="topleft"
min_height="0"
mouse_opaque="false"
- width="180"
+ width="145"
top="0"
name="speakers_list_panel"
user_resize="false">
@@ -39,7 +39,7 @@
show_info_btn="false"
show_profile_btn="false"
show_speaking_indicator="false"
- width="180" />
+ width="145" />
</layout_panel>
<layout_panel
auto_resize="false"
@@ -47,7 +47,7 @@
height="28"
layout="topleft"
min_height="28"
- width="160"
+ width="130"
name="group_info_btn_panel"
user_resize="false">
<button
@@ -57,7 +57,7 @@
name="group_info_btn"
use_ellipses="true"
top="5"
- width="160" />
+ width="130" />
</layout_panel>
<layout_panel
auto_resize="false"
@@ -65,7 +65,7 @@
height="28"
layout="topleft"
min_height="28"
- width="160"
+ width="130"
name="call_btn_panel"
user_resize="false">
<button
@@ -74,7 +74,7 @@
label="Call Group"
name="call_btn"
use_ellipses="true"
- width="160" />
+ width="130" />
</layout_panel>
<layout_panel
auto_resize="false"
@@ -82,7 +82,7 @@
height="28"
layout="topleft"
min_height="28"
- width="160"
+ width="130"
name="end_call_btn_panel"
user_resize="false"
visible="false">
@@ -99,7 +99,7 @@
height="28"
layout="topleft"
min_height="28"
- width="160"
+ width="130"
name="voice_ctrls_btn_panel"
user_resize="false"
visible="false">
diff --git a/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml b/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml
index c0db734f8c165e3fac37ecb4639b72adef576690..81880488218196694fba5192490d154b9a42fca6 100644
--- a/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml
@@ -216,12 +216,28 @@ background_visible="true"
visible="false"
width="65" />-->
<button
+ follows="bottom|right"
+ label="Group Chat"
+ name="btn_chat"
+ right="-184"
+ left_pad="2"
+ height="22"
+ width="85" />
+ <button
+ follows="bottom|right"
+ label="Group Call"
+ name="btn_call"
+ right="-97"
+ left_pad="2"
+ height="22"
+ width="85" />
+ <button
height="22"
label="Save"
label_selected="Save"
name="btn_apply"
left_pad="10"
right="-10"
- width="100" />
+ width="85" />
</panel>
</panel>
\ No newline at end of file
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_group_list_item.xml b/indra/newview/skins/default/xui/en/panel_group_list_item.xml
index 5f6b911620f353e88682f98c794247b7147611c2..c243d08b97edc821eedd8d7e6ea660ee63c0c771 100644
--- a/indra/newview/skins/default/xui/en/panel_group_list_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_list_item.xml
@@ -65,6 +65,7 @@
left_pad="5"
right="-3"
name="profile_btn"
+ tool_tip="View profile"
top_delta="-2"
width="20" />
</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_group_notices.xml b/indra/newview/skins/default/xui/en/panel_group_notices.xml
index e096715ceec0c5f47d37beac01c93157aa0f8988..0d9c2c216275ccb104f8dfe387b3d8d744f0b588 100644
--- a/indra/newview/skins/default/xui/en/panel_group_notices.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_notices.xml
@@ -136,6 +136,7 @@ Maximum 200 per group daily
left_pad="3"
max_length="63"
name="create_subject"
+ prevalidate_callback="ascii"
width="220" />
<text
follows="left|top"
diff --git a/indra/newview/skins/default/xui/en/panel_group_roles.xml b/indra/newview/skins/default/xui/en/panel_group_roles.xml
index a5bab3232cfd2b5158ee531adf5da39ab103b17e..6b3fb045499d4587141710c0da330646242a918b 100644
--- a/indra/newview/skins/default/xui/en/panel_group_roles.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_roles.xml
@@ -210,6 +210,18 @@ including the Everyone and Owner Roles.
Abilities allow Members in Roles to do specific
things in this group. There's a broad variety of Abilities.
</panel.string>
+ <panel.string
+ name="power_folder_icon">
+ Inv_FolderClosed
+ </panel.string>
+ <panel.string
+ name="power_all_have_icon">
+ Checkbox_On
+ </panel.string>
+ <panel.string
+ name="power_partial_icon">
+ Checkbox_Off
+ </panel.string>
<filter_editor
layout="topleft"
top="5"
@@ -220,23 +232,32 @@ things in this group. There's a broad variety of Abilities.
max_length="250"
label="Filter Abilities"
name="filter_input" />
- <scroll_list
- column_padding="0"
- draw_stripes="false"
- follows="left|top"
- height="200"
- layout="topleft"
- left="0"
- multi_select="true"
- name="action_list"
- search_column="1"
- tool_tip="Select an Ability to view more details"
- top_pad="5"
- width="300">
- <scroll_list.columns
- name="action"
- width="300" />
- </scroll_list>
+
+ <scroll_list
+ column_padding="0"
+ draw_stripes="true"
+ height="200"
+ follows="left|top"
+ layout="topleft"
+ left="0"
+ name="action_list"
+ search_column="2"
+ tool_tip="Select an Ability to view more details"
+ top_pad="5"
+ width="300">
+ <scroll_list.columns
+ label=""
+ name="icon"
+ width="2" />
+ <scroll_list.columns
+ label=""
+ name="checkbox"
+ width="20" />
+ <scroll_list.columns
+ label=""
+ name="action"
+ width="270" />
+ </scroll_list>
</panel>
</tab_container>
<panel
diff --git a/indra/newview/skins/default/xui/en/panel_login.xml b/indra/newview/skins/default/xui/en/panel_login.xml
index e5df37e366ca6a5c117e5f134bc2974a14d691b0..df942b1a267bb44a77efb7b57ff275cfd85e78b2 100644
--- a/indra/newview/skins/default/xui/en/panel_login.xml
+++ b/indra/newview/skins/default/xui/en/panel_login.xml
@@ -186,6 +186,7 @@ height="80">
<text
follows="right|bottom"
font="SansSerifSmall"
+text_color="EmphasisColor"
halign="right"
height="16"
top="12"
diff --git a/indra/newview/skins/default/xui/en/panel_media_settings_general.xml b/indra/newview/skins/default/xui/en/panel_media_settings_general.xml
index 5217ab357173d6057f150ba8f654db72a2a16013..38e8b9844f5b3d2e3e9aadd64e39c76d6449dcc0 100644
--- a/indra/newview/skins/default/xui/en/panel_media_settings_general.xml
+++ b/indra/newview/skins/default/xui/en/panel_media_settings_general.xml
@@ -30,6 +30,7 @@
(This page does not pass the specified whitelist)
</text>
<line_editor
+ max_length="1024"
bottom_delta="-24"
enabled="true"
follows="left|top"
@@ -72,13 +73,15 @@
Current Page:
</text>
<text
+ name="current_url"
+ max_length="1024"
+ use_ellipses="true"
bottom_delta="-20"
enabled="false"
follows="left|top"
font="SansSerif"
height="20"
left="10"
- name="current_url"
tool_tip="The current page for this media source"
value=""
width="340" />
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 8327edfdd0865f6265cd7418df41ec982d2e7a82..27c1af1860cfb7728c5006bd9979bfbae8c43a95 100644
--- a/indra/newview/skins/default/xui/en/panel_my_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_my_profile.xml
@@ -27,6 +27,9 @@
<string
name="no_partner_text"
value="None" />
+ <string
+ name="no_group_text"
+ value="None" />
<string
name="RegisterDateFormat">
[REG_DATE] ([AGE])
@@ -62,10 +65,11 @@
<panel
layout="topleft"
follows="left|top|right"
+ height="505"
name="scroll_content_panel"
top="0"
left="0"
- width="303">
+ width="297">
<panel
follows="left|top|right"
height="117"
@@ -73,7 +77,7 @@
left="10"
name="second_life_image_panel"
top="0"
- width="300">
+ width="297">
<texture_picker
allow_no_texture="true"
default_image_name="None"
@@ -114,7 +118,7 @@
textbox.max_length="512"
name="sl_description_edit"
top_pad="-3"
- width="188"
+ width="181"
expanded_bg_visible="true"
expanded_bg_color="DkGray">
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum. adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum. adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum.
@@ -127,7 +131,7 @@
top_pad="10"
left="10"
name="first_life_image_panel"
- width="300">
+ width="297">
<texture_picker
allow_no_texture="true"
default_image_name="None"
@@ -167,7 +171,7 @@
textbox.max_length="512"
name="fl_description_edit"
top_pad="-3"
- width="188"
+ width="181"
expanded_bg_visible="true"
expanded_bg_color="DkGray">
Lorem ipsum dolor sit amet, consectetur adlkjpiscing elit moose moose. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet. adipiscing elit. Aenean rigviverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet sorbet ipsum. adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum.
@@ -260,14 +264,14 @@
name="partner_data_panel"
top_pad="0"
width="300">
- <text
+ <name_box
follows="left|top"
height="10"
layout="topleft"
left="0"
+ link="true"
name="partner_text"
top="0"
- value="[FIRST] [LAST]"
width="300"
word_wrap="true" />
</panel>
@@ -312,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_nearby_chat_bar.xml b/indra/newview/skins/default/xui/en/panel_nearby_chat_bar.xml
index f09a0e03ed0a7b9a344077202bfc0d2bfa0d899f..2b361c06286fda6e65cdfb7814e733c1b3bc01c7 100644
--- a/indra/newview/skins/default/xui/en/panel_nearby_chat_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_nearby_chat_bar.xml
@@ -27,7 +27,7 @@
max_length="512"
name="chat_box"
tool_tip="Press Enter to say, Ctrl+Enter to shout"
- top="1"
+ top="2"
width="283" />
<output_monitor
auto_update="true"
@@ -45,7 +45,7 @@
follows="right"
is_toggle="true"
width="20"
- top="1"
+ top="2"
layout="topleft"
left_pad="4"
image_disabled="ComboButton_UpOff"
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_pick_info.xml b/indra/newview/skins/default/xui/en/panel_pick_info.xml
index f68202d2878cece68f08d962b0b5ac4b17393c32..9c7f38e68886b5279cd4cbf4a0b551d3abe7c85c 100644
--- a/indra/newview/skins/default/xui/en/panel_pick_info.xml
+++ b/indra/newview/skins/default/xui/en/panel_pick_info.xml
@@ -40,31 +40,30 @@
left="10"
top_pad="10"
name="profile_scroll"
- reserve_scroll_corner="false"
width="313">
<panel
name="scroll_content_panel"
- follows="left|top"
+ follows="left|top|right"
min_height="300"
layout="topleft"
top="0"
background_visible="false"
- height="470"
+ height="400"
left="0"
- width="295">
+ width="285">
<texture_picker
enabled="false"
- follows="left|top"
+ follows="left|top|right"
height="197"
layout="topleft"
left="10"
name="pick_snapshot"
top="20"
- width="290" />
+ width="280" />
<text
follows="left|top|right"
height="35"
- width="290"
+ width="280"
layout="topleft"
font="SansSerifBig"
font.style="BOLD"
@@ -75,23 +74,29 @@
value="[name]"
use_ellipses="true" />
<text
- follows="left|top"
+ follows="left|top|right"
height="25"
layout="topleft"
left="10"
name="pick_location"
- width="290"
+ width="280"
word_wrap="true"
value="[loading...]" />
- <text
- follows="left|top|right"
- height="280"
+ <text_editor
+ bg_readonly_color="DkGray2"
+ follows="all"
+ height="100"
+ width="280"
+ hide_scrollbar="false"
layout="topleft"
left="10"
+ top_pad="2"
+ max_length="1023"
name="pick_desc"
- width="290"
+ read_only="true"
+ text_readonly_color="white"
value="[description]"
- word_wrap="true" />
+ wrap="true" />
</panel>
</scroll_container>
<panel
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_prim_media_controls.xml b/indra/newview/skins/default/xui/en/panel_prim_media_controls.xml
index 075d9232b1db5c18b489c8224a4a32d8ba79a838..ab6384203fa82702b37dd5666a291d5a5e34f696 100644
--- a/indra/newview/skins/default/xui/en/panel_prim_media_controls.xml
+++ b/indra/newview/skins/default/xui/en/panel_prim_media_controls.xml
@@ -321,6 +321,7 @@
min_width="90">
<line_editor
name="media_address_url"
+ max_length="1024"
follows="top|left|right"
height="22"
top="0"
diff --git a/indra/newview/skins/default/xui/en/panel_profile.xml b/indra/newview/skins/default/xui/en/panel_profile.xml
index 43947262ec5498d6df4c981850796e9c5f5f8532..597b6410cdab88f63148aa87682b899631e73813 100644
--- a/indra/newview/skins/default/xui/en/panel_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile.xml
@@ -27,6 +27,9 @@
<string
name="no_partner_text"
value="None" />
+ <string
+ name="no_group_text"
+ value="None" />
<string
name="RegisterDateFormat">
[REG_DATE] ([AGE])
@@ -62,10 +65,11 @@
<panel
layout="topleft"
follows="left|top|right"
+ height="505"
name="profile_scroll_panel"
top="0"
left="0"
- width="303">
+ width="297">
<panel
follows="left|top|right"
height="117"
@@ -73,7 +77,7 @@
left="10"
name="second_life_image_panel"
top="0"
- width="303">
+ width="297">
<texture_picker
allow_no_texture="true"
default_image_name="None"
@@ -117,7 +121,7 @@
top_pad="10"
left="10"
name="first_life_image_panel"
- width="303">
+ width="297">
<texture_picker
allow_no_texture="true"
default_image_name="None"
@@ -240,14 +244,14 @@
name="partner_data_panel"
top_pad="0"
width="300">
- <text
+ <name_box
follows="left|top"
height="10"
layout="topleft"
left="0"
+ link="true"
name="partner_text"
top="0"
- value="[FIRST] [LAST]"
width="300"
word_wrap="true" />
</panel>
@@ -269,7 +273,7 @@
left="7"
name="sl_groups"
top_pad="0"
- width="298"
+ width="290"
expanded_bg_visible="true"
expanded_bg_color="DkGray">
Lorem ipsum dolor sit amet, consectetur adlkjpiscing elit moose moose. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet. adipiscing elit. Aenean rigviverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet sorbet ipsum. adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum. Aenean viverra tulip moosetop. Slan de heelish marfnik tooplod. Sum sum to whop de wompam booster copm.
@@ -292,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
@@ -311,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" />
@@ -322,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" />
@@ -342,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"
@@ -375,4 +379,4 @@
</layout_panel>
</layout_stack>
-</panel>
\ No newline at end of file
+</panel>
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 bd868ef61e13fdad3d2b79066153c475325203f7..fbdac7164dda77a88099a4fd6d069c706a6ef0e6 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
@@ -2040,7 +2040,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 -->
@@ -2111,7 +2111,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>
@@ -2938,7 +2938,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/gesture_combo_box.xml b/indra/newview/skins/default/xui/en/widgets/gesture_combo_box.xml
deleted file mode 100644
index 4229f34c09ff6f6a281564401430611753d5cae9..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/en/widgets/gesture_combo_box.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<gesture_combo_box
- label="Gestures"
- list_position="below"
- max_chars="20"
- follows="right|top">
- <gesture_combo_box.combo_button name="Combobox Button"
- label=""
- hover_glow_amount="0.15"
- scale_image="true"
- image_unselected="ComboButton_Off"
- image_selected="ComboButton_Selected"
- image_disabled="ComboButton_Disabled"
- image_disabled_selected="ComboButton_Disabled_Selected" />
- <gesture_combo_box.drop_down_button name="Drop Down Button"
- label=""
- halign="center"
- hover_glow_amount="0.15"
- scale_image="true"
- image_selected="PushButton_Selected_Press"
- image_pressed="PushButton_Press"
- image_pressed_selected="PushButton_Selected_Press"
- image_unselected="PushButton_Off"
- image_disabled="PushButton_Disabled"
- image_disabled_selected="PushButton_Selected_Disabled" />
- <gesture_combo_box.combo_list bg_writeable_color="MenuDefaultBgColor"
- scroll_bar_bg_visible="false" />
- <gesture_combo_box.combo_editor name="Combo Text Entry"
- select_on_focus="true" />
-</gesture_combo_box>
diff --git a/indra/newview/skins/default/xui/en/widgets/gesture_combo_list.xml b/indra/newview/skins/default/xui/en/widgets/gesture_combo_list.xml
new file mode 100644
index 0000000000000000000000000000000000000000..808683864d967ba282ed1305a43255275d9e2d1f
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/widgets/gesture_combo_list.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<gesture_combo_list
+ follows="right|top">
+ <gesture_combo_list.combo_button
+ name="Combolist Button"
+ label=""
+ layout="topleft"
+ halign="center"
+ hover_glow_amount="0.15"
+ mouse_opaque="false"
+ scale_image="true"
+ image_selected="PushButton_Selected_Press"
+ image_pressed="PushButton_Press"
+ image_pressed_selected="PushButton_Selected_Press"
+ image_unselected="PushButton_Off"
+ image_disabled="PushButton_Disabled"
+ image_disabled_selected="PushButton_Selected_Disabled" />
+ <gesture_combo_list.combo_list
+ bg_writeable_color="MenuDefaultBgColor"
+ scroll_bar_bg_visible="false" />
+</gesture_combo_list>
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>
diff --git a/indra/newview/skins/default/xui/es/floater_buy_currency.xml b/indra/newview/skins/default/xui/es/floater_buy_currency.xml
index eb25493adced2574a6cf8b41b30913a1cb15455f..1ecb813dd1e3b31f9fa8ab64ff1a63bbe60840aa 100644
--- a/indra/newview/skins/default/xui/es/floater_buy_currency.xml
+++ b/indra/newview/skins/default/xui/es/floater_buy_currency.xml
@@ -52,6 +52,9 @@
<text name="total_amount">
[AMT] L$
</text>
+ <text name="currency_links">
+ [http://www.secondlife.com/my/account/payment_method_management.php?lang=es-ES payment method] | [http://www.secondlife.com/my/account/currency.php?lang=es-ES currency] | [http://www.secondlife.com/my/account/exchange_rates.php?lang=es-ES exchange rate]
+ </text>
<text name="purchase_warning_repurchase" right="-10">
Confirmando esta compra sólo compra la moneda.
Tendrá que intentar de nuevo la operación.
diff --git a/indra/newview/skins/default/xui/fr/floater_buy_currency.xml b/indra/newview/skins/default/xui/fr/floater_buy_currency.xml
index e6a49cbc6fec1a77a44694d2c85c44bb1209f400..9a92c446f2506c0d4762a993e127e6d847181f70 100644
--- a/indra/newview/skins/default/xui/fr/floater_buy_currency.xml
+++ b/indra/newview/skins/default/xui/fr/floater_buy_currency.xml
@@ -46,12 +46,12 @@
[AMT] L$
</text>
<text name="currency_links">
- [http://www.secondlife.com/ payment method] | [http://www.secondlife.com/ currency] | [http://www.secondlife.com exchange rate]
+ [http://www.secondlife.com/my/account/payment_method_management.php?lang=fr-FR payment method] | [http://www.secondlife.com/my/account/currency.php?lang=fr-FR currency] | [http://www.secondlife.com/my/account/exchange_rates.php?lang=fr-FR exchange rate]
</text>
<text name="exchange_rate_note">
Saisissez à nouveau le montant pour voir le taux de change actuel.
</text>
- <text bottom_delta="-64" height="48" name="purchase_warning_repurchase" right="-10">
+ <text name="purchase_warning_repurchase">
La confirmation de cet achat n'achète que des L$, pas l'objet.
</text>
<text bottom_delta="16" name="purchase_warning_notenough">
diff --git a/indra/newview/skins/default/xui/fr/floater_help_browser.xml b/indra/newview/skins/default/xui/fr/floater_help_browser.xml
index 0eb3ea3d21928de03bf1fa4eebb59bd50c24b4c1..20894d42fc36ff644ae5f1370b5ff58ae88ae1b4 100644
--- a/indra/newview/skins/default/xui/fr/floater_help_browser.xml
+++ b/indra/newview/skins/default/xui/fr/floater_help_browser.xml
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="floater_help_browser" title="NAVIGATEUR D'AIDE">
<floater.string name="home_page_url">
- http://www.secondlife.com
+ http://fr.secondlife.com
</floater.string>
<floater.string name="support_page_url">
- http://support.secondlife.com
+ http://fr.secondlife.com/support
</floater.string>
<layout_stack name="stack1">
<layout_panel name="external_controls">
diff --git a/indra/newview/skins/default/xui/fr/strings.xml b/indra/newview/skins/default/xui/fr/strings.xml
index 2f0c7038fc0121389c19c7d9bf29d47e1ab7a7e2..3ff829bfb7f723e1f63d906d18444ece035af70d 100644
--- a/indra/newview/skins/default/xui/fr/strings.xml
+++ b/indra/newview/skins/default/xui/fr/strings.xml
@@ -166,7 +166,7 @@
<string name="TooltipSLAPP">
Cliquez pour exécuter la commande secondlife:// command
</string>
- <string name="CurrentURL" value="URL actuelle : [CurrentURL]"/>
+ <string name="CurrentURL" value=" URL actuelle : [CurrentURL]"/>
<string name="SLurlLabelTeleport">
Me téléporter vers
</string>
@@ -174,7 +174,7 @@
Afficher la carte pour
</string>
<string name="BUTTON_CLOSE_DARWIN">
- Fermer (⌘W)
+ Fermer (⌘W)
</string>
<string name="BUTTON_CLOSE_WIN">
Fermer (Ctrl+W)
@@ -821,46 +821,46 @@
<string name="InventoryNoTexture">
Vous n'avez pas de copie de cette texture dans votre inventaire
</string>
- <string name="no_transfer" value="(pas de transfert)"/>
- <string name="no_modify" value="(pas de modification)"/>
- <string name="no_copy" value="(pas de copie)"/>
- <string name="worn" value="(porté)"/>
- <string name="link" value="(lien)"/>
- <string name="broken_link" value="(broken_link)"/>
+ <string name="no_transfer" value=" (pas de transfert)"/>
+ <string name="no_modify" value=" (pas de modification)"/>
+ <string name="no_copy" value=" (pas de copie)"/>
+ <string name="worn" value=" (porté)"/>
+ <string name="link" value=" (lien)"/>
+ <string name="broken_link" value=" (broken_link)"/>
<string name="LoadingContents">
chargement des contenus en cours...
</string>
<string name="NoContents">
Aucun contenu
</string>
- <string name="WornOnAttachmentPoint" value="(porté sur [ATTACHMENT_POINT])"/>
+ <string name="WornOnAttachmentPoint" value=" (porté sur [ATTACHMENT_POINT])"/>
<string name="PermYes">
Oui
</string>
<string name="PermNo">
Non
</string>
- <string name="Chat" value="Chat :"/>
- <string name="Sound" value="Son :"/>
- <string name="Wait" value="--- Attendre :"/>
- <string name="AnimFlagStop" value="Arrêter l'animation :"/>
- <string name="AnimFlagStart" value="Démarrer l'animation :"/>
- <string name="Wave" value="Faire signe"/>
- <string name="HelloAvatar" value="Bonjour, avatar !"/>
- <string name="ViewAllGestures" value="Tout afficher >>"/>
- <string name="Animations" value="Animations,"/>
- <string name="Calling Cards" value="Cartes de visite,"/>
- <string name="Clothing" value="Habits,"/>
- <string name="Gestures" value="Gestes,"/>
- <string name="Landmarks" value="Repères,"/>
- <string name="Notecards" value="Notes,"/>
- <string name="Objects" value="Objets,"/>
- <string name="Scripts" value="Scripts,"/>
- <string name="Sounds" value="Sons,"/>
- <string name="Textures" value="Textures,"/>
- <string name="Snapshots" value="Photos,"/>
- <string name="No Filters" value="Non"/>
- <string name="Since Logoff" value="- Depuis la déconnexion"/>
+ <string name="Chat" value=" Chat :"/>
+ <string name="Sound" value=" Son :"/>
+ <string name="Wait" value=" --- Attendre :"/>
+ <string name="AnimFlagStop" value=" Arrêter l'animation :"/>
+ <string name="AnimFlagStart" value=" Démarrer l'animation :"/>
+ <string name="Wave" value=" Faire signe"/>
+ <string name="HelloAvatar" value=" Bonjour, avatar !"/>
+ <string name="ViewAllGestures" value=" Tout afficher >>"/>
+ <string name="Animations" value=" Animations,"/>
+ <string name="Calling Cards" value=" Cartes de visite,"/>
+ <string name="Clothing" value=" Habits,"/>
+ <string name="Gestures" value=" Gestes,"/>
+ <string name="Landmarks" value=" Repères,"/>
+ <string name="Notecards" value=" Notes,"/>
+ <string name="Objects" value=" Objets,"/>
+ <string name="Scripts" value=" Scripts,"/>
+ <string name="Sounds" value=" Sons,"/>
+ <string name="Textures" value=" Textures,"/>
+ <string name="Snapshots" value=" Photos,"/>
+ <string name="No Filters" value="Non "/>
+ <string name="Since Logoff" value=" - Depuis la déconnexion"/>
<string name="InvFolder My Inventory">
Mon inventaire
</string>
@@ -1239,13 +1239,13 @@
<string name="GroupsNone">
aucun
</string>
- <string name="Group" value="(groupe)"/>
+ <string name="Group" value=" (groupe)"/>
<string name="Unknown">
(Inconnu)
</string>
- <string name="SummaryForTheWeek" value="Récapitulatif de la semaine, début le"/>
- <string name="NextStipendDay" value="Prochaine prime le"/>
- <string name="GroupIndividualShare" value="Groupe Part individuelle"/>
+ <string name="SummaryForTheWeek" value="Récapitulatif de la semaine, début le "/>
+ <string name="NextStipendDay" value="Prochaine prime le "/>
+ <string name="GroupIndividualShare" value=" Groupe Part individuelle"/>
<string name="Balance">
Solde
</string>
@@ -1324,8 +1324,8 @@
<string name="covenant_last_modified">
Dernière modification :
</string>
- <string name="none_text" value="(aucun)"/>
- <string name="never_text" value="(jamais)"/>
+ <string name="none_text" value=" (aucun)"/>
+ <string name="never_text" value=" (jamais)"/>
<string name="GroupOwned">
Propriété du groupe
</string>
@@ -1616,7 +1616,7 @@ Si le problème persiste, vous devrez peut-être complètement désinstaller pui
Erreur fatale
</string>
<string name="MBRequiresAltiVec">
- [APP_NAME] nécessite un microprocesseur AltiVec (version G4 ou antérieure).
+ [APP_NAME] nécessite un microprocesseur AltiVec (version G4 ou antérieure).
</string>
<string name="MBAlreadyRunning">
[APP_NAME] est déjà en cours d'exécution.
diff --git a/indra/newview/skins/default/xui/it/floater_buy_currency.xml b/indra/newview/skins/default/xui/it/floater_buy_currency.xml
index a22850bc4b96087c0f130329c5ad5daf72c287ad..8a597642516350b058c1f5dd5c8fcb6aa0063904 100644
--- a/indra/newview/skins/default/xui/it/floater_buy_currency.xml
+++ b/indra/newview/skins/default/xui/it/floater_buy_currency.xml
@@ -52,10 +52,11 @@
<text name="total_amount">
[AMT]L$
</text>
- <text name="purchase_warning_repurchase" height="48" bottom_delta="-64" right="-10">
- Confermando questa operazione si acquisterà solo
-la valuta. Per acquistare il bene, dovrai riprovare
-l'operazione nuovamente.
+ <text name="currency_links">
+ [http://www.secondlife.com/my/account/payment_method_management.php?lang=it-IT payment method] | [http://www.secondlife.com/my/account/currency.php?lang=it-IT currency] | [http://www.secondlife.com/my/account/exchange_rates.php?lang=it-IT exchange rate]
+ </text>
+ <text name="purchase_warning_repurchase">
+ Confermando questa operazione si acquisterà solo la valuta. Per acquistare il bene, dovrai riprovare l'operazione nuovamente.
</text>
<text name="purchase_warning_notenough" bottom_delta="16">
Non stai comprando abbastanza denaro.
diff --git a/indra/newview/skins/default/xui/ja/floater_buy_currency.xml b/indra/newview/skins/default/xui/ja/floater_buy_currency.xml
index 03cd0f391ad4e4cab3230f63eadd2661c8a2ae69..9d49a389822873e2c9b0adc0e214c2082463476e 100644
--- a/indra/newview/skins/default/xui/ja/floater_buy_currency.xml
+++ b/indra/newview/skins/default/xui/ja/floater_buy_currency.xml
@@ -46,7 +46,7 @@
L$ [AMT]
</text>
<text name="currency_links">
- [http://www.secondlife.com/ payment method] | [http://www.secondlife.com/ currency] | [http://www.secondlife.com exchange rate]
+ [http://www.secondlife.com/my/account/payment_method_management.php?lang=ja-JP payment method] | [http://www.secondlife.com/my/account/currency.php?lang=ja-JP currency] | [http://www.secondlife.com/my/account/exchange_rates.php?lang=ja-JP exchange rate]
</text>
<text name="exchange_rate_note">
金é¡ã‚’å†å…¥åŠ›ã—ã¦æœ€æ–°æ›ç®—レートを確èªã—ã¾ã™ã€‚
diff --git a/indra/newview/skins/default/xui/ja/strings.xml b/indra/newview/skins/default/xui/ja/strings.xml
index 4d395b474f37b4256e81a016a139ab0eeae80f88..b37d97bc5dcbab74ddf2d630cd49e635c142a6c7 100644
--- a/indra/newview/skins/default/xui/ja/strings.xml
+++ b/indra/newview/skins/default/xui/ja/strings.xml
@@ -166,7 +166,7 @@
<string name="TooltipSLAPP">
クリックã—㦠secondlife:// コマンドを出ã™
</string>
- <string name="CurrentURL" value="ç¾åœ¨ã®URL： [CurrentURL]"/>
+ <string name="CurrentURL" value=" ç¾åœ¨ã®URL： [CurrentURL]"/>
<string name="SLurlLabelTeleport">
テレãƒãƒ¼ãƒˆ
</string>
@@ -174,7 +174,7 @@
地図ã«è¡¨ç¤º
</string>
<string name="BUTTON_CLOSE_DARWIN">
- é–‰ã˜ã‚‹ （⌘W）
+ é–‰ã˜ã‚‹ （⌘W）
</string>
<string name="BUTTON_CLOSE_WIN">
é–‰ã˜ã‚‹ （Ctrl+W）
@@ -821,33 +821,33 @@
<string name="InventoryNoTexture">
æŒã¡ç‰©å†…ã«ã“ã®ãƒ†ã‚¯ã‚¹ãƒãƒ£ã®ã‚³ãƒ”ーãŒã‚ã‚Šã¾ã›ã‚“
</string>
- <string name="no_transfer" value="（å†è²©/プレゼントä¸å¯ï¼‰"/>
- <string name="no_modify" value="（編集ä¸å¯ï¼‰"/>
- <string name="no_copy" value="（コピーä¸å¯ï¼‰"/>
- <string name="worn" value="（ç€ç”¨ä¸ï¼‰"/>
- <string name="link" value="（リンク）"/>
- <string name="broken_link" value="（壊れãŸãƒªãƒ³ã‚¯ï¼‰"/>
+ <string name="no_transfer" value=" （å†è²©/プレゼントä¸å¯ï¼‰"/>
+ <string name="no_modify" value=" （編集ä¸å¯ï¼‰"/>
+ <string name="no_copy" value=" （コピーä¸å¯ï¼‰"/>
+ <string name="worn" value=" （ç€ç”¨ä¸ï¼‰"/>
+ <string name="link" value=" （リンク）"/>
+ <string name="broken_link" value=" （壊れãŸãƒªãƒ³ã‚¯ï¼‰"/>
<string name="LoadingContents">
コンテンツをãƒãƒ¼ãƒ‰ä¸ã§ã™...
</string>
<string name="NoContents">
コンテンツãªã—
</string>
- <string name="WornOnAttachmentPoint" value="（[ATTACHMENT_POINT] ã«è£…ç€ä¸ï¼‰"/>
+ <string name="WornOnAttachmentPoint" value=" （[ATTACHMENT_POINT] ã«è£…ç€ä¸ï¼‰"/>
<string name="PermYes">
ã¯ã„
</string>
<string name="PermNo">
ã„ã„ãˆ
</string>
- <string name="Chat" value="ãƒãƒ£ãƒƒãƒˆï¼š"/>
- <string name="Sound" value="サウンド："/>
- <string name="Wait" value="--- 待機：:"/>
- <string name="AnimFlagStop" value="アニメーションをåœæ¢ï¼š"/>
- <string name="AnimFlagStart" value="アニメーションを開始："/>
- <string name="Wave" value="手を振る"/>
- <string name="HelloAvatar" value="ã‚„ã‚ã€ã‚¢ãƒã‚¿ãƒ¼ï¼"/>
- <string name="ViewAllGestures" value="ã™ã¹ã¦è¡¨ç¤º >>"/>
+ <string name="Chat" value=" ãƒãƒ£ãƒƒãƒˆï¼š"/>
+ <string name="Sound" value=" サウンド："/>
+ <string name="Wait" value=" --- 待機：:"/>
+ <string name="AnimFlagStop" value=" アニメーションをåœæ¢ï¼š"/>
+ <string name="AnimFlagStart" value=" アニメーションを開始："/>
+ <string name="Wave" value=" 手を振る"/>
+ <string name="HelloAvatar" value=" ã‚„ã‚ã€ã‚¢ãƒã‚¿ãƒ¼ï¼"/>
+ <string name="ViewAllGestures" value=" ã™ã¹ã¦è¡¨ç¤º >>"/>
<string name="Animations" value="アニメーションã€"/>
<string name="Calling Cards" value="コーリングカードã€"/>
<string name="Clothing" value="衣類ã€"/>
@@ -859,8 +859,8 @@
<string name="Sounds" value="サウンドã€"/>
<string name="Textures" value="テクスãƒãƒ£ã€"/>
<string name="Snapshots" value="スナップショットã€"/>
- <string name="No Filters" value="ã„ã„ãˆ"/>
- <string name="Since Logoff" value="- ãƒã‚°ã‚ªãƒ•ä»¥æ¥"/>
+ <string name="No Filters" value="ã„ã„㈠"/>
+ <string name="Since Logoff" value=" - ãƒã‚°ã‚ªãƒ•ä»¥æ¥"/>
<string name="InvFolder My Inventory">
マイ æŒã¡ç‰©
</string>
@@ -1239,13 +1239,13 @@
<string name="GroupsNone">
ãªã—
</string>
- <string name="Group" value="（グループ）"/>
+ <string name="Group" value=" （グループ）"/>
<string name="Unknown">
（ä¸æ˜Žï¼‰
</string>
<string name="SummaryForTheWeek" value="今週ã®ã¾ã¨ã‚。開始日ã¯"/>
<string name="NextStipendDay" value="次回ã®ãŠå°é£ã„支給日ã¯"/>
- <string name="GroupIndividualShare" value="グループ　　　個人ã®å‰²ã‚Šå½“ã¦"/>
+ <string name="GroupIndividualShare" value=" グループ 個人ã®å‰²ã‚Šå½“ã¦"/>
<string name="Balance">
残高
</string>
@@ -1324,8 +1324,8 @@
<string name="covenant_last_modified">
最終修æ£æ—¥ï¼š
</string>
- <string name="none_text" value="（ãªã—）"/>
- <string name="never_text" value="（無）"/>
+ <string name="none_text" value=" （ãªã—）"/>
+ <string name="never_text" value=" （無）"/>
<string name="GroupOwned">
グループ所有
</string>
@@ -1616,7 +1616,7 @@
致命的ãªã‚¨ãƒ©ãƒ¼
</string>
<string name="MBRequiresAltiVec">
- [APP_NAME] ã¯ã€AltiVecæ載ã®ãƒ—ãƒã‚»ãƒƒã‚µãŒå¿…è¦ã§ã™ã€‚（G4 以é™ï¼‰
+ [APP_NAME] ã¯ã€AltiVecæ載ã®ãƒ—ãƒã‚»ãƒƒã‚µãŒå¿…è¦ã§ã™ã€‚（G4 以é™ï¼‰
</string>
<string name="MBAlreadyRunning">
[APP_NAME] ã¯ã™ã§ã«å®Ÿè¡Œä¸ã§ã™ã€‚
diff --git a/indra/newview/skins/default/xui/pt/floater_buy_currency.xml b/indra/newview/skins/default/xui/pt/floater_buy_currency.xml
index aac8438fdcf3c5b03200ef8db1144083b6771568..f17c069ecf030b1ec4b6fa5726159f9f4b1df67d 100644
--- a/indra/newview/skins/default/xui/pt/floater_buy_currency.xml
+++ b/indra/newview/skins/default/xui/pt/floater_buy_currency.xml
@@ -52,6 +52,9 @@
<text name="total_amount">
L$ [AMT]
</text>
+ <text name="currency_links">
+ [http://www.secondlife.com/my/account/payment_method_management.php?lang=pt-BR payment method] | [http://www.secondlife.com/my/account/currency.php?lang=pt-BR currency] | [http://www.secondlife.com/my/account/exchange_rates.php?lang=pt-BR exchange rate]
+ </text>
<text name="purchase_warning_repurchase">
Confirmando esta compra só compra a moeda.
Você precisará tentar novamente a operação.
diff --git a/install.xml b/install.xml
index 41f8a28044c7f4f9cd9400794ffec7c1e2ae84cc..e912ddfd8b0fd61d10e05eefdda5373ef754c4ff 100644
--- a/install.xml
+++ b/install.xml
@@ -1014,23 +1014,23 @@ anguage Infrstructure (CLI) international standard</string>
<key>darwin</key>
<map>
<key>md5sum</key>
- <string>5362a53488693f9bd7d9083758af25eb</string>
+ <string>2eb58f544c0d912aa382de2c947be7f1</string>
<key>url</key>
- <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/llqtwebkit-4.6-darwin-20091218.tar.bz2</uri>
+ <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/llqtwebkit-4.6-darwin-20100104.tar.bz2</uri>
</map>
<key>linux</key>
<map>
<key>md5sum</key>
- <string>09674cbae982e7e7f6ebc7e1d06580e8</string>
+ <string>c4c40fca14a8bd32096f8a27c75c526f</string>
<key>url</key>
- <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/llqtwebkit-linux-20091216.tar.bz2</uri>
+ <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/llqtwebkit-linux-20100105c.tar.bz2</uri>
</map>
<key>windows</key>
<map>
<key>md5sum</key>
- <string>4dd305f2ce38b2e55a2014ad3a2de34d</string>
+ <string>b50db4fdb833111e1e679188e4cb5815</string>
<key>url</key>
- <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/llqtwebkit-windows-qt4.6-20091218.tar.bz2</uri>
+ <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/llqtwebkit-windows-qt4.6-20100104.tar.bz2</uri>
</map>
</map>
</map>