summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorSteven Bennetts <steve@lindenlab.com>2009-08-11 06:37:35 +0000
committerSteven Bennetts <steve@lindenlab.com>2009-08-11 06:37:35 +0000
commitcaa367e5d435a70647c56460741a52b14f41ec9e (patch)
treeb82b02000ede0bb1784ee17a018132bd2308d88a /indra
parent0984822b3ebd85e84b3c017c082d859134801ecd (diff)
svn merge -r 129543-130091 skinning-19 -> viewer-2.0.0-3
EXT-172 - adding non-unicode support for group name line_editor EXT-310 text was squished, moved things around so there was was more space between text blocks. EXT-313 "me" panel EXT-314 changed out arrow character for arrow art, added arrow art to textures.xml EXT-315 replaced word "mute" with "block" EXT-322 moved Use Chat Bubbles text box from _chat.xml to _advanced.xml EXT-323 killed some two items EXT-324 and EXT-322 removed small avatar names checkbox and added show chat bubbled checkbox EXT-330 Sidetray filter - text overlaps search icon inside textbox EXT-261 I18N: Labels in /character/avatar_lad.xml are not localizable EXT-392 Rearranged floater_inventory_items_properties.xml to match spec DEV-35897 Filters in sidebar remain active even after user has changed/closed tab DEV-36886 I18N: hardcoded currency format in panel_status_bar.xml/status/buycurrency DEV-36987 - Pressed states needed for widgets DEV-36795 Remove slurl tooltip from navigation bar location box DEV-37184 Move "Block List" out of topmenu and make a button in Prefs > Privacy
Diffstat (limited to 'indra')
-rw-r--r--indra/llui/llbutton.cpp234
-rw-r--r--indra/llui/llbutton.h115
-rw-r--r--indra/llui/llcheckboxctrl.cpp1
-rw-r--r--indra/llui/llcombobox.cpp21
-rw-r--r--indra/llui/llcombobox.h3
-rw-r--r--indra/llui/llflyoutbutton.cpp7
-rw-r--r--indra/llui/llflyoutbutton.h1
-rw-r--r--indra/llui/llfocusmgr.cpp8
-rw-r--r--indra/llui/llfocusmgr.h4
-rw-r--r--indra/llui/lllineeditor.cpp6
-rw-r--r--indra/llui/llmultislider.h2
-rw-r--r--indra/llui/llscrollbar.cpp9
-rw-r--r--indra/llui/llslider.cpp42
-rw-r--r--indra/llui/llslider.h10
-rw-r--r--indra/llui/lluictrlfactory.h8
-rw-r--r--indra/newview/llfloaterlagmeter.cpp24
-rw-r--r--indra/newview/llimpanel.cpp29
-rw-r--r--indra/newview/llimview.cpp24
-rw-r--r--indra/newview/lllocationinputctrl.cpp2
-rw-r--r--indra/newview/llpanelpeople.cpp3
-rw-r--r--indra/newview/llpanelplaces.cpp5
-rw-r--r--indra/newview/llsidetray.cpp2
-rw-r--r--indra/newview/llstatusbar.cpp8
-rw-r--r--indra/newview/llviewerwindow.cpp4
-rw-r--r--indra/newview/skins/default/textures/icons/ForwardArrow_Off.pngbin0 -> 220 bytes
-rw-r--r--indra/newview/skins/default/textures/icons/ForwardArrow_Press.pngbin0 -> 220 bytes
-rw-r--r--indra/newview/skins/default/textures/textures.xml17
-rw-r--r--indra/newview/skins/default/textures/widgets/Arrow_Down.pngbin0 -> 3066 bytes
-rw-r--r--indra/newview/skins/default/textures/widgets/Arrow_Up.pngbin0 -> 363 bytes
-rw-r--r--indra/newview/skins/default/xui/en/floater_buy_land.xml24
-rw-r--r--indra/newview/skins/default/xui/en/floater_inventory_item_properties.xml244
-rw-r--r--indra/newview/skins/default/xui/en/menu_nearby_chat.xml2
-rw-r--r--indra/newview/skins/default/xui/en/menu_viewer.xml4
-rw-r--r--indra/newview/skins/default/xui/en/panel_group_general.xml1
-rw-r--r--indra/newview/skins/default/xui/en/panel_notes.xml182
-rw-r--r--indra/newview/skins/default/xui/en/panel_people.xml49
-rw-r--r--indra/newview/skins/default/xui/en/panel_pick_info.xml32
-rw-r--r--indra/newview/skins/default/xui/en/panel_pick_list_item.xml60
-rw-r--r--indra/newview/skins/default/xui/en/panel_picks.xml104
-rw-r--r--indra/newview/skins/default/xui/en/panel_preferences_advanced.xml26
-rw-r--r--indra/newview/skins/default/xui/en/panel_preferences_chat.xml9
-rw-r--r--indra/newview/skins/default/xui/en/panel_preferences_general.xml12
-rw-r--r--indra/newview/skins/default/xui/en/panel_profile.xml214
-rw-r--r--indra/newview/skins/default/xui/en/panel_profile_view.xml79
-rw-r--r--indra/newview/skins/default/xui/en/panel_status_bar.xml4
-rw-r--r--indra/newview/skins/default/xui/en/strings.xml194
-rw-r--r--indra/newview/skins/default/xui/en/widgets/check_box.xml4
-rw-r--r--indra/newview/skins/default/xui/en/widgets/radio_item.xml4
-rw-r--r--indra/newview/skins/default/xui/en/widgets/slider_bar.xml2
49 files changed, 933 insertions, 906 deletions
diff --git a/indra/llui/llbutton.cpp b/indra/llui/llbutton.cpp
index fc3af34951..ac368fd785 100644
--- a/indra/llui/llbutton.cpp
+++ b/indra/llui/llbutton.cpp
@@ -70,6 +70,8 @@ LLButton::Params::Params()
image_hover_unselected("image_hover_unselected"),
image_disabled_selected("image_disabled_selected"),
image_disabled("image_disabled"),
+ image_pressed("image_pressed"),
+ image_pressed_selected("image_pressed_selected"),
image_overlay("image_overlay"),
image_overlay_alignment("image_overlay_alignment", std::string("center")),
label_color("label_color"),
@@ -108,7 +110,6 @@ LLButton::LLButton(const LLButton::Params& p)
mFlashing( FALSE ),
mCurGlowStrength(0.f),
mNeedsHighlight(FALSE),
- mImagep( NULL ),
mUnselectedLabel(p.label()),
mSelectedLabel(p.label_selected()),
mGLFont(p.font),
@@ -118,6 +119,8 @@ LLButton::LLButton(const LLButton::Params& p)
mImageSelected(p.image_selected),
mImageDisabled(p.image_disabled),
mImageDisabledSelected(p.image_disabled_selected),
+ mImagePressed(p.image_pressed),
+ mImagePressedSelected(p.image_pressed_selected),
mImageHoverSelected(p.image_hover_selected),
mImageHoverUnselected(p.image_hover_unselected),
mUnselectedLabelColor(p.label_color()),
@@ -182,6 +185,11 @@ LLButton::LLButton(const LLButton::Params& p)
mImageDisabled = p.image_unselected;
mFadeWhenDisabled = TRUE;
}
+
+ if (p.image_pressed_selected == default_params.image_pressed_selected)
+ {
+ mImagePressedSelected = mImageUnselected;
+ }
}
// if custom selected button image provided...
@@ -193,6 +201,21 @@ LLButton::LLButton(const LLButton::Params& p)
mImageDisabledSelected = p.image_selected;
mFadeWhenDisabled = TRUE;
}
+
+ if (p.image_pressed == default_params.image_pressed)
+ {
+ mImagePressed = mImageSelected;
+ }
+ }
+
+ if (!p.image_pressed.isProvided())
+ {
+ mImagePressed = mImageSelected;
+ }
+
+ if (!p.image_pressed_selected.isProvided())
+ {
+ mImagePressedSelected = mImageUnselected;
}
if (mImageUnselected.isNull())
@@ -427,7 +450,7 @@ BOOL LLButton::handleRightMouseUp(S32 x, S32 y, MASK mask)
void LLButton::onMouseEnter(S32 x, S32 y, MASK mask)
{
- if (getEnabled())
+ if (isInEnabledChain())
mNeedsHighlight = TRUE;
}
@@ -462,7 +485,7 @@ BOOL LLButton::handleHover(S32 x, S32 y, MASK mask)
// virtual
void LLButton::draw()
{
- BOOL flash = FALSE;
+ bool flash = FALSE;
static LLUICachedControl<F32> button_flash_rate("ButtonFlashRate", 0);
static LLUICachedControl<S32> button_flash_count("ButtonFlashCount", 0);
@@ -474,7 +497,7 @@ void LLButton::draw()
flash = (flash_count % 2 == 0) || flash_count > S32((F32)button_flash_count * 2.f);
}
- BOOL pressed_by_keyboard = FALSE;
+ bool pressed_by_keyboard = FALSE;
if (hasFocus())
{
pressed_by_keyboard = gKeyboard->getKeyDown(' ') || (mCommitOnReturn && gKeyboard->getKeyDown(KEY_RETURN));
@@ -485,24 +508,31 @@ void LLButton::draw()
S32 local_mouse_y;
LLUI::getCursorPositionLocal(this, &local_mouse_x, &local_mouse_y);
- BOOL pressed = pressed_by_keyboard
- || (hasMouseCapture() && pointInView(local_mouse_x, local_mouse_y))
- || getToggleState();
+ bool enabled = isInEnabledChain();
+
+ bool pressed = pressed_by_keyboard
+ || (hasMouseCapture() && pointInView(local_mouse_x, local_mouse_y));
+ bool selected = getToggleState();
- BOOL use_glow_effect = FALSE;
+ bool use_glow_effect = FALSE;
LLColor4 glow_color = LLColor4::white;
LLRender::eBlendType glow_type = LLRender::BT_ADD_WITH_ALPHA;
- if ( mNeedsHighlight )
+ LLUIImage* imagep = NULL;
+ if (pressed)
{
- if (pressed)
+ imagep = selected ? mImagePressedSelected : mImagePressed;
+ }
+ else if ( mNeedsHighlight )
+ {
+ if (selected)
{
if (mImageHoverSelected)
{
- mImagep = mImageHoverSelected;
+ imagep = mImageHoverSelected;
}
else
{
- mImagep = mImageSelected;
+ imagep = mImageSelected;
use_glow_effect = TRUE;
}
}
@@ -510,22 +540,37 @@ void LLButton::draw()
{
if (mImageHoverUnselected)
{
- mImagep = mImageHoverUnselected;
+ imagep = mImageHoverUnselected;
}
else
{
- mImagep = mImageUnselected;
+ imagep = mImageUnselected;
use_glow_effect = TRUE;
}
}
}
- else if ( pressed )
+ else
{
- mImagep = mImageSelected;
+ imagep = selected ? mImageSelected : mImageUnselected;
}
- else
+
+ // Override if more data is available
+ // HACK: Use gray checked state to mean either:
+ // enabled and tentative
+ // or
+ // disabled but checked
+ if (!mImageDisabledSelected.isNull()
+ &&
+ ( (enabled && getTentative())
+ || (!enabled && selected ) ) )
+ {
+ imagep = mImageDisabledSelected;
+ }
+ else if (!mImageDisabled.isNull()
+ && !enabled
+ && !selected)
{
- mImagep = mImageUnselected;
+ imagep = mImageDisabled;
}
if (mFlashing)
@@ -540,26 +585,7 @@ void LLButton::draw()
glow_color = flash_color;
}
- // Override if more data is available
- // HACK: Use gray checked state to mean either:
- // enabled and tentative
- // or
- // disabled but checked
- if (!mImageDisabledSelected.isNull()
- &&
- ( (getEnabled() && getTentative())
- || (!getEnabled() && pressed ) ) )
- {
- mImagep = mImageDisabledSelected;
- }
- else if (!mImageDisabled.isNull()
- && !getEnabled()
- && !pressed)
- {
- mImagep = mImageDisabled;
- }
-
- if (mNeedsHighlight && !mImagep)
+ if (mNeedsHighlight && !imagep)
{
use_glow_effect = TRUE;
}
@@ -568,7 +594,7 @@ void LLButton::draw()
LLColor4 label_color;
// label changes when button state changes, not when pressed
- if ( getEnabled() )
+ if ( enabled )
{
if ( getToggleState() )
{
@@ -596,32 +622,18 @@ void LLButton::draw()
if( getToggleState() )
{
- if( getEnabled() || mDisabledSelectedLabel.empty() )
- {
- label = mSelectedLabel;
- }
- else
- {
- label = mDisabledSelectedLabel;
- }
+ label = mSelectedLabel;
}
else
{
- if( getEnabled() || mDisabledLabel.empty() )
- {
- label = mUnselectedLabel;
- }
- else
- {
- label = mDisabledLabel;
- }
+ label = mUnselectedLabel;
}
// overlay with keyboard focus border
if (hasFocus())
{
F32 lerp_amt = gFocusMgr.getFocusFlashAmt();
- drawBorder(gFocusMgr.getFocusColor(), llround(lerp(1.f, 3.f, lerp_amt)));
+ drawBorder(imagep, gFocusMgr.getFocusColor(), llround(lerp(1.f, 3.f, lerp_amt)));
}
if (use_glow_effect)
@@ -638,27 +650,27 @@ void LLButton::draw()
// Draw button image, if available.
// Otherwise draw basic rectangular button.
- if (mImagep.notNull())
+ if (imagep != NULL)
{
// apply automatic 50% alpha fade to disabled image
LLColor4 disabled_color = mFadeWhenDisabled ? mDisabledImageColor.get() % 0.5f : mDisabledImageColor.get();
if ( mScaleImage)
{
- mImagep->draw(getLocalRect(), getEnabled() ? mImageColor.get() : disabled_color );
+ imagep->draw(getLocalRect(), enabled ? mImageColor.get() : disabled_color );
if (mCurGlowStrength > 0.01f)
{
gGL.setSceneBlendType(glow_type);
- mImagep->drawSolid(0, 0, getRect().getWidth(), getRect().getHeight(), glow_color % mCurGlowStrength);
+ imagep->drawSolid(0, 0, getRect().getWidth(), getRect().getHeight(), glow_color % mCurGlowStrength);
gGL.setSceneBlendType(LLRender::BT_ALPHA);
}
}
else
{
- mImagep->draw(0, 0, getEnabled() ? mImageColor.get() : disabled_color );
+ imagep->draw(0, 0, enabled ? mImageColor.get() : disabled_color );
if (mCurGlowStrength > 0.01f)
{
gGL.setSceneBlendType(glow_type);
- mImagep->drawSolid(0, 0, glow_color % mCurGlowStrength);
+ imagep->drawSolid(0, 0, glow_color % mCurGlowStrength);
gGL.setSceneBlendType(LLRender::BT_ALPHA);
}
}
@@ -699,7 +711,7 @@ void LLButton::draw()
// fade out overlay images on disabled buttons
LLColor4 overlay_color = mImageOverlayColor.get();
- if (!getEnabled())
+ if (!enabled)
{
overlay_color.mV[VALPHA] = 0.5f;
}
@@ -777,19 +789,19 @@ void LLButton::draw()
NULL, FALSE, FALSE);
}
- LLView::draw();
+ LLUICtrl::draw();
}
-void LLButton::drawBorder(const LLColor4& color, S32 size)
+void LLButton::drawBorder(LLUIImage* imagep, const LLColor4& color, S32 size)
{
- if (mImagep.isNull()) return;
+ if (imagep == NULL) return;
if (mScaleImage)
{
- mImagep->drawBorder(getLocalRect(), color, size);
+ imagep->drawBorder(getLocalRect(), color, size);
}
else
{
- mImagep->drawBorder(0, 0, color, size);
+ imagep->drawBorder(0, 0, color, size);
}
}
@@ -851,16 +863,6 @@ void LLButton::setLabelSelected( const LLStringExplicit& label )
mSelectedLabel = label;
}
-void LLButton::setDisabledLabel( const LLStringExplicit& label )
-{
- mDisabledLabel = label;
-}
-
-void LLButton::setDisabledSelectedLabel( const LLStringExplicit& label )
-{
- mDisabledSelectedLabel = label;
-}
-
void LLButton::setImageUnselected(LLPointer<LLUIImage> image)
{
mImageUnselected = image;
@@ -875,25 +877,11 @@ void LLButton::autoResize()
LLUIString label;
if(getToggleState())
{
- if( getEnabled() || mDisabledSelectedLabel.empty() )
- {
- label = mSelectedLabel;
- }
- else
- {
- label = mDisabledSelectedLabel;
- }
+ label = mSelectedLabel;
}
else
{
- if( getEnabled() || mDisabledLabel.empty() )
- {
- label = mUnselectedLabel;
- }
- else
- {
- label = mDisabledLabel;
- }
+ label = mUnselectedLabel;
}
resize(label);
}
@@ -915,9 +903,8 @@ void LLButton::resize(LLUIString label)
}
void LLButton::setImages( const std::string &image_name, const std::string &selected_name )
{
- setImageUnselected(image_name);
- setImageSelected(selected_name);
-
+ setImageUnselected(LLUI::getUIImage(image_name));
+ setImageSelected(LLUI::getUIImage(selected_name));
}
void LLButton::setImageSelected(LLPointer<LLUIImage> image)
@@ -950,19 +937,6 @@ void LLButton::setImageDisabledSelected(LLPointer<LLUIImage> image)
mFadeWhenDisabled = TRUE;
}
-void LLButton::setDisabledImages( const std::string &image_name, const std::string &selected_name)
-{
- setDisabledImages( image_name, selected_name, mImageColor.get());
- mFadeWhenDisabled = TRUE;
-}
-
-void LLButton::setDisabledImages( const std::string &image_name, const std::string &selected_name, const LLColor4& c )
-{
- setImageDisabled(image_name);
- setImageDisabledSelected(selected_name);
- mDisabledImageColor = c;
-}
-
void LLButton::setImageHoverSelected(LLPointer<LLUIImage> image)
{
mImageHoverSelected = image;
@@ -973,12 +947,6 @@ void LLButton::setImageHoverUnselected(LLPointer<LLUIImage> image)
mImageHoverUnselected = image;
}
-void LLButton::setHoverImages( const std::string& image_name, const std::string& selected_name )
-{
- setImageHoverUnselected(image_name);
- setImageHoverSelected(selected_name);
-}
-
void LLButton::setImageOverlay(const std::string& image_name, LLFontGL::HAlign alignment, const LLColor4& color)
{
if (image_name.empty())
@@ -1016,42 +984,6 @@ S32 round_up(S32 grid, S32 value)
}
}
-void LLButton::setImageUnselected(const std::string &image_name)
-{
- setImageUnselected(LLUI::getUIImage(image_name));
- mImageUnselectedName = image_name;
-}
-
-void LLButton::setImageSelected(const std::string &image_name)
-{
- setImageSelected(LLUI::getUIImage(image_name));
- mImageSelectedName = image_name;
-}
-
-void LLButton::setImageHoverSelected(const std::string &image_name)
-{
- setImageHoverSelected(LLUI::getUIImage(image_name));
- mImageHoverSelectedName = image_name;
-}
-
-void LLButton::setImageHoverUnselected(const std::string &image_name)
-{
- setImageHoverUnselected(LLUI::getUIImage(image_name));
- mImageHoverUnselectedName = image_name;
-}
-
-void LLButton::setImageDisabled(const std::string &image_name)
-{
- setImageDisabled(LLUI::getUIImage(image_name));
- mImageDisabledName = image_name;
-}
-
-void LLButton::setImageDisabledSelected(const std::string &image_name)
-{
- setImageDisabledSelected(LLUI::getUIImage(image_name));
- mImageDisabledSelectedName = image_name;
-}
-
void LLButton::addImageAttributeToXML(LLXMLNodePtr node,
const std::string& image_name,
const LLUUID& image_id,
diff --git a/indra/llui/llbutton.h b/indra/llui/llbutton.h
index e387c91a17..93e0414a02 100644
--- a/indra/llui/llbutton.h
+++ b/indra/llui/llbutton.h
@@ -84,6 +84,8 @@ public:
image_hover_unselected,
image_disabled_selected,
image_disabled,
+ image_pressed,
+ image_pressed_selected,
image_overlay;
Optional<std::string> image_overlay_alignment;
@@ -190,11 +192,7 @@ public:
virtual void setColor(const LLColor4& c);
void setImages(const std::string &image_name, const std::string &selected_name);
- void setDisabledImages(const std::string &image_name, const std::string &selected_name);
- void setDisabledImages(const std::string &image_name, const std::string &selected_name, const LLColor4& c);
- void setHoverImages(const std::string &image_name, const std::string &selected_name);
-
void setDisabledImageColor(const LLColor4& c) { mDisabledImageColor = c; }
void setDisabledSelectedLabelColor( const LLColor4& c ) { mDisabledSelectedLabelColor = c; }
@@ -208,8 +206,6 @@ public:
virtual BOOL setLabelArg( const std::string& key, const LLStringExplicit& text );
void setLabelUnselected(const LLStringExplicit& label);
void setLabelSelected(const LLStringExplicit& label);
- void setDisabledLabel(const LLStringExplicit& disabled_label);
- void setDisabledSelectedLabel(const LLStringExplicit& disabled_label);
void setDisabledLabelColor( const LLColor4& c ) { mDisabledLabelColor = c; }
void setFont(const LLFontGL *font)
@@ -223,15 +219,6 @@ public:
void setHoverGlowStrength(F32 strength) { mHoverGlowStrength = strength; }
- void setImageUnselected(const std::string &image_name);
- const std::string& getImageUnselectedName() const { return mImageUnselectedName; }
- void setImageSelected(const std::string &image_name);
- const std::string& getImageSelectedName() const { return mImageSelectedName; }
- void setImageHoverSelected(const std::string &image_name);
- void setImageHoverUnselected(const std::string &image_name);
- void setImageDisabled(const std::string &image_name);
- void setImageDisabledSelected(const std::string &image_name);
-
void setImageUnselected(LLPointer<LLUIImage> image);
void setImageSelected(LLPointer<LLUIImage> image);
void setImageHoverSelected(LLPointer<LLUIImage> image);
@@ -250,106 +237,84 @@ public:
static void setFloaterToggle(LLUICtrl* ctrl, const LLSD& sdname);
protected:
-
- virtual void drawBorder(const LLColor4& color, S32 size);
-
- void setImageUnselectedID(const LLUUID &image_id);
- const LLUUID& getImageUnselectedID() const { return mImageUnselectedID; }
- void setImageSelectedID(const LLUUID &image_id);
- const LLUUID& getImageSelectedID() const { return mImageSelectedID; }
- void setImageHoverSelectedID(const LLUUID &image_id);
- void setImageHoverUnselectedID(const LLUUID &image_id);
- void setImageDisabledID(const LLUUID &image_id);
- void setImageDisabledSelectedID(const LLUUID &image_id);
const LLPointer<LLUIImage>& getImageUnselected() const { return mImageUnselected; }
const LLPointer<LLUIImage>& getImageSelected() const { return mImageSelected; }
- void resetMouseDownTimer();
LLFrameTimer mMouseDownTimer;
// If the label is empty, set the picture_style attribute
static void setupParamsForExport(Params& p, LLView* parent);
+private:
+ void drawBorder(LLUIImage* imagep, const LLColor4& color, S32 size);
+ void resetMouseDownTimer();
private:
- commit_signal_t mMouseDownSignal;
- commit_signal_t mMouseUpSignal;
- commit_signal_t mHeldDownSignal;
+ commit_signal_t mMouseDownSignal;
+ commit_signal_t mMouseUpSignal;
+ commit_signal_t mHeldDownSignal;
- const LLFontGL *mGLFont;
+ const LLFontGL* mGLFont;
- S32 mMouseDownFrame;
- S32 mMouseHeldDownCount; // Counter for parameter passed to held-down callback
- F32 mHeldDownDelay; // seconds, after which held-down callbacks get called
- S32 mHeldDownFrameDelay; // frames, after which held-down callbacks get called
+ S32 mMouseDownFrame;
+ S32 mMouseHeldDownCount; // Counter for parameter passed to held-down callback
+ F32 mHeldDownDelay; // seconds, after which held-down callbacks get called
+ S32 mHeldDownFrameDelay; // frames, after which held-down callbacks get called
LLPointer<LLUIImage> mImageOverlay;
LLFontGL::HAlign mImageOverlayAlignment;
- LLUIColor mImageOverlayColor;
+ LLUIColor mImageOverlayColor;
LLPointer<LLUIImage> mImageUnselected;
LLUIString mUnselectedLabel;
- LLUIColor mUnselectedLabelColor;
+ LLUIColor mUnselectedLabelColor;
LLPointer<LLUIImage> mImageSelected;
LLUIString mSelectedLabel;
- LLUIColor mSelectedLabelColor;
+ LLUIColor mSelectedLabelColor;
LLPointer<LLUIImage> mImageHoverSelected;
LLPointer<LLUIImage> mImageHoverUnselected;
LLPointer<LLUIImage> mImageDisabled;
- LLUIString mDisabledLabel;
- LLUIColor mDisabledLabelColor;
+ LLUIColor mDisabledLabelColor;
LLPointer<LLUIImage> mImageDisabledSelected;
LLUIString mDisabledSelectedLabel;
- LLUIColor mDisabledSelectedLabelColor;
-
- LLUUID mImageUnselectedID;
- LLUUID mImageSelectedID;
- LLUUID mImageHoverSelectedID;
- LLUUID mImageHoverUnselectedID;
- LLUUID mImageDisabledID;
- LLUUID mImageDisabledSelectedID;
- std::string mImageUnselectedName;
- std::string mImageSelectedName;
- std::string mImageHoverSelectedName;
- std::string mImageHoverUnselectedName;
- std::string mImageDisabledName;
- std::string mImageDisabledSelectedName;
+ LLUIColor mDisabledSelectedLabelColor;
- LLUIColor mHighlightColor;
- LLUIColor mFlashBgColor;
+ LLPointer<LLUIImage> mImagePressed;
+ LLPointer<LLUIImage> mImagePressedSelected;
- LLUIColor mImageColor;
- LLUIColor mDisabledImageColor;
+ LLUIColor mHighlightColor;
+ LLUIColor mFlashBgColor;
- BOOL mIsToggle;
- BOOL mScaleImage;
+ LLUIColor mImageColor;
+ LLUIColor mDisabledImageColor;
- BOOL mDropShadowedText;
- BOOL mAutoResize;
- BOOL mBorderEnabled;
+ BOOL mIsToggle;
+ BOOL mScaleImage;
- BOOL mFlashing;
+ BOOL mDropShadowedText;
+ BOOL mAutoResize;
+ BOOL mBorderEnabled;
- LLFontGL::HAlign mHAlign;
- S32 mLeftHPad;
- S32 mRightHPad;
+ BOOL mFlashing;
- F32 mHoverGlowStrength;
- F32 mCurGlowStrength;
+ LLFontGL::HAlign mHAlign;
+ S32 mLeftHPad;
+ S32 mRightHPad;
- BOOL mNeedsHighlight;
- BOOL mCommitOnReturn;
- BOOL mFadeWhenDisabled;
+ F32 mHoverGlowStrength;
+ F32 mCurGlowStrength;
- std::string mHelpURL;
+ BOOL mNeedsHighlight;
+ BOOL mCommitOnReturn;
+ BOOL mFadeWhenDisabled;
- LLPointer<LLUIImage> mImagep;
+ std::string mHelpURL;
- LLFrameTimer mFlashingTimer;
+ LLFrameTimer mFlashingTimer;
};
diff --git a/indra/llui/llcheckboxctrl.cpp b/indra/llui/llcheckboxctrl.cpp
index b43f91e766..455b17ffc7 100644
--- a/indra/llui/llcheckboxctrl.cpp
+++ b/indra/llui/llcheckboxctrl.cpp
@@ -161,7 +161,6 @@ void LLCheckBoxCtrl::onCommit()
void LLCheckBoxCtrl::setEnabled(BOOL b)
{
LLView::setEnabled(b);
- mButton->setEnabled(b);
if (b)
{
diff --git a/indra/llui/llcombobox.cpp b/indra/llui/llcombobox.cpp
index f8c6204afb..93d2b83c9f 100644
--- a/indra/llui/llcombobox.cpp
+++ b/indra/llui/llcombobox.cpp
@@ -182,12 +182,6 @@ LLComboBox::~LLComboBox()
}
-void LLComboBox::setEnabled(BOOL enabled)
-{
- LLView::setEnabled(enabled);
- mButton->setEnabled(enabled);
-}
-
void LLComboBox::clear()
{
if (mTextEntry)
@@ -196,8 +190,6 @@ void LLComboBox::clear()
}
mButton->setLabelSelected(LLStringUtil::null);
mButton->setLabelUnselected(LLStringUtil::null);
- mButton->setDisabledLabel(LLStringUtil::null);
- mButton->setDisabledSelectedLabel(LLStringUtil::null);
mList->deselectAllItems();
}
@@ -376,10 +368,7 @@ void LLComboBox::setLabel(const LLStringExplicit& name)
if (!mAllowTextEntry)
{
- mButton->setLabelUnselected(name);
- mButton->setLabelSelected(name);
- mButton->setDisabledLabel(name);
- mButton->setDisabledSelectedLabel(name);
+ mButton->setLabel(name);
}
}
@@ -441,14 +430,6 @@ void LLComboBox::setButtonVisible(BOOL visible)
}
}
-void LLComboBox::draw()
-{
- mButton->setEnabled(getEnabled() /*&& !mList->isEmpty()*/);
-
- // Draw children normally
- LLUICtrl::draw();
-}
-
BOOL LLComboBox::setCurrentByIndex( S32 index )
{
BOOL found = mList->selectNthItem( index );
diff --git a/indra/llui/llcombobox.h b/indra/llui/llcombobox.h
index db97b0df75..4becda195f 100644
--- a/indra/llui/llcombobox.h
+++ b/indra/llui/llcombobox.h
@@ -110,11 +110,8 @@ protected:
public:
// LLView interface
- virtual void draw();
virtual void onFocusLost();
- virtual void setEnabled(BOOL enabled);
-
virtual BOOL handleToolTip(S32 x, S32 y, std::string& msg, LLRect* sticky_rect);
virtual BOOL handleKeyHere(KEY key, MASK mask);
virtual BOOL handleUnicodeCharHere(llwchar uni_char);
diff --git a/indra/llui/llflyoutbutton.cpp b/indra/llui/llflyoutbutton.cpp
index 536919c072..3483bac782 100644
--- a/indra/llui/llflyoutbutton.cpp
+++ b/indra/llui/llflyoutbutton.cpp
@@ -74,13 +74,6 @@ void LLFlyoutButton::draw()
LLComboBox::draw();
}
-void LLFlyoutButton::setEnabled(BOOL enabled)
-{
- mActionButton->setEnabled(enabled);
- LLComboBox::setEnabled(enabled);
-}
-
-
void LLFlyoutButton::setToggleState(BOOL state)
{
mToggleState = state;
diff --git a/indra/llui/llflyoutbutton.h b/indra/llui/llflyoutbutton.h
index 1f1716593a..d8c0f1a50d 100644
--- a/indra/llui/llflyoutbutton.h
+++ b/indra/llui/llflyoutbutton.h
@@ -61,7 +61,6 @@ protected:
friend class LLUICtrlFactory;
public:
virtual void draw();
- virtual void setEnabled(BOOL enabled);
void setToggleState(BOOL state);
diff --git a/indra/llui/llfocusmgr.cpp b/indra/llui/llfocusmgr.cpp
index 7e452a25a3..3fef215661 100644
--- a/indra/llui/llfocusmgr.cpp
+++ b/indra/llui/llfocusmgr.cpp
@@ -49,7 +49,6 @@ LLFocusMgr::LLFocusMgr()
mDefaultKeyboardFocus( NULL ),
mKeystrokesOnly(FALSE),
mTopCtrl( NULL ),
- mFocusWeight(0.f),
mAppHasFocus(TRUE) // Macs don't seem to notify us that we've gotten focus, so default to true
#ifdef _DEBUG
, mMouseCaptorName("none")
@@ -146,8 +145,6 @@ void LLFocusMgr::setKeyboardFocus(LLUICtrl* new_focus, BOOL lock, BOOL keystroke
// cache the new focus list for next time
swap(mCachedKeyboardFocusList, new_focus_list);
- mFocusTimer.reset();
-
#ifdef _DEBUG
mKeyboardFocusName = new_focus ? new_focus->getName() : std::string("none");
#endif
@@ -346,7 +343,7 @@ void LLFocusMgr::unlockFocus()
F32 LLFocusMgr::getFocusFlashAmt() const
{
- return clamp_rescale(getFocusTime(), 0.f, FOCUS_FADE_TIME, mFocusWeight, 0.f);
+ return clamp_rescale(mFocusFlashTimer.getElapsedTimeF32(), 0.f, FOCUS_FADE_TIME, 1.f, 0.f);
}
LLColor4 LLFocusMgr::getFocusColor() const
@@ -363,8 +360,7 @@ LLColor4 LLFocusMgr::getFocusColor() const
void LLFocusMgr::triggerFocusFlash()
{
- mFocusTimer.reset();
- mFocusWeight = 1.f;
+ mFocusFlashTimer.reset();
}
void LLFocusMgr::setAppHasFocus(BOOL focus)
diff --git a/indra/llui/llfocusmgr.h b/indra/llui/llfocusmgr.h
index 165a114f3d..fbe0d22084 100644
--- a/indra/llui/llfocusmgr.h
+++ b/indra/llui/llfocusmgr.h
@@ -63,7 +63,6 @@ public:
BOOL getKeystrokesOnly() { return mKeystrokesOnly; }
void setKeystrokesOnly(BOOL keystrokes_only) { mKeystrokesOnly = keystrokes_only; }
- F32 getFocusTime() const { return mFocusTimer.getElapsedTimeF32(); }
F32 getFocusFlashAmt() const;
S32 getFocusFlashWidth() const { return llround(lerp(1.f, 3.f, getFocusFlashAmt())); }
LLColor4 getFocusColor() const;
@@ -110,8 +109,7 @@ private:
// Top View
LLUICtrl* mTopCtrl;
- LLFrameTimer mFocusTimer;
- F32 mFocusWeight;
+ LLFrameTimer mFocusFlashTimer;
BOOL mAppHasFocus;
diff --git a/indra/llui/lllineeditor.cpp b/indra/llui/lllineeditor.cpp
index f94eb7fcc3..02ee567803 100644
--- a/indra/llui/lllineeditor.cpp
+++ b/indra/llui/lllineeditor.cpp
@@ -318,10 +318,8 @@ void LLLineEditor::setMaxTextLength(S32 max_text_length)
void LLLineEditor::updateTextPadding()
{
static LLUICachedControl<S32> line_editor_hpad ("UILineEditorHPad", 0);
- mTextPadLeft = llclamp(mTextPadLeft, 0, getRect().getWidth());
- mTextPadRight = llclamp(mTextPadRight, 0, getRect().getWidth());
- mMinHPixels = line_editor_hpad + mTextPadLeft;
- mMaxHPixels = getRect().getWidth() - mMinHPixels - mTextPadRight;
+ mMinHPixels = line_editor_hpad + llclamp(mTextPadLeft, 0, getRect().getWidth());;
+ mMaxHPixels = getRect().getWidth() - mMinHPixels - llclamp(mTextPadRight, 0, getRect().getWidth());
}
diff --git a/indra/llui/llmultislider.h b/indra/llui/llmultislider.h
index 89d44eaa87..da633cc1cd 100644
--- a/indra/llui/llmultislider.h
+++ b/indra/llui/llmultislider.h
@@ -120,4 +120,4 @@ protected:
commit_signal_t mMouseUpSignal;
};
-#endif // LL_LLSLIDER_H
+#endif // LL_MULTI_SLIDER_H
diff --git a/indra/llui/llscrollbar.cpp b/indra/llui/llscrollbar.cpp
index bc489592d4..566825ff3b 100644
--- a/indra/llui/llscrollbar.cpp
+++ b/indra/llui/llscrollbar.cpp
@@ -497,8 +497,8 @@ void LLScrollbar::draw()
}
// Draw background and thumb.
- if ( ( mOrientation == VERTICAL&&(mThumbImageV.isNull() || mThumbImageV.isNull()) )
- || (mOrientation == HORIZONTAL&&(mTrackImageH.isNull() || mThumbImageH.isNull()) ))
+ if ( ( mOrientation == VERTICAL&&(mThumbImageV.isNull() || mThumbImageH.isNull()) )
+ || (mOrientation == HORIZONTAL&&(mTrackImageH.isNull() || mTrackImageV.isNull()) ))
{
gl_rect_2d(mOrientation == HORIZONTAL ? mThickness : 0,
mOrientation == VERTICAL ? getRect().getHeight() - 2 * mThickness : getRect().getHeight(),
@@ -513,7 +513,6 @@ void LLScrollbar::draw()
// Thumb
LLRect outline_rect = mThumbRect;
outline_rect.stretch(2);
- S32 rect_fix = 0;
// Background
if(mOrientation == HORIZONTAL)
@@ -521,7 +520,7 @@ void LLScrollbar::draw()
mTrackImageH->drawSolid(mThickness //S32 x
, 0 //S32 y
, getRect().getWidth() - 2 * mThickness //S32 width
- , getRect().getHeight()- rect_fix //S32 height
+ , getRect().getHeight() //S32 height
, mTrackColor.get()); //const LLColor4& color
if (gFocusMgr.getKeyboardFocus() == this)
@@ -540,7 +539,7 @@ void LLScrollbar::draw()
}
else if(mOrientation == VERTICAL)
{
- mTrackImageV->drawSolid( 0+rect_fix //S32 x
+ mTrackImageV->drawSolid( 0 //S32 x
, mThickness //S32 y
, getRect().getWidth() //S32 width
, getRect().getHeight() - 2 * mThickness //S32 height
diff --git a/indra/llui/llslider.cpp b/indra/llui/llslider.cpp
index f167836bee..1c394a71dd 100644
--- a/indra/llui/llslider.cpp
+++ b/indra/llui/llslider.cpp
@@ -49,6 +49,8 @@ LLSlider::Params::Params()
thumb_outline_color("thumb_outline_color"),
thumb_center_color("thumb_center_color"),
thumb_image("thumb_image"),
+ thumb_image_pressed("thumb_image_pressed"),
+ thumb_image_disabled("thumb_image_disabled"),
track_image("track_image"),
track_highlight_image("track_highlight_image"),
mouse_down_callback("mouse_down_callback"),
@@ -64,6 +66,8 @@ LLSlider::LLSlider(const LLSlider::Params& p)
mThumbOutlineColor(p.thumb_outline_color()),
mThumbCenterColor(p.thumb_center_color()),
mThumbImage(p.thumb_image),
+ mThumbImagePressed(p.thumb_image_pressed),
+ mThumbImageDisabled(p.thumb_image_disabled),
mTrackImage(p.track_image),
mTrackHighlightImage(p.track_highlight_image)
{
@@ -243,10 +247,6 @@ void LLSlider::draw()
// drawing solids requires texturing be disabled
gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
- F32 opacity = getEnabled() ? 1.f : 0.3f;
- LLColor4 center_color = (mThumbCenterColor.get() % opacity);
- LLColor4 track_color = (mTrackColor.get() % opacity);
-
// Track
LLRect track_rect(mThumbImage->getWidth() / 2,
getLocalRect().getCenterY() + (mTrackImage->getHeight() / 2),
@@ -257,18 +257,38 @@ void LLSlider::draw()
mTrackHighlightImage->draw(highlight_rect);
// Thumb
- if( hasMouseCapture() )
- {
- // Show ghost where thumb was before dragging began.
- mThumbImage->draw(mDragStartThumbRect, mThumbCenterColor.get() % 0.3f);
- }
if (hasFocus())
{
// Draw focus highlighting.
mThumbImage->drawBorder(mThumbRect, gFocusMgr.getFocusColor(), gFocusMgr.getFocusFlashWidth());
}
- // Fill in the thumb.
- mThumbImage->draw(mThumbRect, hasMouseCapture() ? mThumbOutlineColor.get() : center_color);
+ if( hasMouseCapture() ) // currently clicking on slider
+ {
+ // Show ghost where thumb was before dragging began.
+ if (mThumbImage.notNull())
+ {
+ mThumbImage->draw(mDragStartThumbRect, mThumbCenterColor.get() % 0.3f);
+ }
+ if (mThumbImagePressed.notNull())
+ {
+ mThumbImagePressed->draw(mThumbRect, mThumbOutlineColor);
+ }
+ }
+ else if (!isInEnabledChain())
+ {
+ if (mThumbImageDisabled.notNull())
+ {
+ mThumbImageDisabled->draw(mThumbRect, mThumbCenterColor);
+ }
+ }
+ else
+ {
+ if (mThumbImage.notNull())
+ {
+ mThumbImage->draw(mThumbRect, mThumbCenterColor);
+ }
+ }
+
LLUICtrl::draw();
}
diff --git a/indra/llui/llslider.h b/indra/llui/llslider.h
index 088fd20d94..e2a94e4d8c 100644
--- a/indra/llui/llslider.h
+++ b/indra/llui/llslider.h
@@ -46,6 +46,8 @@ public:
thumb_center_color;
Optional<LLUIImage*> thumb_image,
+ thumb_image_pressed,
+ thumb_image_disabled,
track_image,
track_highlight_image;
@@ -85,9 +87,11 @@ private:
S32 mMouseOffset;
LLRect mDragStartThumbRect;
- LLUIImage* mThumbImage;
- LLUIImage* mTrackImage;
- LLUIImage* mTrackHighlightImage;
+ LLPointer<LLUIImage> mThumbImage;
+ LLPointer<LLUIImage> mThumbImagePressed;
+ LLPointer<LLUIImage> mThumbImageDisabled;
+ LLPointer<LLUIImage> mTrackImage;
+ LLPointer<LLUIImage> mTrackHighlightImage;
LLRect mThumbRect;
LLUIColor mTrackColor;
diff --git a/indra/llui/lluictrlfactory.h b/indra/llui/lluictrlfactory.h
index 9dbe458bae..b82feb3f58 100644
--- a/indra/llui/lluictrlfactory.h
+++ b/indra/llui/lluictrlfactory.h
@@ -459,6 +459,14 @@ LLChildRegistry<DERIVED>::Register<T>::Register(const char* tag, LLWidgetCreator
{
const std::type_info* widget_type_infop = &typeid(T);
// associate parameter block type with template .xml file
+ std::string* existing_tag = LLWidgetNameRegistry ::instance().getValue(&typeid(typename T::Params));
+ if (existing_tag != NULL && *existing_tag != tag)
+ {
+ // duplicate entry for T::Params
+ // try creating empty param block in derived classes that inherit T::Params
+ int* crash = 0;
+ *crash = 0;
+ }
LLWidgetNameRegistry ::instance().defaultRegistrar().add(&typeid(typename T::Params), tag);
// associate widget type with factory function
LLDefaultWidgetRegistry::instance().defaultRegistrar().add(widget_type_infop, &LLUICtrlFactory::createDefaultWidget<T>);
diff --git a/indra/newview/llfloaterlagmeter.cpp b/indra/newview/llfloaterlagmeter.cpp
index da6dceb149..3753dcaaa8 100644
--- a/indra/newview/llfloaterlagmeter.cpp
+++ b/indra/newview/llfloaterlagmeter.cpp
@@ -152,25 +152,25 @@ void LLFloaterLagMeter::determineClient()
if (!gFocusMgr.getAppHasFocus())
{
- mClientButton->setImageUnselected(LAG_GOOD_IMAGE_NAME);
+ mClientButton->setImageUnselected(LLUI::getUIImage(LAG_GOOD_IMAGE_NAME));
mClientText->setText( getString("client_frame_time_window_bg_msg", mStringArgs) );
mClientCause->setText( LLStringUtil::null );
}
else if(client_frame_time >= mClientFrameTimeCritical)
{
- mClientButton->setImageUnselected(LAG_CRITICAL_IMAGE_NAME);
+ mClientButton->setImageUnselected(LLUI::getUIImage(LAG_CRITICAL_IMAGE_NAME));
mClientText->setText( getString("client_frame_time_critical_msg", mStringArgs) );
find_cause = true;
}
else if(client_frame_time >= mClientFrameTimeWarning)
{
- mClientButton->setImageUnselected(LAG_WARNING_IMAGE_NAME);
+ mClientButton->setImageUnselected(LLUI::getUIImage(LAG_WARNING_IMAGE_NAME));
mClientText->setText( getString("client_frame_time_warning_msg", mStringArgs) );
find_cause = true;
}
else
{
- mClientButton->setImageUnselected(LAG_GOOD_IMAGE_NAME);
+ mClientButton->setImageUnselected(LLUI::getUIImage(LAG_GOOD_IMAGE_NAME));
mClientText->setText( getString("client_frame_time_normal_msg", mStringArgs) );
mClientCause->setText( LLStringUtil::null );
}
@@ -211,13 +211,13 @@ void LLFloaterLagMeter::determineNetwork()
if(packet_loss >= mNetworkPacketLossCritical)
{
- mNetworkButton->setImageUnselected(LAG_CRITICAL_IMAGE_NAME);
+ mNetworkButton->setImageUnselected(LLUI::getUIImage(LAG_CRITICAL_IMAGE_NAME));
mNetworkText->setText( getString("network_packet_loss_critical_msg", mStringArgs) );
find_cause_loss = true;
}
else if(ping_time >= mNetworkPingCritical)
{
- mNetworkButton->setImageUnselected(LAG_CRITICAL_IMAGE_NAME);
+ mNetworkButton->setImageUnselected(LLUI::getUIImage(LAG_CRITICAL_IMAGE_NAME));
if (client_frame_time_ms < mNetworkPingCritical)
{
mNetworkText->setText( getString("network_ping_critical_msg", mStringArgs) );
@@ -226,13 +226,13 @@ void LLFloaterLagMeter::determineNetwork()
}
else if(packet_loss >= mNetworkPacketLossWarning)
{
- mNetworkButton->setImageUnselected(LAG_WARNING_IMAGE_NAME);
+ mNetworkButton->setImageUnselected(LLUI::getUIImage(LAG_WARNING_IMAGE_NAME));
mNetworkText->setText( getString("network_packet_loss_warning_msg", mStringArgs) );
find_cause_loss = true;
}
else if(ping_time >= mNetworkPingWarning)
{
- mNetworkButton->setImageUnselected(LAG_WARNING_IMAGE_NAME);
+ mNetworkButton->setImageUnselected(LLUI::getUIImage(LAG_WARNING_IMAGE_NAME));
if (client_frame_time_ms < mNetworkPingWarning)
{
mNetworkText->setText( getString("network_ping_warning_msg", mStringArgs) );
@@ -241,7 +241,7 @@ void LLFloaterLagMeter::determineNetwork()
}
else
{
- mNetworkButton->setImageUnselected(LAG_GOOD_IMAGE_NAME);
+ mNetworkButton->setImageUnselected(LLUI::getUIImage(LAG_GOOD_IMAGE_NAME));
mNetworkText->setText( getString("network_performance_normal_msg", mStringArgs) );
}
@@ -266,19 +266,19 @@ void LLFloaterLagMeter::determineServer()
if(sim_frame_time >= mServerFrameTimeCritical)
{
- mServerButton->setImageUnselected(LAG_CRITICAL_IMAGE_NAME);
+ mServerButton->setImageUnselected(LLUI::getUIImage(LAG_CRITICAL_IMAGE_NAME));
mServerText->setText( getString("server_frame_time_critical_msg", mStringArgs) );
find_cause = true;
}
else if(sim_frame_time >= mServerFrameTimeWarning)
{
- mServerButton->setImageUnselected(LAG_WARNING_IMAGE_NAME);
+ mServerButton->setImageUnselected(LLUI::getUIImage(LAG_WARNING_IMAGE_NAME));
mServerText->setText( getString("server_frame_time_warning_msg", mStringArgs) );
find_cause = true;
}
else
{
- mServerButton->setImageUnselected(LAG_GOOD_IMAGE_NAME);
+ mServerButton->setImageUnselected(LLUI::getUIImage(LAG_GOOD_IMAGE_NAME));
mServerText->setText( getString("server_frame_time_normal_msg", mStringArgs) );
mServerCause->setText( LLStringUtil::null );
}
diff --git a/indra/newview/llimpanel.cpp b/indra/newview/llimpanel.cpp
index 4ae188977e..879f106b1f 100644
--- a/indra/newview/llimpanel.cpp
+++ b/indra/newview/llimpanel.cpp
@@ -1713,35 +1713,6 @@ void LLFloaterIMPanel::sendMsg()
mOtherParticipantUUID,
mDialog);
- // local echo
- if((mDialog == IM_NOTHING_SPECIAL) &&
- (mOtherParticipantUUID.notNull()))
- {
- std::string history_echo;
- gAgent.buildFullname(history_echo);
-
- // Look for IRC-style emotes here.
- std::string prefix = utf8_text.substr(0, 4);
- if (prefix == "/me " || prefix == "/me'")
- {
- utf8_text.replace(0,3,"");
- }
- else
- {
- history_echo += ": ";
- }
- history_echo += utf8_text;
-
- BOOL other_was_typing = mOtherTyping;
-
- addHistoryLine(history_echo, LLUIColorTable::instance().getColor("IMChatColor"), true, gAgent.getID());
-
- if (other_was_typing)
- {
- addTypingIndicator(mOtherTypingName);
- }
-
- }
}
else
{
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp
index 6d0868b526..fa0ab0ea3f 100644
--- a/indra/newview/llimview.cpp
+++ b/indra/newview/llimview.cpp
@@ -380,6 +380,28 @@ void LLIMModel::sendMessage(const std::string& utf8_text,
std::string from;
gAgent.buildFullname(from);
LLIMModel::instance().addToHistory(im_session_id, from, utf8_text);
+
+ //local echo for the legacy communicate panel
+ std::string history_echo;
+ std::string utf8_copy = utf8_text;
+ gAgent.buildFullname(history_echo);
+
+ // Look for IRC-style emotes here.
+
+ std::string prefix = utf8_copy.substr(0, 4);
+ if (prefix == "/me " || prefix == "/me'")
+ {
+ utf8_copy.replace(0,3,"");
+ }
+ else
+ {
+ history_echo += ": ";
+ }
+ history_echo += utf8_copy;
+
+ LLFloaterIMPanel* floater = gIMMgr->findFloaterBySession(im_session_id);
+ if (floater) floater->addHistoryLine(history_echo, LLUIColorTable::instance().getColor("IMChatColor"), true, gAgent.getID());
+
}
// Add the recipient to the recent people list.
@@ -1362,7 +1384,7 @@ LLUUID LLIMMgr::addSession(
{
// *TODO: Remove this? Otherwise old communicate window opens on
// second initiation of IM session from People panel?
- floater->openFloater();
+ // floater->openFloater();
}
//mTabContainer->selectTabPanel(panel);
floater->setInputFocus(TRUE);
diff --git a/indra/newview/lllocationinputctrl.cpp b/indra/newview/lllocationinputctrl.cpp
index a20296a122..7986d7c861 100644
--- a/indra/newview/lllocationinputctrl.cpp
+++ b/indra/newview/lllocationinputctrl.cpp
@@ -245,7 +245,7 @@ BOOL LLLocationInputCtrl::handleToolTip(S32 x, S32 y, std::string& msg, LLRect*
}
// Cursor is above the text entry.
- msg = LLUI::sShowXUINames ? getShowNamesToolTip() : gAgent.getSLURL();
+ msg = LLUI::sShowXUINames ? getShowNamesToolTip() : "";
if (mTextEntry && sticky_rect_screen)
{
*sticky_rect_screen = mTextEntry->calcScreenRect();
diff --git a/indra/newview/llpanelpeople.cpp b/indra/newview/llpanelpeople.cpp
index 9be2fb12d2..0d50d7c781 100644
--- a/indra/newview/llpanelpeople.cpp
+++ b/indra/newview/llpanelpeople.cpp
@@ -798,6 +798,9 @@ void LLPanelPeople::onMoreButtonClicked()
void LLPanelPeople::onOpen(const LLSD& key)
{
std::string tab_name = key["people_panel_tab_name"];
+ mFilterEditor -> clear();
+ onFilterEdit("");
+
if (!tab_name.empty())
mTabContainer->selectTabByName(tab_name);
else
diff --git a/indra/newview/llpanelplaces.cpp b/indra/newview/llpanelplaces.cpp
index 5976897970..191c43791d 100644
--- a/indra/newview/llpanelplaces.cpp
+++ b/indra/newview/llpanelplaces.cpp
@@ -136,6 +136,9 @@ BOOL LLPanelPlaces::postBuild()
void LLPanelPlaces::onOpen(const LLSD& key)
{
+ mFilterEditor->clear();
+ onFilterEdit("");
+
if(mPlaceInfo == NULL || key.size() == 0)
return;
@@ -197,6 +200,8 @@ void LLPanelPlaces::onOpen(const LLSD& key)
hist_items[index].mRegionID,
pos_global);
}
+
+
}
void LLPanelPlaces::setItem(LLInventoryItem* item)
diff --git a/indra/newview/llsidetray.cpp b/indra/newview/llsidetray.cpp
index 5f0fbe6ee5..fec4798f7b 100644
--- a/indra/newview/llsidetray.cpp
+++ b/indra/newview/llsidetray.cpp
@@ -508,6 +508,8 @@ void LLSideTray::expandSideBar ()
{
mCollapsed = false;
mCollapseButton->setLabel(EXPANDED_NAME);
+ LLSD key;//empty
+ mActiveTab->onOpen(key);
mActiveTab->setVisible(TRUE);
reflectCollapseChange();
diff --git a/indra/newview/llstatusbar.cpp b/indra/newview/llstatusbar.cpp
index bc90fe7adc..12fb811328 100644
--- a/indra/newview/llstatusbar.cpp
+++ b/indra/newview/llstatusbar.cpp
@@ -479,9 +479,11 @@ void LLStatusBar::creditBalance(S32 credit)
void LLStatusBar::setBalance(S32 balance)
{
std::string money_str = LLResMgr::getInstance()->getMonetaryString( balance );
- std::string balance_str = "L$";
- balance_str += money_str;
- mBtnBuyCurrency->setLabel( balance_str );
+
+ LLStringUtil::format_map_t string_args;
+ string_args["[AMT]"] = llformat("%s", money_str.c_str());
+ std::string labe_str = getString("buycurrencylabel", string_args);
+ mBtnBuyCurrency->setLabel(labe_str);
// Resize the balance button so that the label fits it, and the button expands to the left.
// *TODO: LLButton should have an option where to expand.
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp
index d6be326a76..b502dbe6fc 100644
--- a/indra/newview/llviewerwindow.cpp
+++ b/indra/newview/llviewerwindow.cpp
@@ -2905,7 +2905,9 @@ void LLViewerWindow::updateKeyboardFocus()
{
if (!cur_focus->isInVisibleChain() || !cur_focus->isInEnabledChain())
{
- gFocusMgr.releaseFocusIfNeeded(cur_focus);
+ // don't release focus, just reassign so that if being given
+ // to a sibling won't call onFocusLost on all the ancestors
+ // gFocusMgr.releaseFocusIfNeeded(cur_focus);
LLUICtrl* parent = cur_focus->getParentUICtrl();
const LLUICtrl* focus_root = cur_focus->findRootMostFocusRoot();
diff --git a/indra/newview/skins/default/textures/icons/ForwardArrow_Off.png b/indra/newview/skins/default/textures/icons/ForwardArrow_Off.png
new file mode 100644
index 0000000000..e9b72b0401
--- /dev/null
+++ b/indra/newview/skins/default/textures/icons/ForwardArrow_Off.png
Binary files differ
diff --git a/indra/newview/skins/default/textures/icons/ForwardArrow_Press.png b/indra/newview/skins/default/textures/icons/ForwardArrow_Press.png
new file mode 100644
index 0000000000..c7b2c769ae
--- /dev/null
+++ b/indra/newview/skins/default/textures/icons/ForwardArrow_Press.png
Binary files differ
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index 96d93e7081..69742c6ecd 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -15,6 +15,9 @@
<texture name="Arrow_Right_Off" file_name="navbar/Arrow_Right_Off.png" preload="true"/>
<texture name="Arrow_Right_Press" file_name="navbar/Arrow_Right_Press.png" preload="true"/>
+ <texture name="Arrow_Up" file_name="widgets/Arrow_Up.png" preload="true" />
+ <texture name="Arrow_Down" file_name="widgets/Arrow_Down.png" preload="true" />
+
<texture name="BackArrow_Off" file_name="icons/BackArrow_Off.png" preload="false" />
<texture name="BackArrow_Press" file_name="icons/BackArrow_Press.png" preload="false" />
@@ -56,9 +59,12 @@
<texture name="FileMenu_BarSelect" file_name="navbar/FileMenu_BarSelect.png" preload="false" />
<texture name="FileMenu_BG" file_name="navbar/FileMenu_BG.png" preload="false" />
+ <texture name="ForwardArrow_Off" file_name="icons/ForwardArrow_Off.png" preload="false" />
+ <texture name="ForwardArrow_Press" file_name="icons/ForwardArrow_Press.png" preload="false" />
+
<texture name="Help_Off" file_name="navbar/Help_Off.png" preload="false"/>
<texture name="Help_Press" file_name="navbar/Help_Press.png" preload="false"/>
-
+
<texture name="History_Arrow" file_name="navbar/History_Arrow.png" preload="true"/>
<texture name="Home_Off" file_name="navbar/Home_Off.png" preload="false"/>
@@ -110,7 +116,8 @@
<texture name="PushButton_Selected" file_name="widgets/PushButton_Selected.png" preload="true" scale.left="4" scale.top="19" scale.right="28" scale.bottom="4" />
<texture name="PushButton_Selected_Press" file_name="widgets/PushButton_Selected_Press.png" preload="true" scale.left="4" scale.top="19" scale.right="28" scale.bottom="4" />
<texture name="PushButton_Selected_Disabled" file_name="widgets/PushButton_Selected_Disabled.png" preload="true" scale.left="4" scale.top="19" scale.right="28" scale.bottom="4" />
-
+
+ <texture name="RadioButton_Press" file_name="widgets/RadioButton_Press.png" preload="true" />
<texture name="RadioButton_On_Press" file_name="widgets/RadioButton_On_Press.png" preload="true" />
<texture name="RadioButton_Off" file_name="widgets/RadioButton_Off.png" preload="true" />
<texture name="RadioButton_On" file_name="widgets/RadioButton_On.png" preload="true" />
@@ -240,7 +247,7 @@
<texture name="Window_Background" file_name="windows/Window_Background.png" preload="true" />
<texture name="Window_Foreground" file_name="windows/Window_Foreground.png" preload="true" />
-
+
@@ -249,7 +256,7 @@
<texture name="btn_chatbar.tga" scale.left="20" scale.top="24" scale.right="44" scale.bottom="0"/>
<texture name="btn_chatbar_selected.tga" scale.left="20" scale.top="24" scale.right="44" scale.bottom="0"/>
-
+
<texture name="cam_rotate_out.tga" preload="false"/>
<texture name="cam_rotate_in.tga" preload="false"/>
<texture name="cam_zoom_out.tga" preload="false"/>
@@ -333,7 +340,7 @@
<texture name="minimize_pressed.tga" preload="true"/>
<texture name="sm_rounded_corners_simple.tga" scale.left="4" scale.top="4" scale.bottom="4" scale.right="4"/>
-
+
<texture name="rounded_square.tga" file_name="rounded_square.j2c" preload="true" scale.left="16" scale.top="16" scale.right="112" scale.bottom="16" />
<texture name="rounded_square_soft.tga" file_name="rounded_square_soft.j2c" preload="true" scale.left="16" scale.top="16" scale.right="112" scale.bottom="16"/>
diff --git a/indra/newview/skins/default/textures/widgets/Arrow_Down.png b/indra/newview/skins/default/textures/widgets/Arrow_Down.png
new file mode 100644
index 0000000000..e10f6472eb
--- /dev/null
+++ b/indra/newview/skins/default/textures/widgets/Arrow_Down.png
Binary files differ
diff --git a/indra/newview/skins/default/textures/widgets/Arrow_Up.png b/indra/newview/skins/default/textures/widgets/Arrow_Up.png
new file mode 100644
index 0000000000..48df69d82e
--- /dev/null
+++ b/indra/newview/skins/default/textures/widgets/Arrow_Up.png
Binary files differ
diff --git a/indra/newview/skins/default/xui/en/floater_buy_land.xml b/indra/newview/skins/default/xui/en/floater_buy_land.xml
index ec52c565ae..777236504d 100644
--- a/indra/newview/skins/default/xui/en/floater_buy_land.xml
+++ b/indra/newview/skins/default/xui/en/floater_buy_land.xml
@@ -374,9 +374,11 @@ supports [AMOUNT2] objects
length="1"
bottom_delta="-119"
follows="top|left"
+ height="16"
layout="topleft"
left="204"
name="info_parcel_label"
+ top="30"
width="48">
Parcel:
</text>
@@ -389,7 +391,7 @@ supports [AMOUNT2] objects
layout="topleft"
left_delta="16"
name="info_parcel"
- top_delta="-1"
+ top_pad="1"
width="180">
Scotopteryx 138,204
</text>
@@ -397,9 +399,11 @@ supports [AMOUNT2] objects
type="string"
length="1"
follows="top|left"
+ height="16"
layout="topleft"
left="204"
name="info_size_label"
+ top_pad="1"
width="48">
Size:
</text>
@@ -412,7 +416,7 @@ supports [AMOUNT2] objects
layout="topleft"
left_delta="16"
name="info_size"
- top_delta="-1"
+ top_pad="1"
width="180">
1024 m²
</text>
@@ -420,9 +424,11 @@ supports [AMOUNT2] objects
type="string"
length="1"
follows="top|left"
+ height="16"
layout="topleft"
left="204"
name="info_price_label"
+ top_pad="1"
width="48">
Price:
</text>
@@ -435,7 +441,7 @@ supports [AMOUNT2] objects
layout="topleft"
left_delta="16"
name="info_price"
- top_delta="-1"
+ top_pad="1"
width="180">
L$ 1500
(L$ 1.1/m²)
@@ -450,7 +456,7 @@ sold with objects
layout="topleft"
left="16"
name="info_action"
- top="156"
+ top="166"
width="350">
Buying this land will:
</text>
@@ -485,7 +491,7 @@ sold with objects
layout="topleft"
left_delta="0"
name="error_web"
- top_delta="144"
+ top_delta="154"
width="120" />
<locate
height="-200"
@@ -508,7 +514,7 @@ sold with objects
left="72"
name="account_action"
right="438"
- top="190"
+ top="200"
width="218">
Upgrade you to premium membership.
</text>
@@ -562,7 +568,7 @@ sold with objects
left="72"
name="land_use_action"
right="438"
- top="274"
+ top="284"
width="218">
Increase your monthly land use fees to US$ 40/month.
</text>
@@ -638,7 +644,7 @@ sold with objects
layout="topleft"
left="170"
name="currency_amt"
- top="398"
+ top="408"
width="80">
1000
</line_editor>
@@ -654,7 +660,7 @@ sold with objects
layout="topleft"
left="260"
name="currency_est"
- top="399"
+ top="409"
width="178">
for approx. US$ [AMOUNT2]
</text>
diff --git a/indra/newview/skins/default/xui/en/floater_inventory_item_properties.xml b/indra/newview/skins/default/xui/en/floater_inventory_item_properties.xml
index 6cb044cda1..467168ebd8 100644
--- a/indra/newview/skins/default/xui/en/floater_inventory_item_properties.xml
+++ b/indra/newview/skins/default/xui/en/floater_inventory_item_properties.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater
auto_tile="true"
- height="320"
+ height="340"
layout="topleft"
name="item properties"
save_rect="true"
@@ -185,31 +185,71 @@
name="OwnerLabel"
top="125"
width="78">
- You can:
+ You:
</text>
<check_box
height="16"
- label="Modify"
+ label="Edit"
layout="topleft"
- left_delta="0"
+ left_pad="5"
name="CheckOwnerModify"
- top_pad="4"
+ top_delta="0"
width="78" />
<check_box
height="16"
label="Copy"
layout="topleft"
- left_delta="78"
+ left_delta="0"
name="CheckOwnerCopy"
- top_delta="0"
+ top_pad="5"
width="88" />
<check_box
height="16"
- label="Resell/Give away"
+ label="Resell"
layout="topleft"
- left_delta="88"
+ left_delta="0"
name="CheckOwnerTransfer"
+ top_pad="5"
+ width="106" />
+ <text
+ type="string"
+ length="1"
+ follows="left|top"
+ height="10"
+ layout="topleft"
+ left="10"
+ name="AnyoneLabel"
+ top_pad="5"
+ width="78">
+ Anyone:
+ </text>
+ <check_box
+ height="16"
+ label="Copy"
+ layout="topleft"
+ left_pad="5"
+ name="CheckEveryoneCopy"
top_delta="0"
+ width="130" />
+ <text
+ type="string"
+ length="1"
+ follows="left|top"
+ height="10"
+ layout="topleft"
+ left="10"
+ name="GroupLabel"
+ top_pad="5"
+ width="78">
+ Group:
+ </text>
+ <check_box
+ height="16"
+ label="Share"
+ layout="topleft"
+ left_pad="5"
+ name="CheckShareWithGroup"
+ top_delta="5"
width="106" />
<text
type="string"
@@ -218,6 +258,93 @@
height="10"
layout="topleft"
left="10"
+ name="NextOwnerLabel"
+ top_pad="5"
+ width="78">
+ Next owner:
+ </text>
+ <check_box
+ height="16"
+ label="Edit"
+ layout="topleft"
+ left_pad="5"
+ name="CheckNextOwnerModify"
+ top_delta="0"
+ width="78" />
+ <check_box
+ height="16"
+ label="Copy"
+ layout="topleft"
+ left_delta="0"
+ name="CheckNextOwnerCopy"
+ top_pad="5"
+ width="88" />
+ <check_box
+ height="16"
+ label="Resell"
+ layout="topleft"
+ left_delta="0"
+ name="CheckNextOwnerTransfer"
+ top_pad="5"
+ width="106" />
+ <check_box
+ height="16"
+ label="For Sale"
+ layout="topleft"
+ left="10"
+ name="CheckPurchase"
+ top_pad="5"
+ width="78" />
+ <combo_box
+ height="19"
+ left_pad="5"
+ layout="topleft"
+ follows="left|top"
+ name="combobox sale copy"
+ width="90">
+ <combo_box.item
+ label="Copy"
+ name="Copy"
+ value="Copy" />
+ <combo_box.item
+ label="Original"
+ name="Original"
+ value="Original" />
+ </combo_box>
+ <spinner
+ follows="left|top"
+ decimal_digits="0"
+ increment="1"
+ control_name="Edit Cost"
+ name="Edit Cost"
+ label="Price: L$"
+ label_width="60"
+ left="10"
+ width="180"
+ min_val="1"
+ height="19"
+ max_val="999999999"
+ top_pad="5"/>
+
+ <!--line_editor
+ border_style="line"
+ border_thickness="1"
+ follows="left|top|right"
+ height="16"
+ layout="topleft"
+ left_pad="5"
+ max_length="25"
+ name="EditPrice"
+ top_delta="0"
+ width="242" /-->
+
+ <!--text
+ type="string"
+ length="1"
+ follows="left|top"
+ height="10"
+ layout="topleft"
+ left="10"
name="BaseMaskDebug"
top="155"
width="330">
@@ -270,60 +397,8 @@
top_delta="0"
width="90">
N:
- </text>
- <check_box
- height="16"
- label="Share with group"
- layout="topleft"
- left="10"
- name="CheckShareWithGroup"
- top="171"
- width="106" />
- <check_box
- height="16"
- label="Allow anyone to copy"
- layout="topleft"
- left_delta="0"
- name="CheckEveryoneCopy"
- top_pad="16"
- width="130" />
- <text
- type="string"
- length="1"
- follows="left|top"
- height="10"
- layout="topleft"
- left_delta="0"
- name="NextOwnerLabel"
- top_pad="16"
- width="88">
- Next owner can:
- </text>
- <check_box
- height="16"
- label="Modify"
- layout="topleft"
- left_delta="0"
- name="CheckNextOwnerModify"
- top_pad="4"
- width="78" />
- <check_box
- height="16"
- label="Copy"
- layout="topleft"
- left_delta="78"
- name="CheckNextOwnerCopy"
- top_delta="0"
- width="88" />
- <check_box
- height="16"
- label="Resell/Give away"
- layout="topleft"
- left_delta="88"
- name="CheckNextOwnerTransfer"
- top_delta="0"
- width="106" />
- <text
+ </text-->
+ <!--text
type="string"
length="1"
follows="left|top"
@@ -331,19 +406,13 @@
layout="topleft"
left="10"
name="SaleLabel"
- top="265"
+ top_pad="5"
width="330">
Mark Item:
- </text>
- <check_box
- height="16"
- label="For Sale"
- layout="topleft"
- left_delta="0"
- name="CheckPurchase"
- top_pad="4"
- width="78" />
- <radio_group
+ </text-->
+
+
+ <!--radio_group
draw_border="false"
follows="left|top|right"
height="16"
@@ -368,28 +437,19 @@
name="radio2"
top_delta="0"
width="70" />
- </radio_group>
- <text
+ </radio_group-->
+
+ <!--text
type="string"
length="1"
follows="left|top"
height="16"
layout="topleft"
- left="42"
+ left="10"
name="TextPrice"
- top="299"
- width="56">
- Price: L$
- </text>
- <line_editor
- border_style="line"
- border_thickness="1"
- follows="left|top|right"
- height="16"
- layout="topleft"
- left_delta="56"
- max_length="25"
- name="EditPrice"
- top_delta="0"
- width="242" />
+ top_pad="5"
+ width="78">
+ Price: L$
+ </text-->
+
</floater>
diff --git a/indra/newview/skins/default/xui/en/menu_nearby_chat.xml b/indra/newview/skins/default/xui/en/menu_nearby_chat.xml
index 02a2f83d14..ff89e20ea5 100644
--- a/indra/newview/skins/default/xui/en/menu_nearby_chat.xml
+++ b/indra/newview/skins/default/xui/en/menu_nearby_chat.xml
@@ -7,7 +7,7 @@
</menu_item_call>
<menu_item_separator />
- <menu_item_check bottom_delta="-18" height="18" label="Show Muted Text" left="0" mouse_opaque="true"
+ <menu_item_check bottom_delta="-18" height="18" label="Show Blocked Text" left="0" mouse_opaque="true"
name="muted_text" width="128">
<menu_item_check.on_click function="NearbyChat.Action" userdata="muted_text" />
<menu_item_check.on_check function="NearbyChat.Check" userdata="muted_text"/>
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 2bb3c887f5..40847b28fe 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -205,7 +205,7 @@
function="Floater.Toggle"
parameter="active_speakers" />
</menu_item_check>
- <menu_item_check
+ <!--menu_item_check
label="Block List"
layout="topleft"
name="Mute List">
@@ -215,7 +215,7 @@
<menu_item_check.on_click
function="Floater.Toggle"
parameter="mute" />
- </menu_item_check>
+ </menu_item_check-->
<menu_item_separator
layout="topleft" />
<menu_item_check
diff --git a/indra/newview/skins/default/xui/en/panel_group_general.xml b/indra/newview/skins/default/xui/en/panel_group_general.xml
index 71b5f78d59..fcae65dd69 100644
--- a/indra/newview/skins/default/xui/en/panel_group_general.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_general.xml
@@ -42,6 +42,7 @@ Hover your mouse over the options for more help.
<line_editor
follows="left|top"
font="SansSerifSmall"
+ prevalidate_callback="asci"
halign="left"
height="16"
label="Type your new group name here"
diff --git a/indra/newview/skins/default/xui/en/panel_notes.xml b/indra/newview/skins/default/xui/en/panel_notes.xml
index a0ac9df8a5..e616389c36 100644
--- a/indra/newview/skins/default/xui/en/panel_notes.xml
+++ b/indra/newview/skins/default/xui/en/panel_notes.xml
@@ -1,205 +1,121 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel
- follows="top|left|right|bottom"
bevel_style="in"
- height="625"
- label="Notes and Privacy"
+ follows="left|top|right|bottom"
+ height="570"
+ width="295"
+ border="false"
layout="topleft"
- left="10"
- name="panel_notes"
- top="10"
- width="305">
+ left="0"
+ top="0"
+ label="Notes &amp; Privacy"
+ name="panel_notes">
<scroll_container
- left="8"
- width="260"
- height="570"
+ color="DkGray2"
follows="left|top|right|bottom"
+ height="570"
+ width="265"
layout="topleft"
- name="profile_scroll"
+ left="5"
+ top_pad="0"
+ bevel_style="in"
opaque="true"
- color="DkGray2"
+ name="profile_scroll"
reserve_scroll_corner="false">
- <panel
- layout="topleft"
- width="260"
- height="530"
- left="0"
- follows="left|right"
- top="0">
- <!-- <text
- type="string"
- length="1"
- follows="left|top"
- font="SansSerifHugeBold"
- height="20"
- layout="topleft"
- left="10"
- name="pick_title"
- text_color="white"
- top="10"
- width="250"
- word_wrap="true">
- Private Notes
- </text>-->
<text
type="string"
length="1"
follows="left|top"
font="SansSerifBold"
- height="15"
- layout="topleft"
- left="10"
+ height="16"
+ width="225"
+ left="0"
name="status_message"
- text_color="White"
- top="20"
- width="260">
- Your private notes:
+ text_color="white"
+ top="">
+ My private notes:
</text>
<text_editor
- bg_focus_color="LtGray"
- bg_writeable_color="LtGray"
- follows="left|right"
- font="SansSerif"
height="200"
+ follows="left|top"
+ width="243"
hide_scrollbar="true"
- layout="topleft"
left="10"
max_length="1000"
name="notes_edit"
text_color="black"
top_pad="10"
- width="240"
word_wrap="true" />
- <!-- <text
- type="string"
- length="1"
- follows="left|top"
- font="SansSerifHugeBold"
- height="20"
- layout="topleft"
- left="10"
- name="pick_title2"
- text_color="white"
- top_pad="10"
- width="250"
- word_wrap="true">
- Private Settings
- </text> -->
<text
type="string"
length="1"
follows="left|top"
font="SansSerifBold"
- height="15"
- layout="topleft"
+ height="16"
+ width="225"
left="10"
name="status_message2"
text_color="white"
- top_pad="30"
- width="260">
- Allow this user to:
+ top_pad="30">
+ Let this person:
</text>
<check_box
enabled="false"
follows="left|top"
- font="SansSerif"
+ width="230"
height="20"
label="See my online status"
- layout="topleft"
- left="10"
- name="status_check"
- text_disabled_color="0.1 0.1 0.1 1"
- text_enabled_color="white"
+ left="20"
top_pad="10"
- width="260" />
+ name="status_check" />
<check_box
enabled="false"
follows="left|top"
- font="SansSerif"
+ width="230"
height="20"
label="See me on the map"
- layout="topleft"
- left="10"
- name="map_check"
- text_disabled_color="0.1 0.1 0.1 1"
- text_enabled_color="white"
+ left="20"
top_pad="10"
- width="260" />
+ name="map_check"/>
<check_box
enabled="false"
follows="left|top"
- font="SansSerif"
+ width="230"
height="20"
label="Edit, delete or take my objects"
- layout="topleft"
- left="10"
- name="objects_check"
- text_disabled_color="0.1 0.1 0.1 1"
- text_enabled_color="white"
+ left="20"
top_pad="10"
- width="260" />
- </panel>
+ name="objects_check" />
</scroll_container>
<panel
- layout="topleft"
- follows="bottom"
+ follows="bottom|left"
height="30"
- left="8"
- name="notes_buttons_panel"
- bottom="625"
- width="280">
- <button
- follows="bottom|left"
- font="SansSerifSmallBold"
- height="25"
- label="Add Friend"
- layout="topleft"
- left="0"
- mouse_opaque="false"
- name="add_friend"
- top="0"
- width="90" />
- <button
- follows="bottom|left"
- font="SansSerifSmallBold"
- height="25"
- label="IM"
- layout="topleft"
- left_pad="0"
- name="im"
- top="0"
- width="40" />
- <button
- follows="bottom|left"
- font="SansSerifSmallBold"
- height="25"
- label="Call"
- layout="topleft"
- left_pad="0"
- name="call"
- top="0"
- width="50"
- enabled="false"/>
+ width="280"
+ layout="topleft"
+ left="10"
+ top_pad="5"
+ name="notes_buttons_panel">
<button
follows="bottom|left"
font="SansSerifSmallBold"
height="25"
label="Teleport"
layout="topleft"
- left_pad="0"
- name="teleport"
+ left="0"
+ name="teleport_btn"
+ enabled="false"
top="0"
width="75" />
<button
follows="bottom|left"
font="SansSerifSmallBold"
height="25"
- label="Share"
+ label="Show on Map"
layout="topleft"
left_pad="0"
- name="share"
+ name="show_on_map_btn"
+ enabled="false"
top="0"
- width="60"
- enabled="false"/>
+ width="105" />
</panel>
</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml
index 6b3f5eaee1..dc12bb7239 100644
--- a/indra/newview/skins/default/xui/en/panel_people.xml
+++ b/indra/newview/skins/default/xui/en/panel_people.xml
@@ -1,20 +1,23 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel
layout="topleft"
+ font="SansSerifBigBold"
top="0"
left="0"
width="305"
height="465"
- follows="left|top|right|bottom"
- background_visible="true"
+ follows="left|top|right|bottom"
+ background_visible="true"
+ bg_alpha_color="DkGray2"
+ bevel_style="in"
label="People"
name="people_panel">
<filter_editor
layout="topleft"
top="3"
- left="15"
- width="270"
- height="20"
+ left="10"
+ width="256"
+ height="23"
follows="left|top|right"
max_length="270"
label="Filter People"
@@ -22,7 +25,7 @@
font="SansSerif"
background_image="TextField_Search_Off"
text_pad_left="23"
- text_color="black"/>
+ text_color="black" />
<button
name="people_search"
layout="topleft"
@@ -39,8 +42,8 @@
<tab_container
layout="topleft"
top="30"
- left="10"
- width="280"
+ left="10"
+ width="295"
height="400"
follows="left|top|right|bottom"
name="tabs"
@@ -50,8 +53,8 @@
height="390"
width="280"
follows="left|top|right|bottom"
- background_visible="true"
- bevel_style="bright"
+ background_visible="false"
+ bevel_style="none"
label="Nearby"
name="nearby_panel">
<avatar_list
@@ -62,7 +65,7 @@
height="357"
follows="left|top|right|bottom"
name="avatar_list"
- volume_column_width="20"/>
+ volume_column_width="20"/>
<panel
layout="topleft"
bottom="390"
@@ -71,7 +74,7 @@
height="30"
follows="left|right|bottom"
background_visible="true"
- bevel_style="bright"
+ bevel_style="none"
label="bottom_panel"
name="bottom_panel">
<button
@@ -96,7 +99,7 @@
width="280"
follows="left|top|right|bottom"
background_visible="true"
- bevel_style="bright"
+ bevel_style="none"
label="Friends"
name="friends_panel">
<avatar_list
@@ -115,7 +118,7 @@
height="30"
follows="left|right|bottom"
background_visible="true"
- bevel_style="in"
+ bevel_style="none"
label="bottom_panel"
name="bottom_panel">
<button
@@ -163,10 +166,10 @@
<panel
layout="topleft"
height="390"
- width="280"
+ width="280"
follows="left|top|right|bottom"
background_visible="true"
- bevel_style="bright"
+ bevel_style="none"
label="Groups"
name="groups_panel">
<group_list
@@ -185,7 +188,7 @@
height="30"
follows="left|right|bottom"
background_visible="true"
- bevel_style="in"
+ bevel_style="none"
label="bottom_panel"
name="bottom_panel">
<button
@@ -240,7 +243,7 @@
hover_glow_amount="0.15"
image_selected="TrashItem_Press"
image_unselected="TrashItem_Off"
- picture_style="true"/>
+ picture_style="true"/>
</panel>
</panel>
<panel
@@ -249,8 +252,8 @@
width="280"
follows="left|top|right|bottom"
background_visible="true"
- bevel_style="bright"
- label="Recent"
+ bevel_style="none"
+ label="History"
name="recent_panel">
<avatar_list
layout="topleft"
@@ -268,7 +271,7 @@
height="30"
follows="left|right|bottom"
background_visible="true"
- bevel_style="in"
+ bevel_style="none"
label="bottom_panel"
name="bottom_panel">
<button
@@ -293,7 +296,7 @@
follows="left|right|bottom"
bottom="6"
left="6"
- width="280"
+ width="295"
height="27"
orientation="horizontal"
animate="false"
@@ -478,7 +481,7 @@
follows="top|right"
font="SansSerifSmallBold"/>
</layout_panel>
- </layout_stack>
+ </layout_stack>
<string name="no_people">
No people
</string>
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 393521f1d2..1425246540 100644
--- a/indra/newview/skins/default/xui/en/panel_pick_info.xml
+++ b/indra/newview/skins/default/xui/en/panel_pick_info.xml
@@ -1,24 +1,13 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel
+ follows="left|top|right|bottom"
bevel_style="in"
- height="660"
+ height="625"
+ width="280"
layout="topleft"
left="0"
name="panel_pick_info"
- top="0"
- width="305">
- <button
- follows="top|left"
- height="20"
- image_overlay="navbar_back.tga"
- image_selected="navbar_bg_button.tga"
- image_unselected="navbar_bg_button.tga"
- layout="topleft"
- left="10"
- name="back_btn"
- picture_style="true"
- top="5"
- width="20" />
+ top="0">
<text
type="string"
length="1"
@@ -33,15 +22,24 @@
width="150">
Pick Info
</text>
+ <button
+ follows="top|right"
+ right="-25"
+ top="10"
+ width="20"
+ height="20"
+ image_overlay="BackArrow_Off"
+ layout="topleft"
+ name="back_btn"
+ picture_style="true" />
<panel
follows="left|right|top|bottom"
- height="580"
+ min_height="300"
width="280"
layout="topleft"
background_visible="true"
bg_alpha_color="DkGray2"
left="10"
- right="-10"
top="30">
<texture_picker
enabled="false"
diff --git a/indra/newview/skins/default/xui/en/panel_pick_list_item.xml b/indra/newview/skins/default/xui/en/panel_pick_list_item.xml
index 1a06e2bb06..78bec6035f 100644
--- a/indra/newview/skins/default/xui/en/panel_pick_list_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_pick_list_item.xml
@@ -1,63 +1,57 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel
- bg_alpha_color="0.4 0.4 0.4 1"
- bg_opaque_color="0.4 0.4 0.4 1"
- border="true"
- follows="top|left|right"
- height="80"
- layout="topleft"
+ border="false"
+ follows="top|left|right|bottom"
+ top="0"
left="0"
- name="picture_item"
- top="80"
- width="245">
+ height="100"
+ width="265"
+ name="picture_item">
<texture_picker
allow_no_texture="true"
default_image_name="None"
enabled="false"
follows="left|top"
- height="80"
+ height="100"
+ width="100"
layout="topleft"
- left="5"
+ left="10"
+ bottom_pad="10"
mouse_opaque="false"
name="picture"
tab_stop="false"
- top="7"
- width="70" />
+ top="10" />
<text
follows="top|left|right"
- font="SansSerif"
- height="20"
+ font="SansSerifTiny"
+ height="16"
layout="topleft"
- left="80"
+ left="120"
name="picture_name"
- text_color="black"
- top="5"
+ top="10"
+ text_color="white"
use_ellipses="true"
- width="150"/>
+ width="120" />
<text
follows="top|left|right"
- font="SansSerifSmall"
- height="40"
+ font="SansSerifTiny"
+ height="60"
+ width="140"
+ top_pad="0"
layout="topleft"
name="picture_descr"
- text_color="white"
- top="25"
use_ellipses="true"
- width="150"
word_wrap="true" />
<button
follows="top|right"
- height="20"
- image_disabled="navbar_bg_button.tga"
- image_disabled_selected="navbar_bg_button.tga"
- image_overlay="navbar_forward.tga"
- image_selected="navbar_bg_button.tga"
- image_unselected="navbar_bg_button.tga"
+ height="16"
+ image_selected="Info"
+ image_unselected="Info"
layout="topleft"
name="info_chevron"
picture_style="true"
- right="-5"
tab_stop="false"
- top="28"
- width="20" />
+ top="6"
+ left="233"
+ width="16" />
</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_picks.xml b/indra/newview/skins/default/xui/en/panel_picks.xml
index 5b66026f48..2be9f900da 100644
--- a/indra/newview/skins/default/xui/en/panel_picks.xml
+++ b/indra/newview/skins/default/xui/en/panel_picks.xml
@@ -2,78 +2,64 @@
<panel
bevel_style="in"
follows="left|top|right|bottom"
- height="625"
- label="Picks"
+ height="570"
+ width="295"
+ border="false"
layout="topleft"
left="0"
- name="panel_picks"
top="0"
- width="305">
- <!--<text
- type="string"
- length="1"
- follows="top|left|right"
- font="SansSerifHugeBold"
- height="50"
+ label="Picks"
+ name="panel_picks">
+ <scroll_container
+ color="DkGray2"
+ follows="left|top|right|bottom"
+ height="570"
+ width="265"
layout="topleft"
- left="10"
- name="pick_title"
- text_color="white"
- top="10"
- width="270"
- word_wrap="true">
- [NAME]&apos;s favorite places in Second Life...
- </text>-->
- <!-- below is a special title shown for the Agent on the "Picks" tab-->
+ left="5"
+ top_pad="0"
+ bevel_style="in"
+ opaque="true"
+ name="profile_scroll"
+ reserve_scroll_corner="false">
+<!-- below is a special title shown for the Agent on the "Picks" tab
<text
type="string"
length="1"
follows="top"
font="SansSerifBold"
height="35"
+ width="250"
layout="topleft"
left="10"
name="pick_title_agent"
text_color="white"
- top="10"
- visible="false"
- width="270"
+ top_pad="25"
+ visible="false"
word_wrap="true">
Tell everyone about your favorite Second Life places...
- </text>
- <scroll_container
- follows="left|top|right|bottom"
- height="495"
- layout="topleft"
- left="8"
- name="profile_scroll"
- opaque="true"
- color="DkGray2"
- reserve_scroll_corner="false"
- top_pad="0"
- width="260">
+ </text>-->
<panel
- bevel_style="in"
- height="40"
+ height="115"
+ width="265"
layout="topleft"
left="0"
name="back_panel"
- top="0"
- width="260" />
+ top="0" />
</scroll_container>
- <panel
+ <panel
background_visible="true"
- bevel_style="in"
+ bevel_style="none"
enabled="false"
follows="left|right|bottom"
- height="25"
+ height="30"
label="bottom_panel"
layout="topleft"
- left="8"
+ left="0"
name="edit_panel"
visible="false"
top_pad="0"
- width="260">
+ width="280">
<button
enabled="false"
follows="bottom|left"
@@ -123,29 +109,18 @@
<panel
follows="bottom|left"
height="30"
+ width="280"
layout="topleft"
- left="8"
- name="buttons_cucks"
- bottom="625"
- width="280">
- <button
- follows="bottom|left"
- font="SansSerifSmallBold"
- height="25"
- label="Info"
- layout="topleft"
- left="0"
- name="info_btn"
- enabled="false"
- top="0"
- width="60" />
+ left="10"
+ top_pad="5"
+ name="buttons_cucks">
<button
follows="bottom|left"
font="SansSerifSmallBold"
height="25"
label="Teleport"
layout="topleft"
- left_pad="0"
+ left="0"
name="teleport_btn"
enabled="false"
top="0"
@@ -161,16 +136,5 @@
enabled="false"
top="0"
width="105" />
- <button
- enabled="false"
- follows="bottom|right"
- font="SansSerifSmallBold"
- height="25"
- label="Verb"
- layout="topleft"
- left_pad="0"
- name="verb_btn"
- top="0"
- width="60" />
</panel>
</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 13efa7bcff..c154c5d21e 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
@@ -13,24 +13,15 @@
<!-- ADVANCED -->
- <check_box
- control_name="SmallAvatarNames"
- height="16"
- initial_value="true"
- label="Small Avatar Names"
- layout="topleft"
- left_delta="30"
- name="small_avatar_names_checkbox"
- top="20"
- width="200" />
+
<check_box
control_name="ArrowKeysMoveAvatar"
height="16"
label="Arrow keys always move avatar when chatting"
layout="topleft"
- left_delta="0"
+ left_delta="30"
name="arrow_keys_move_avatar_check"
- top_pad="10"
+ top="20"
width="237" />
<text
type="string"
@@ -253,6 +244,17 @@
name="first_person_avatar_visible"
top_delta="0"
width="256" />
+
+ <check_box
+ control_name="UseChatBubbles"
+ height="16"
+ label="Show chat bubbles"
+ layout="topleft"
+ left="30"
+ name="bubble_text_chat"
+ top_pad="5"
+ width="400" />
+
</panel> \ No newline at end of file
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
index 89d96b015f..f4696152f9 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
@@ -278,15 +278,6 @@
top_pad="40"
width="400" />
<check_box
- control_name="UseChatBubbles"
- height="16"
- label="Show chat bubbles"
- layout="topleft"
- left_delta="0"
- name="bubble_text_chat"
- top_pad="5"
- width="400" />
- <check_box
enabled="false"
height="16"
label="Email me IMs when I'm offline"
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 2d42757150..95d8d2ce2a 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_general.xml
@@ -263,13 +263,23 @@
name="show_my_name_checkbox"
top_pad="5"
width="300" />
+ <check_box
+ control_name="SmallAvatarNames"
+ height="16"
+ initial_value="true"
+ label="Small name tags"
+ layout="topleft"
+ left_delta="175"
+ name="small_avatar_names_checkbox"
+ top_delta="0"
+ width="200" />
<check_box
enabled_control="AvatarNameTagMode"
control_name="RenderShowGroupTitleAll"
height="16"
label="Show group titles"
layout="topleft"
- left_delta="0"
+ left_delta="-175"
name="show_all_title_checkbox"
top_pad="5"
width="300" />
diff --git a/indra/newview/skins/default/xui/en/panel_profile.xml b/indra/newview/skins/default/xui/en/panel_profile.xml
index 2b21c05283..7d2f76da5e 100644
--- a/indra/newview/skins/default/xui/en/panel_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile.xml
@@ -2,21 +2,22 @@
<panel
bevel_style="in"
follows="left|top|right|bottom"
- height="625"
- label="Profile"
+ height="570"
+ width="295"
+ border="false"
layout="topleft"
- left="10"
+ left="0"
+ top="0"
+ label="Profile"
mouse_opaque="false"
- name="panel_profile"
- top="10"
- width="305">
+ name="panel_profile">
<panel.string
name="CaptionTextAcctInfo">
[ACCTTYPE] [PAYMENTINFO] [AGEVERIFICATION]
</panel.string>
<panel.string
name="AcctTypeResident">
- Resident.
+ Resident
</panel.string>
<panel.string
name="AcctTypeTrial">
@@ -70,51 +71,41 @@
color="DkGray2"
follows="left|top|right|bottom"
height="570"
+ width="265"
layout="topleft"
- left="8"
- name="profile_scroll"
+ left="5"
+ top_pad="0"
+ border="false"
opaque="true"
- reserve_scroll_corner="false"
- width="260">
+ name="profile_scroll"
+ reserve_scroll_corner="false">
<panel
- height="680"
+ height="300"
layout="topleft"
left="0"
top="0"
- width="280">
- <text
- type="string"
- follows="top|left|right"
- font="SansSerifHugeBold"
- height="20"
- layout="topleft"
- left="9"
- name="user_name"
- text_color="white"
- top="0"
- mouse_opaque="true"
- width="250">
- (Loading...)
- </text>
+ bevel_style="in"
+ width="265">
<panel
follows="left|top"
height="100"
layout="topleft"
left="10"
+ bevel_style="in"
name="second_life_image_panel"
top="20"
- width="250">
+ width="230">
<texture_picker
allow_no_texture="true"
default_image_name="None"
enabled="false"
follows="top|left"
- height="100"
+ height="125"
layout="topleft"
left="0"
name="2nd_life_pic"
top="0"
- width="100" />
+ width="125" />
<text
type="string"
follows="left|top"
@@ -130,12 +121,12 @@
</text>
<text
type="string"
- top_pad="4"
+ left_pad="10"
+ top_pad="5"
follows="left|top|right"
font="SansSerifSmall"
- height="75"
+ height="125"
layout="topleft"
- left_delta="0"
name="sl_description_edit"
text_color="LtGray"
width="125"
@@ -147,7 +138,7 @@
follows="left|top"
height="100"
layout="topleft"
- left="10"
+ left="10"
name="first_life_image_panel"
top_pad="20"
width="125">
@@ -156,12 +147,12 @@
default_image_name="None"
enabled="false"
follows="top|left"
- height="100"
+ height="125"
layout="topleft"
left="0"
name="real_world_pic"
top_pad="0"
- width="100" />
+ width="125" />
<text
type="string"
follows="left|top"
@@ -179,9 +170,9 @@
type="string"
follows="left|top|right"
font="SansSerifSmall"
- height="45"
+ height="125"
layout="topleft"
- left_delta="0"
+ left_pad="10"
top_pad="10"
name="fl_description_edit"
text_color="LtGray"
@@ -192,59 +183,15 @@
</panel>
<text
type="string"
- follows="left|top"
- font="SansSerifBold"
- height="15"
- layout="topleft"
- halign="right"
- left="10"
- name="title_groups_text"
- text_color="white"
- top_pad="20"
- width="100">
- Groups:
- </text>
- <text
- type="string"
follows="left|top|right"
font="SansSerifSmall"
- height="45"
- layout="topleft"
- left_pad="10"
- top_delta="0"
- name="sl_groups"
- text_color="LtGray"
- width="125"
- word_wrap="true">
- Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum.
- </text>
- <text
- type="string"
- follows="left|top"
- font="SansSerifBold"
height="15"
- halign="right"
- layout="topleft"
- left="10"
- name="title_homepage_text"
- text_color="white"
top_pad="20"
- width="100">
- Homepage:
- </text>
- <text
- type="string"
- follows="left|top|right"
- font="SansSerifSmall"
- font.style="UNDERLINE"
- font_shadow="hard"
- height="15"
- top_delta="0"
layout="topleft"
- left_pad="10"
+ left="10"
name="homepage_edit"
- text_color="0.2 0.2 1 1"
- width="125">
+ text_color="HTMLLinkColor"
+ width="280">
TODO
</text>
<text
@@ -287,7 +234,7 @@
name="title_acc_status_text"
text_color="white"
width="100">
- Account status:
+ Status:
</text>
<text
type="string"
@@ -343,38 +290,61 @@
type="string"
follows="top|right"
font="SansSerifSmall"
- font.style="UNDERLINE"
- font_shadow="hard"
height="15"
layout="topleft"
left_delta="0"
name="partner_edit_link"
- text_color="0.2 0.2 1 1"
+ text_color="HTMLLinkColor"
top_delta="15"
width="40">
Edit
</text>
</panel>
-
- <panel
+ <text
+ type="string"
+ follows="left|top"
+ font="SansSerifBold"
+ height="15"
+ layout="topleft"
+ halign="right"
+ left="10"
+ name="title_groups_text"
+ text_color="white"
+ top_pad="20"
+ width="100">
+ Groups:
+ </text>
+ <text
+ type="string"
+ follows="left|top|right|bottom"
+ font="SansSerifSmall"
+ height="120"
+ layout="topleft"
+ left_pad="10"
+ top_delta="0"
+ name="sl_groups"
+ text_color="LtGray"
+ width="125"
+ word_wrap="true">
+ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum.
+ </text>
+ <!--panel
follows="left|top|right"
height="15"
layout="topleft"
left="50"
- top_pad="40"
+ top_pad="30"
name="account_actions_panel"
width="200">
<text
type="string"
follows="left|top"
font="SansSerif"
- font.style="UNDERLINE"
- font_shadow="hard"
height="15"
layout="topleft"
left="0"
name="payment_update_link"
- text_color="0.2 0.2 1 1"
+ text_color="HTMLLinkColor"
top="0"
width="100">
Update
@@ -383,21 +353,19 @@
type="string"
follows="left|top"
font="SansSerif"
- font.style="UNDERLINE"
- font_shadow="hard"
height="15"
layout="topleft"
left="70"
name="my_account_link"
- text_color="0.2 0.2 1 1"
+ text_color="HTMLLinkColor"
top="0"
width="80">
My Account
</text>
- </panel>
-
-
-
+ </panel-->
+
+
+
<!--
<panel
follows="left|top|right"
@@ -431,14 +399,14 @@
TBD
</text>
</panel> -->
- <panel
+ <!--panel
follows="left|top|right"
height="80"
layout="topleft"
left="0"
name="status_me_panel"
top_pad="20"
- width="250">
+ width="125">
<text
type="string"
follows="left|top"
@@ -499,25 +467,25 @@
name="status_me_message_edit"
select_on_focus="true"
text_color="0.5 0.5 0.5 1"
- width="250">
+ width="230">
Type a message about what you&apos;re doing in SL!
</line_editor>
+ </panel-->
+
+
+
+
</panel>
-
-
-
-
- </panel>
-
+
</scroll_container>
<panel
- bottom="625"
follows="bottom|left"
height="30"
+ width="280"
layout="topleft"
- left="8"
- name="profile_buttons_panel"
- width="280">
+ left="10"
+ top_pad="5"
+ name="profile_buttons_panel">
<button
follows="bottom|left"
font="SansSerifSmallBold"
@@ -560,7 +528,7 @@
name="teleport"
top="0"
width="75" />
- <button
+ <!-- <button
enabled="false"
follows="bottom|left"
font="SansSerifSmallBold"
@@ -570,17 +538,17 @@
left_pad="0"
name="share"
top="0"
- width="60" />
- </panel>
+ width="60" />-->
+ </panel>
<panel
- bottom="625"
follows="bottom|left"
height="30"
+ width="280"
layout="topleft"
- left="8"
- name="profile_me_buttons_panel"
+ left="10"
+ top_pad="5"
visible="false"
- width="345">
+ name="profile_me_buttons_panel">
<button
follows="bottom|left"
font="SansSerifSmallBold"
@@ -601,5 +569,5 @@
name="edit_appearance_btn"
top="0"
width="130" />
- </panel>
+ </panel>
</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_profile_view.xml b/indra/newview/skins/default/xui/en/panel_profile_view.xml
index 2466480d16..a14d8bbc6b 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_view.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_view.xml
@@ -2,63 +2,76 @@
<panel
background_visible="true"
follows="left|top|right|bottom"
- height="660"
+ width="305"
+ height="650"
label="Profile"
+ bevel_style="in"
layout="topleft"
left="0"
name="panel_target_profile"
- top="0"
- width="250">
- <button
- layout="topleft"
- name="back"
- left="5"
- top="5"
- width="20"
- height="20"
- label=""
- tab_stop="false"
- follows="top|left"
- image_selected="navbar_bg_button.tga"
- image_unselected="navbar_bg_button.tga"
- image_overlay="navbar_back.tga"/>
- <text
- layout="topleft"
- top="0"
- left_pad="15"
- width="125"
- height="20"
- font="SansSerifHugeBold"
- text_color="white"
+ top="0">
+ <text
+ layout="topleft"
+ top="0"
+ left="10"
+ width="250"
+ height="20"
+ font="SansSerifHugeBold"
+ text_color="white"
follows="top|left|right"
- mouse_opaque="true"
+ mouse_opaque="true"
name="user_name">(Loading...)</text>
+ <text
+ layout="topleft"
+ width="100"
+ height="16"
+ left="10"
+ top_pad="5"
+ font="SansSerifTiny"
+ text_color="LtGray_50"
+ follows="top|left"
+ mouse_opaque="true"
+ name="status">Online</text>
+ <button
+ layout="topleft"
+ name="back"
+ right="-10"
+ top="0"
+ width="25"
+ height="25"
+ label=""
+ tab_stop="false"
+ follows="top|right"
+ image_selected=""
+ image_unselected=""
+ image_overlay="BackArrow_Off" />
<tab_container
follows="left|top|right|bottom"
- height="625"
+ height="550"
+ width="306"
+ tab_min_width="75"
layout="topleft"
- left="0"
+ left="10"
name="tabs"
tab_position="top"
- top="35"
- width="280">
+ top_pad="20">
<panel
class="panel_profile"
filename="panel_profile.xml"
label="Profile"
layout="topleft"
- name="panel_profile"/>
+ name="panel_profile" />
<panel
class="panel_picks"
filename="panel_picks.xml"
label="Picks"
layout="topleft"
- name="panel_picks"/>
+ name="panel_picks" />
<panel
class="panel_notes"
filename="panel_notes.xml"
- label="Notes"
+ label="Notes &amp; Privacy"
layout="topleft"
- name="panel_notes"/>
+ name="panel_notes" />
</tab_container>
</panel>
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 9bf401d817..82b7e02aeb 100644
--- a/indra/newview/skins/default/xui/en/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_status_bar.xml
@@ -35,6 +35,10 @@
name="timeTooltip">
[weekday, datetime, slt], [day, datetime, slt] [month, datetime, slt] [year, datetime, slt]
</panel.string>
+ <panel.string
+ name="buycurrencylabel">
+ L$ [AMT]
+ </panel.string>
<button
auto_resize="true"
follows="right|bottom"
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index bc364687e9..fb3d3b4dea 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -733,7 +733,195 @@ If you continue to receive this message, contact customer support.
If you continue to receive this message, contact customer support.
</string>
- <!-- Group Information -->
-
-
+ <!-- Avatar Shape Information -->
+ <string name="Attached Earlobes">Attached Earlobes</string>
+ <string name="Arm Length">Arm Length</string>
+ <string name="Back Bangs Down">Back Bangs Down</string>
+ <string name="Back Bangs Up">Back Bangs Up</string>
+ <string name="Back Hair Down">Back Hair Down</string>
+ <string name="Back Hair Up">Back Hair Up</string>
+ <string name="Belly Size">Belly Size</string>
+ <string name="Blonde Hair">Blonde Hair</string>
+ <string name="Big Eyeball">Big Eyeball</string>
+ <string name="Big Hair Back">Big Hair Back</string>
+ <string name="Big Hair Front">Big Hair Front</string>
+ <string name="Big Hair Top">Big Hair Top</string>
+ <string name="Body Fat">Body Fat</string>
+ <string name="Body Thickness">Body Thickness</string>
+ <string name="Breast Buoyancy">Breast Buoyancy</string>
+ <string name="Breast Cleavage">Breast Cleavage</string>
+ <string name="Breast Size">Breast Size</string>
+ <string name="Bridge Width">Bridge Width</string>
+ <string name="Brow Size">Brow Size</string>
+ <string name="Butt Size">Butt Size</string>
+ <string name="Cheek Bones">Cheek Bones</string>
+ <string name="Chest Size">Chest Size</string>
+ <string name="Chin Angle">Chin Angle</string>
+ <string name="Chin Cleft">Chin Cleft</string>
+ <string name="Chin Depth">Chin Depth</string>
+ <string name="Chin-Neck">Chin-Neck</string>
+ <string name="Collar Back">Collar Back</string>
+ <string name="Collar Front">Collar Front</string>
+ <string name="Crooked Nose">Crooked Nose</string>
+ <string name="Cuff Flare">Cuff Flare</string>
+ <string name="Ear Angle">Ear Angle</string>
+ <string name="Ear Size">Ear Size</string>
+ <string name="Ear Tips">Ear Tips</string>
+ <string name="Egg Head">Egg Head</string>
+ <string name="Eye Bags">Eye Bags</string>
+ <string name="Eye Color">Eye Color</string>
+ <string name="Eye Depth">Eye Depth</string>
+ <string name="Eye Lightness">Eye Lightness</string>
+ <string name="Eye Opening">Eye Opening</string>
+ <string name="Eye Pop">Eye Pop</string>
+ <string name="Eye Size">Eye Size</string>
+ <string name="Eye Spacing">Eye Spacing</string>
+ <string name="Eyeball Size">Eyeball Size</string>
+ <string name="Eyebrow Arc">Eyebrow Arc</string>
+ <string name="Eyebrow Height">Eyebrow Height</string>
+ <string name="Eyebrow Points">Eyebrow Points</string>
+ <string name="Eyelash Length">Eyelash Length</string>
+ <string name="Eyeliner">Eyeliner</string>
+ <string name="Eyeliner Color">Eyeliner Color</string>
+ <string name="Face Shear">Face Shear</string>
+ <string name="Facial Definitionr">Facial Definition</string>
+ <string name="Fat Head">Fat Head</string>
+ <string name="Fat Lower Lip">Fat Lower Lip</string>
+ <string name="Fat Torso">Fat Torso</string>
+ <string name="Fat Upper Lip">Fat Upper Lip</string>
+ <string name="Foot Size">Foot Size</string>
+ <string name="Freckles">Freckles</string>
+ <string name="Front Bangs Down">Front Bangs Down</string>
+ <string name="Front Bangs Up">Front Bangs Up</string>
+ <string name="Front Hair Down">Front Hair Down</string>
+ <string name="Front Hair Up">Front Hair Up</string>
+ <string name="Forehead Angle">Forehead Angle</string>
+ <string name="Full Hair Sides">Full Hair Sides</string>
+ <string name="Glove Fingers">Glove Fingers</string>
+ <string name="Glove Length">Glove Length</string>
+ <string name="Hair Thickess">Hair Thickess</string>
+ <string name="Hair Tilted Left">Hair Tilted Left</string>
+ <string name="Hair Tilted Right">Hair Tilted Right</string>
+ <string name="Hair Volume">Hair Volume</string>
+ <string name="Hand Size">Hand Size</string>
+ <string name="Head Length">Head Length</string>
+ <string name="Head Shape">Head Shape</string>
+ <string name="Head Size">Head Size</string>
+ <string name="Head Stretch">Head Stretch</string>
+ <string name="Heel Height">Heel Height</string>
+ <string name="Heel Shape">Heel Shape</string>
+ <string name="Height">Height</string>
+ <string name="Hip Width">Hip Width</string>
+ <string name="Hip Length">Hip Length</string>
+ <string name="Inner Eye Corner">Inner Eye Corner</string>
+ <string name="Jacket Length">Jacket Length</string>
+ <string name="Jacket Wrinkles">Jacket Wrinkles</string>
+ <string name="Jowls">Jowls</string>
+ <string name="Jaw Angle">Jaw Angle</string>
+ <string name="Jaw Jut">Jaw Jut</string>
+ <string name="Jaw Shape">Jaw Shape</string>
+ <string name="Knee Angle">Knee Angle</string>
+ <string name="Left Part">Left Part</string>
+ <string name="Leg Muscles">Leg Muscles</string>
+ <string name="Leg Length">Leg Length</string>
+ <string name="Lip Cleft">Lip Cleft</string>
+ <string name="Lip Cleft Depth">Lip Cleft Depth</string>
+ <string name="Lip Fullness">Lip Fullness</string>
+ <string name="Lip Pinkness">Lip Pinkness</string>
+ <string name="Lip Ratio">Lip Ratio</string>
+ <string name="Lip Thickness">Lip Thickness</string>
+ <string name="Lip Width">Lip Width</string>
+ <string name="Longcuffs">Longcuffs</string>
+ <string name="Love Handles">Love Handles</string>
+ <string name="Lower Bridge">Lower Bridge</string>
+ <string name="Lower Cheeks">Lower Cheeks</string>
+ <string name="Middle Part">Middle Part</string>
+ <string name="Mouth Corner">Mouth Corner</string>
+ <string name="Mouth Position">Mouth Position</string>
+ <string name="Nail Polish">Nail Polish</string>
+ <string name="Nail Polish Color">Nail Polish Color</string>
+ <string name="Neck Length">Neck Length</string>
+ <string name="Neck Thickness">Neck Thickness</string>
+ <string name="Nose Size">Nose Size</string>
+ <string name="Nose Thickness">Nose Thickness</string>
+ <string name="Nose Tip Angle">Nose Tip Angle</string>
+ <string name="Nose Tip Shape">Nose Tip Shape</string>
+ <string name="Nose Width">Nose Width</string>
+ <string name="Nostril Division">Nostril Division</string>
+ <string name="Nostril Width">Nostril Width</string>
+ <string name="Open Front">Open Front</string>
+ <string name="Outer Eye Corner">Outer Eye Corner</string>
+ <string name="Outer Shadow">Outer Shadow</string>
+ <string name="Out Shdw Opacity">Out Shdw Opacity</string>
+ <string name="Out Shdw Color">Out Shdw Color</string>
+ <string name="Package">Package</string>
+ <string name="Pants Crotch">Pants Crotch</string>
+ <string name="Pants Fit">Pants Fit</string>
+ <string name="Pants Length">Pants Length</string>
+ <string name="Pants Waist">Pants Waist</string>
+ <string name="Pants Wrinkles">Pants Wrinkles</string>
+ <string name="Part Bangs">Part Bangs</string>
+ <string name="Pectorals">Pectorals</string>
+ <string name="Platform Height">Platform Height</string>
+ <string name="Platform Width">Platform Width</string>
+ <string name="Pigment">Pigment</string>
+ <string name="Puffy Eyelids">Puffy Eyelids</string>
+ <string name="Rainbow Color">Rainbow Color</string>
+ <string name="Red Hair">Red Hair</string>
+ <string name="Right Part">Right Part</string>
+ <string name="Round Forehead">Round Forehead</string>
+ <string name="Rosy Complexion">Rosy Complexion</string>
+ <string name="Ruddiness">Ruddiness</string>
+ <string name="Rumpled Hair">Rumpled Hair</string>
+ <string name="Saddle Bags">Saddle Bags</string>
+ <string name="Scrawny Leg">Scrawny Leg</string>
+ <string name="Shear Back">Shear Back</string>
+ <string name="Shear Face">Shear Face</string>
+ <string name="Shear Front">Shear Front</string>
+ <string name="Shift Mouth">Shift Mouth</string>
+ <string name="Shirt Bottom">Shirt Bottom</string>
+ <string name="Shirt Fit">Shirt Fit</string>
+ <string name="Shirt Wrinkles">Shirt Wrinkles</string>
+ <string name="Shoe Height">Shoe Height</string>
+ <string name="Shoulders">Shoulders</string>
+ <string name="Side Bangs Down">Side Bangs Down</string>
+ <string name="Side Bangs Up">Side Bangs Up</string>
+ <string name="Sides Hair Down">Sides Hair Down</string>
+ <string name="Sides Hair Up">Sides Hair Up</string>
+ <string name="Skirt Fit">Skirt Fit</string>
+ <string name="Skirt Length">Skirt Length</string>
+ <string name="Slanted Forehead">Slanted Forehead</string>
+ <string name="Sleeve Length">Sleeve Length</string>
+ <string name="Sleeve Looseness">Sleeve Looseness</string>
+ <string name="Slit Back">Slit Back</string>
+ <string name="Slit Front">Slit Front</string>
+ <string name="Slit Left">Slit Left</string>
+ <string name="Slit Right">Slit Right</string>
+ <string name="Socks Length">Socks Length</string>
+ <string name="Spiked Hair">Spiked Hair</string>
+ <string name="Squash/Stretch Head">Squash/Stretch Head</string>
+ <string name="Swept Back Hair">Swept Back Hair</string>
+ <string name="Swept Forward Hair">Swept Forward Hair</string>
+ <string name="Taper Back">Taper Back</string>
+ <string name="Taper Front">Taper Front</string>
+ <string name="Toe Shape">Toe Shape</string>
+ <string name="Toe Thickness">Toe Thickness</string>
+ <string name="Toe Length">Toe Length</string>
+ <string name="Torso Length">Torso Length</string>
+ <string name="Torso Muscles">Torso Muscles</string>
+ <string name="Torso Scrawny">Torso Scrawny</string>
+ <string name="Upper Bridge">Upper Bridge</string>
+ <string name="Upper Cheeks">Upper Cheeks</string>
+ <string name="Upper Chin Cleft">Upper Chin Cleft</string>
+ <string name="Upper Eyelid Fold">Upper Eyelid Fold</string>
+ <string name="Waist Height">Waist Height</string>
+ <string name="White Hair">White Hair</string>
+ <string name="big belly skirt">big belly skirt</string>
+ <string name="bigbutt skirt">bigbutt skirt</string>
+ <string name="bustle skirt">bustle skirt</string>
+ <string name="legs skirt">legs skirt</string>
+ <string name="loose skirt">loose skirt</string>
+ <string name="poofy skirt">poofy skirt</string>
+ <string name="tight skirt">tight skirt</string>
+ <string name="wrinkles">wrinkles</string>
</strings>
diff --git a/indra/newview/skins/default/xui/en/widgets/check_box.xml b/indra/newview/skins/default/xui/en/widgets/check_box.xml
index 97060fb161..bbb5e9b56a 100644
--- a/indra/newview/skins/default/xui/en/widgets/check_box.xml
+++ b/indra/newview/skins/default/xui/en/widgets/check_box.xml
@@ -13,5 +13,7 @@
image_unselected="Checkbox_Off"
image_selected="Checkbox_On"
image_disabled="Checkbox_Off_Disabled"
- image_disabled_selected="Checkbox_On_Disabled" />
+ image_disabled_selected="Checkbox_On_Disabled"
+ image_pressed="Checkbox_Press"
+ image_pressed_selected="Checkbox_On_Press"/>
</check_box>
diff --git a/indra/newview/skins/default/xui/en/widgets/radio_item.xml b/indra/newview/skins/default/xui/en/widgets/radio_item.xml
index 281a55d5e2..dd848f3acd 100644
--- a/indra/newview/skins/default/xui/en/widgets/radio_item.xml
+++ b/indra/newview/skins/default/xui/en/widgets/radio_item.xml
@@ -5,6 +5,8 @@
image_unselected="RadioButton_Off"
image_selected="RadioButton_On"
image_disabled="RadioButton_Disabled"
- image_disabled_selected="RadioButton_On_Disabled"/>
+ image_disabled_selected="RadioButton_On_Disabled"
+ image_pressed="RadioButton_Press"
+ image_pressed_selected="RadioButton_On_Press"/>
</radio_item>
diff --git a/indra/newview/skins/default/xui/en/widgets/slider_bar.xml b/indra/newview/skins/default/xui/en/widgets/slider_bar.xml
index b33acf81cc..bc1ca339a2 100644
--- a/indra/newview/skins/default/xui/en/widgets/slider_bar.xml
+++ b/indra/newview/skins/default/xui/en/widgets/slider_bar.xml
@@ -3,5 +3,7 @@
thumb_outline_color="SliderThumbOutlineColor"
thumb_center_color="SliderThumbCenterColor"
thumb_image="SliderThumb_Off"
+ thumb_image_pressed="SliderThumb_Press"
+ thumb_image_disabled="SliderThumb_Disabled"
track_image="SliderTrack_Horiz"
track_highlight_image="SliderTrack_Horiz" />