diff options
26 files changed, 688 insertions, 759 deletions
diff --git a/indra/llui/llmenugl.cpp b/indra/llui/llmenugl.cpp index f8935d03ac..907f2352a0 100644 --- a/indra/llui/llmenugl.cpp +++ b/indra/llui/llmenugl.cpp @@ -590,12 +590,13 @@ BOOL LLMenuItemSeparatorGL::handleMouseDown(S32 x, S32 y, MASK mask) LLMenuGL* parent_menu = getMenu(); if (y > getRect().getHeight() / 2) { - LLView* prev_menu_item = parent_menu->findPrevSibling(this); + // the menu items are in the child list in bottom up order + LLView* prev_menu_item = parent_menu->findNextSibling(this); return prev_menu_item ? prev_menu_item->handleMouseDown(x, prev_menu_item->getRect().getHeight(), mask) : FALSE; } else { - LLView* next_menu_item = parent_menu->findNextSibling(this); + LLView* next_menu_item = parent_menu->findPrevSibling(this); return next_menu_item ? next_menu_item->handleMouseDown(x, 0, mask) : FALSE; } } @@ -605,12 +606,12 @@ BOOL LLMenuItemSeparatorGL::handleMouseUp(S32 x, S32 y, MASK mask) LLMenuGL* parent_menu = getMenu(); if (y > getRect().getHeight() / 2) { - LLView* prev_menu_item = parent_menu->findPrevSibling(this); + LLView* prev_menu_item = parent_menu->findNextSibling(this); return prev_menu_item ? prev_menu_item->handleMouseUp(x, prev_menu_item->getRect().getHeight(), mask) : FALSE; } else { - LLView* next_menu_item = parent_menu->findNextSibling(this); + LLView* next_menu_item = parent_menu->findPrevSibling(this); return next_menu_item ? next_menu_item->handleMouseUp(x, 0, mask) : FALSE; } } diff --git a/indra/llui/llscrollcontainer.cpp b/indra/llui/llscrollcontainer.cpp index 53c5a8d07d..f6caed4617 100644 --- a/indra/llui/llscrollcontainer.cpp +++ b/indra/llui/llscrollcontainer.cpp @@ -111,7 +111,7 @@ LLScrollContainer::LLScrollContainer(const LLScrollContainer::Params& p) LLView::addChild( mBorder ); mInnerRect.set( 0, getRect().getHeight(), getRect().getWidth(), 0 ); - mInnerRect.stretch( -mBorder->getBorderWidth() ); + mInnerRect.stretch( -getBorderWidth() ); LLRect vertical_scroll_rect = mInnerRect; vertical_scroll_rect.mLeft = vertical_scroll_rect.mRight - scrollbar_size; @@ -189,7 +189,7 @@ void LLScrollContainer::reshape(S32 width, S32 height, LLUICtrl::reshape( width, height, called_from_parent ); mInnerRect = getLocalRect(); - mInnerRect.stretch( -mBorder->getBorderWidth() ); + mInnerRect.stretch( -getBorderWidth() ); if (mScrolledView) { @@ -351,9 +351,9 @@ void LLScrollContainer::calcVisibleSize( S32 *visible_width, S32 *visible_height S32 doc_width = doc_rect.getWidth(); S32 doc_height = doc_rect.getHeight(); - S32 border_width = (mBorder->getVisible() ? 2 * mBorder->getBorderWidth() : 0); - *visible_width = getRect().getWidth() - border_width; - *visible_height = getRect().getHeight() - border_width; + S32 border_width = getBorderWidth(); + *visible_width = getRect().getWidth() - 2 * border_width; + *visible_height = getRect().getHeight() - 2 * border_width; *show_v_scrollbar = FALSE; *show_h_scrollbar = FALSE; @@ -499,7 +499,7 @@ void LLScrollContainer::updateScroll() BOOL show_h_scrollbar = FALSE; calcVisibleSize( &visible_width, &visible_height, &show_h_scrollbar, &show_v_scrollbar ); - S32 border_width = mBorder->getBorderWidth(); + S32 border_width = getBorderWidth(); if( show_v_scrollbar ) { if( doc_rect.mTop < getRect().getHeight() - border_width ) @@ -573,6 +573,9 @@ void LLScrollContainer::updateScroll() void LLScrollContainer::setBorderVisible(BOOL b) { mBorder->setVisible( b ); + // Recompute inner rect, as border visibility changes it + mInnerRect = getLocalRect(); + mInnerRect.stretch( -getBorderWidth() ); } LLRect LLScrollContainer::getVisibleContentRect() @@ -593,7 +596,7 @@ LLRect LLScrollContainer::getContentWindowRect() BOOL show_h_scrollbar = FALSE; BOOL show_v_scrollbar = FALSE; calcVisibleSize( &visible_width, &visible_height, &show_h_scrollbar, &show_v_scrollbar ); - S32 border_width = mBorder->getVisible() ? mBorder->getBorderWidth() : 0; + S32 border_width = getBorderWidth(); scroller_view_rect.setOriginAndSize(border_width, show_h_scrollbar ? mScrollbar[HORIZONTAL]->getRect().mTop : border_width, visible_width, @@ -626,7 +629,7 @@ void LLScrollContainer::scrollToShowRect(const LLRect& rect, const LLRect& const rect_to_constrain.mTop - constraint.mTop); // translate from allowable region for lower left corner to upper left corner - allowable_scroll_rect.translate(0, content_window_rect.getHeight() - 1); + allowable_scroll_rect.translate(0, content_window_rect.getHeight()); S32 vert_pos = llclamp(mScrollbar[VERTICAL]->getDocPos(), mScrollbar[VERTICAL]->getDocSize() - allowable_scroll_rect.mTop, // min vertical scroll @@ -674,7 +677,7 @@ void LLScrollContainer::goToBottom() S32 LLScrollContainer::getBorderWidth() const { - if (mBorder) + if (mBorder->getVisible()) { return mBorder->getBorderWidth(); } diff --git a/indra/newview/llfavoritesbar.cpp b/indra/newview/llfavoritesbar.cpp index 8406ddeeca..17b0710813 100644 --- a/indra/newview/llfavoritesbar.cpp +++ b/indra/newview/llfavoritesbar.cpp @@ -355,8 +355,8 @@ struct LLFavoritesSort }; LLFavoritesBarCtrl::Params::Params() -: chevron_button_tool_tip("chevron_button_tool_tip"), - image_drag_indication("image_drag_indication") +: image_drag_indication("image_drag_indication"), + chevron_button("chevron_button") { } @@ -365,7 +365,6 @@ LLFavoritesBarCtrl::LLFavoritesBarCtrl(const LLFavoritesBarCtrl::Params& p) mFont(p.font.isProvided() ? p.font() : LLFontGL::getFontSansSerifSmall()), mPopupMenuHandle(), mInventoryItemsPopupMenuHandle(), - mChevronButtonToolTip(p.chevron_button_tool_tip), mImageDragIndication(p.image_drag_indication), mShowDragMarker(FALSE), mLandingTab(NULL), @@ -381,6 +380,12 @@ LLFavoritesBarCtrl::LLFavoritesBarCtrl(const LLFavoritesBarCtrl::Params& p) boost::bind(&LLFavoritesBarCtrl::enableSelected, this, _2)); gInventory.addObserver(this); + + //make chevron button + LLButton::Params chevron_button_params(p.chevron_button); + chevron_button_params.click_callback.function(boost::bind(&LLFavoritesBarCtrl::showDropDownMenu, this)); + mChevronButton = LLUICtrlFactory::create<LLButton> (chevron_button_params); + addChild(mChevronButton); } LLFavoritesBarCtrl::~LLFavoritesBarCtrl() @@ -653,10 +658,6 @@ void LLFavoritesBarCtrl::updateButtons(U32 bar_width) buttonXMLNode->getAttributeS32("left", buttonHGap); S32 count = mItems.count(); - - const S32 buttonHPad = LLUI::sSettingGroups["config"]->getS32("ButtonHPad"); - const S32 chevron_button_width = mFont->getWidth(">>") + buttonHPad * 2; - S32 buttons_space = bar_width - buttonHGap; S32 first_drop_down_item = count; @@ -670,7 +671,7 @@ void LLFavoritesBarCtrl::updateButtons(U32 bar_width) { // There is no space for all buttons. // Calculating the number of buttons, that are fit with chevron button - buttons_space -= chevron_button_width + buttonHGap; + buttons_space -= mChevronButton->getRect().getWidth() + buttonHGap; while (i >= 0 && buttons_width > buttons_space) { buttons_width -= buttonWidth + buttonHGap; @@ -718,7 +719,7 @@ void LLFavoritesBarCtrl::updateButtons(U32 bar_width) child_list_const_iter_t cur_it = child_it++; LLView* viewp = *cur_it; LLButton* button = dynamic_cast<LLButton*>(viewp); - if (button) + if (button && (button != mChevronButton)) { removeChild(button); delete button; @@ -732,55 +733,15 @@ void LLFavoritesBarCtrl::updateButtons(U32 bar_width) if (mFirstDropDownItem != count) { // Chevron button should stay right aligned - LLView *chevron_button = findChildView(std::string(">>"), FALSE); - if (chevron_button) - { - LLRect rect; - rect.setOriginAndSize(bar_width - chevron_button_width - buttonHGap, 0, chevron_button_width, getRect().getHeight()); - chevron_button->setRect(rect); - chevron_button->setVisible(TRUE); - mChevronRect = rect; - } - else - { - static LLButton::Params default_button_params(LLUICtrlFactory::getDefaultParams<LLButton>()); - std::string flat_icon = "transparent.j2c"; - std::string hover_icon = default_button_params.image_unselected.name; - std::string hover_icon_selected = default_button_params.image_selected.name; - - LLButton::Params bparams; - - LLRect rect; - rect.setOriginAndSize(bar_width - chevron_button_width - buttonHGap, 0, chevron_button_width, getRect().getHeight()); - - bparams.follows.flags (FOLLOWS_LEFT | FOLLOWS_BOTTOM); - bparams.image_unselected.name(flat_icon); - bparams.image_disabled.name(flat_icon); - bparams.image_selected.name(hover_icon_selected); - bparams.image_hover_selected.name(hover_icon_selected); - bparams.image_disabled_selected.name(hover_icon_selected); - bparams.image_hover_unselected.name(hover_icon); - bparams.rect (rect); - bparams.tab_stop(false); - bparams.font(mFont); - bparams.name(">>"); - bparams.label(">>"); - bparams.tool_tip(mChevronButtonToolTip); - bparams.click_callback.function(boost::bind(&LLFavoritesBarCtrl::showDropDownMenu, this)); - - addChildInBack(LLUICtrlFactory::create<LLButton> (bparams)); - - mChevronRect = rect; - } + LLRect rect; + rect.setOriginAndSize(bar_width - mChevronButton->getRect().getWidth() - buttonHGap, 0, mChevronButton->getRect().getWidth(), mChevronButton->getRect().getHeight()); + mChevronButton->setRect(rect); + mChevronButton->setVisible(TRUE); } else { // Hide chevron button if all items are visible on bar - LLView *chevron_button = findChildView(std::string(">>"), FALSE); - if (chevron_button) - { - chevron_button->setVisible(FALSE); - } + mChevronButton->setVisible(FALSE); } } @@ -917,7 +878,7 @@ void LLFavoritesBarCtrl::showDropDownMenu() if (menu->getButtonRect().isEmpty()) { - menu->setButtonRect(mChevronRect, this); + menu->setButtonRect(mChevronButton->getRect(), this); } LLMenuGL::showPopup(this, menu, getRect().getWidth() - menu->getRect().getWidth(), 0); @@ -981,7 +942,7 @@ void LLFavoritesBarCtrl::showDropDownMenu() menu->buildDrawLabels(); menu->updateParent(LLMenuGL::sMenuContainer); - menu->setButtonRect(mChevronRect, this); + menu->setButtonRect(mChevronButton->getRect(), this); LLMenuGL::showPopup(this, menu, getRect().getWidth() - max_width, 0); diff --git a/indra/newview/llfavoritesbar.h b/indra/newview/llfavoritesbar.h index 20a324c67c..b2fe3cc651 100644 --- a/indra/newview/llfavoritesbar.h +++ b/indra/newview/llfavoritesbar.h @@ -33,6 +33,7 @@ #ifndef LL_LLFAVORITESBARCTRL_H #define LL_LLFAVORITESBARCTRL_H +#include "llbutton.h" #include "lluictrl.h" #include "llinventoryobserver.h" @@ -43,8 +44,8 @@ class LLFavoritesBarCtrl : public LLUICtrl, public LLInventoryObserver public: struct Params : public LLInitParam::Block<Params, LLUICtrl::Params> { - Optional<std::string> chevron_button_tool_tip; Optional<LLUIImage*> image_drag_indication; + Optional<LLButton::Params> chevron_button; Params(); }; @@ -105,9 +106,7 @@ protected: item_names_array_t mItemNamesCache; LLUUID mSelectedItemID; - LLRect mChevronRect; - std::string mChevronButtonToolTip; LLUIImage* mImageDragIndication; private: @@ -150,6 +149,7 @@ private: BOOL mShowDragMarker; LLUICtrl* mLandingTab; LLUICtrl* mLastTab; + LLButton* mChevronButton; LLUUID mDragItemId; BOOL mStartDrag; diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp index 5128a7b861..b01ff74e26 100644 --- a/indra/newview/llfloaterpreference.cpp +++ b/indra/newview/llfloaterpreference.cpp @@ -106,7 +106,6 @@ #include "llviewermedia.h" #include "llpluginclassmedia.h" #include "llteleporthistorystorage.h" -#include "llnearbychat.h" #include <boost/regex.hpp> @@ -362,7 +361,7 @@ LLFloaterPreference::LLFloaterPreference(const LLSD& key) BOOL LLFloaterPreference::postBuild() { gSavedSettings.getControl("PlainTextChatHistory")->getSignal()->connect(boost::bind(&LLIMFloater::processChatHistoryStyleUpdate, _2)); - + gSavedSettings.getControl("PlainTextChatHistory")->getSignal()->connect(boost::bind(&LLNearbyChat::processChatHistoryStyleUpdate, _2)); LLTabContainer* tabcontainer = getChild<LLTabContainer>("pref core"); @@ -370,6 +369,10 @@ BOOL LLFloaterPreference::postBuild() tabcontainer->selectFirstTab(); S32 show_avatar_nametag_options = gSavedSettings.getS32("AvatarNameTagMode"); handleNameTagOptionChanged(LLSD(show_avatar_nametag_options)); + + std::string cache_location = gDirUtilp->getExpandedFilename(LL_PATH_CACHE, ""); + childSetText("cache_location", cache_location); + return TRUE; } diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml index d53d2d896c..85cb145dbc 100644 --- a/indra/newview/skins/default/colors.xml +++ b/indra/newview/skins/default/colors.xml @@ -459,7 +459,7 @@ value="0 0.5 0 1" /> <color name="MenuPopupBgColor" - reference="DkGray_66" /> + reference="DkGray2" /> <color name="MultiSliderDisabledThumbColor" reference="Unused?" /> diff --git a/indra/newview/skins/default/textures/icon_event_adult.tga b/indra/newview/skins/default/textures/icon_event_adult.tga Binary files differindex c344fb1e78..f548126e5a 100644 --- a/indra/newview/skins/default/textures/icon_event_adult.tga +++ b/indra/newview/skins/default/textures/icon_event_adult.tga diff --git a/indra/newview/skins/default/textures/icon_top_pick.tga b/indra/newview/skins/default/textures/icon_top_pick.tga Binary files differindex 7fe119a818..0b34882d2f 100644 --- a/indra/newview/skins/default/textures/icon_top_pick.tga +++ b/indra/newview/skins/default/textures/icon_top_pick.tga diff --git a/indra/newview/skins/default/textures/map_avatar_16.tga b/indra/newview/skins/default/textures/map_avatar_16.tga Binary files differindex ce129e3590..f59e9e9193 100644 --- a/indra/newview/skins/default/textures/map_avatar_16.tga +++ b/indra/newview/skins/default/textures/map_avatar_16.tga diff --git a/indra/newview/skins/default/textures/map_avatar_8.tga b/indra/newview/skins/default/textures/map_avatar_8.tga Binary files differindex 28552f2237..8500eadeba 100644 --- a/indra/newview/skins/default/textures/map_avatar_8.tga +++ b/indra/newview/skins/default/textures/map_avatar_8.tga diff --git a/indra/newview/skins/default/textures/map_event.tga b/indra/newview/skins/default/textures/map_event.tga Binary files differindex c229b379a2..2c06d08fd2 100644 --- a/indra/newview/skins/default/textures/map_event.tga +++ b/indra/newview/skins/default/textures/map_event.tga diff --git a/indra/newview/skins/default/textures/map_event_adult.tga b/indra/newview/skins/default/textures/map_event_adult.tga Binary files differindex c344fb1e78..f548126e5a 100644 --- a/indra/newview/skins/default/textures/map_event_adult.tga +++ b/indra/newview/skins/default/textures/map_event_adult.tga diff --git a/indra/newview/skins/default/textures/map_event_mature.tga b/indra/newview/skins/default/textures/map_event_mature.tga Binary files differindex 61c879bc92..71067c0dfd 100644 --- a/indra/newview/skins/default/textures/map_event_mature.tga +++ b/indra/newview/skins/default/textures/map_event_mature.tga diff --git a/indra/newview/skins/default/textures/map_home.tga b/indra/newview/skins/default/textures/map_home.tga Binary files differindex 7478de371a..acaaa3db44 100644 --- a/indra/newview/skins/default/textures/map_home.tga +++ b/indra/newview/skins/default/textures/map_home.tga diff --git a/indra/newview/skins/default/textures/map_infohub.tga b/indra/newview/skins/default/textures/map_infohub.tga Binary files differindex d0134fa5fe..545b8e532c 100644 --- a/indra/newview/skins/default/textures/map_infohub.tga +++ b/indra/newview/skins/default/textures/map_infohub.tga diff --git a/indra/newview/skins/default/textures/map_telehub.tga b/indra/newview/skins/default/textures/map_telehub.tga Binary files differindex ef63a3eb72..545b8e532c 100644 --- a/indra/newview/skins/default/textures/map_telehub.tga +++ b/indra/newview/skins/default/textures/map_telehub.tga diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml index 7703b9f0ab..607b33fbb1 100644 --- a/indra/newview/skins/default/textures/textures.xml +++ b/indra/newview/skins/default/textures/textures.xml @@ -1,19 +1,19 @@ <!-- This file contains metadata about how to load, display, and scale textures for rendering in the UI. -Images do *NOT* have to appear in this file in order to use them as textures in the UI...simply refer +Images do *NOT* have to appear in this file in order to use them as textures in the UI...simply refer to them by filename (relative to textures directory). -NOTE: if you want to reuse an image file with different metadata, simply create a new texture entry +NOTE: if you want to reuse an image file with different metadata, simply create a new texture entry with the same filename but different name <texture name="MyTexture" (mandatory) - this is the name you reference the texture by in XUI. For example, <button image_unselected="MyTexture"/> file_name="images/my_texture.png" (optional) - - this is the path to the actual file asset, relative to the current skins "textures" directory. - If not supplied, the filename will be taken from the texture name itself, "MyTexture" in this case. + - this is the path to the actual file asset, relative to the current skins "textures" directory. + If not supplied, the filename will be taken from the texture name itself, "MyTexture" in this case. NOTE: you need to provide an extension on the filename (".png", ".tga", ".jpg") for us to decode the image properly preload="true" (optional, false by default) - - If true, we will attempt to load the image before displaying any UI. + - If true, we will attempt to load the image before displaying any UI. If false, we will load in the background after initializing the UI. use_mips="true" (currently unused) scale.left="1" @@ -23,8 +23,8 @@ with the same filename but different name - Specifies the segmentation for 9-slice image scaling. Specifically, the pixel offsets from the LOWER LEFT corner that define the region of the image that is stretched to make the whole image fit in the required space. In this example, if the source image is 32x16 pixels, we have defined a center region that starts one pixel up - and to the right from the bottom left corner and extends to 31 pixels right and 15 pixels up from the bottom left - corner. The end result is that the image will keep a 1 pixel border all around while stretching to fit the required + and to the right from the bottom left corner and extends to 31 pixels right and 15 pixels up from the bottom left + corner. The end result is that the image will keep a 1 pixel border all around while stretching to fit the required region. --> @@ -53,9 +53,6 @@ with the same filename but different name <texture name="Arrow_Left" file_name="widgets/Arrow_Left.png" preload="true" /> <texture name="Arrow_Right" file_name="widgets/Arrow_Right.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="Arrow_Small_Up" file_name="widgets/Arrow_Small_Up.png" preload="true" /> <texture name="Arrow_Small_Left" file_name="widgets/Arrow_Small_Left.png" preload="true" /> <texture name="Arrow_Small_Right" file_name="widgets/Arrow_Small_Right.png" preload="true" /> @@ -143,7 +140,6 @@ with the same filename but different name <texture name="DropDown_Over" file_name="widgets/DropDown_Over.png" preload="true" scale.left="2" scale.top="19" scale.right="18" scale.bottom="2" /> <texture name="DropDown_Press" file_name="widgets/DropDown_Press.png" preload="true" scale.left="2" scale.top="19" scale.right="18" scale.bottom="2" /> <texture name="DropDown_Selected" file_name="widgets/DropDown_Selected.png" preload="true" scale.left="2" scale.top="19" scale.right="18" scale.bottom="2" /> - <texture name="DropDown_On" file_name="widgets/DropDown_On.png" preload="true" scale.left="2" scale.top="19" scale.right="18" scale.bottom="2" /> <texture name="DropDown_Off" file_name="widgets/DropDown_Off.png" preload="true" scale.left="2" scale.top="19" scale.right="18" scale.bottom="2" /> <texture name="DropTarget" file_name="widgets/DropTarget.png" preload="false" /> @@ -404,9 +400,12 @@ with the same filename but different name <texture name="ProgressBar" file_name="widgets/ProgressBar.png" preload="true" scale.left="4" scale.top="10" scale.right="48" scale.bottom="2" /> <texture name="ProgressTrack" file_name="widgets/ProgressTrack.png" preload="true" scale.left="4" scale.top="13" scale.right="148" scale.bottom="2" /> + <texture name="PushButton_Disabled" file_name="widgets/PushButton_Disabled.png" preload="true" scale.left="4" scale.top="19" scale.right="28" scale.bottom="4" /> <texture name="PushButton_Off" file_name="widgets/PushButton_Off.png" preload="true" scale.left="4" scale.top="19" scale.right="28" scale.bottom="4" /> + <texture name="PushButton_On" file_name="widgets/PushButton_On.png" preload="true" scale.left="4" scale.top="19" scale.right="28" scale.bottom="4" /> + <texture name="PushButton_On_Selected" file_name="widgets/PushButton_On_Selected.png" preload="true" scale.left="4" scale.top="19" scale.right="28" scale.bottom="4" /> + <texture name="PushButton_On_Disabled" file_name="widgets/PushButton_On_Disabled.png" preload="true" scale.left="4" scale.top="19" scale.right="28" scale.bottom="4" /> <texture name="PushButton_Press" file_name="widgets/PushButton_Press.png" preload="true" scale.left="4" scale.top="19" scale.right="28" scale.bottom="4" /> - <texture name="PushButton_Disabled" file_name="widgets/PushButton_Disabled.png" preload="true" scale.left="4" scale.top="19" scale.right="28" scale.bottom="4" /> <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" /> diff --git a/indra/newview/skins/default/xui/en/floater_aaa.xml b/indra/newview/skins/default/xui/en/floater_aaa.xml index 3f86080160..6ecdd76573 100644 --- a/indra/newview/skins/default/xui/en/floater_aaa.xml +++ b/indra/newview/skins/default/xui/en/floater_aaa.xml @@ -1,36 +1,53 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater - height="400" + legacy_header_height="18" + can_minimize="false" + can_tear_off="false" + can_resize="true" + can_drag_on_left="false" + can_close="true" + can_dock="true" + bevel_style="in" + height="300" layout="topleft" - name="floater_aaa" - can_resize="true" - width="500"> - <string name="bump_parabuild">1</string> - <text - bottom="390" - left="10" - name="right_aligned_text" - width="300" - halign="right" - top_pad="10"> - Right aligned text - </text> - <text - bottom="390" - left="10" - name="centered_text" - width="300" - halign="center" - top_pad="10"> - Centered text - </text> - <text - left="10" - name="left_aligned_text" - width="300" - halign="left" - top_pad="10"> - Left aligned text - </text> - + name="Test Floater" + save_rect="true" + title="TEST FLOATER" + save_dock_state="true" + save_visibility="true" + single_instance="true" + width="320"> + <chat_history + allow_html="true" + bg_readonly_color="ChatHistoryBgColor" + bg_writeable_color="ChatHistoryBgColor" + border_visible="false" + follows="all" + font="SansSerif" + left="1" + top="20" + layout="topleft" + height="260" + name="chat_history" + parse_highlights="true" + text_color="ChatHistoryTextColor" + text_readonly_color="ChatHistoryTextColor" + width="320"> +Really long line that is long enough to wrap once with jyg descenders. +Really long line that is long enough to wrap once with jyg descenders. +Really long line that is long enough to wrap once with jyg descenders. +Really long line that is long enough to wrap once with jyg descenders. +Really long line that is long enough to wrap once with jyg descenders. +Really long line that is long enough to wrap once with jyg descenders. +Really long line that is long enough to wrap once with jyg descenders. +Really long line that is long enough to wrap once with jyg descenders. +Really long line that is long enough to wrap once with jyg descenders. +Really long line that is long enough to wrap once with jyg descenders. +Really long line that is long enough to wrap once with jyg descenders. +Really long line that is long enough to wrap once with jyg descenders. +Really long line that is long enough to wrap once with jyg descenders. +Really long line that is long enough to wrap once with jyg descenders. +Really long line that is long enough to wrap once with jyg descenders. +Really long line that is long enough to wrap once with jyg descenders. + </chat_history> </floater> diff --git a/indra/newview/skins/default/xui/en/floater_test_textbox.xml b/indra/newview/skins/default/xui/en/floater_test_textbox.xml index 310ad13dac..033070607b 100644 --- a/indra/newview/skins/default/xui/en/floater_test_textbox.xml +++ b/indra/newview/skins/default/xui/en/floater_test_textbox.xml @@ -174,6 +174,53 @@ scroll bar word_wrap="true"> Second Life is brought to you by Philip, Tessa, Andrew, Cory, James, Ben, Char, Charlie, Colin, Dan, Daniel, Doug, Eric, Hamlet, Haney, Eve, Hunter, Ian, Jeff, Jennifer, Jim, John, Lee, Mark, Peter, Phoenix, Richard, Robin, Xenon, Steve, Tanya, Eddie, Avi, Frank, Bruce, Aaron, Alice, Bob, Debra, Eileen, Helen, Janet, Louie, Leviathania, Stefan, Ray, Kevin, Tom, Mikeb, MikeT, Burgess, Elena, Tracy, Bill, Todd, Ryan, Zach, Sarah, Nova, Tim, Stephanie, Michael, Evan, Nicolas, Catherine, Rachelle, Dave, Holly, Bub, Kelly, Magellan, Ramzi, Don, Sabin, Jill, Rheya, Jeska, Torley, Kona, Callum, Charity, Ventrella, Jack, Vektor, Iris, Chris, Nicole, Mick, Reuben, Blue, Babbage, Yedwab, Deana, Lauren, Brent, Pathfinder, Chadrick, Altruima, Jesse, Teeny, Monroe, Icculus, David, Tess, Lizzie, Patsy, Isaac, Lawrence, Cyn, Bo, Gia, Annette, Marius, Tbone, Jonathan, Karen, Ginsu, Satoko, Yuko, Makiko, Thomas, Harry, Seth, Alexei, Brian, Guy, Runitai, Ethan, Data, Cornelius, Kenny, Swiss, Zero, Natria, Wendy, Stephen, Teeple, Thumper, Lucy, Dee, Mia, Liana, Warren, Branka, Aura, beez, Milo, Hermia, Red, Thrax, Joe, Sally, Magenta, Mogura, Paul, Jose, Rejean, Henrik, Lexie, Amber, Logan, Xan, Nora, Morpheus, Donovan, Leyla, MichaelFrancis, Beast, Cube, Bucky, Joshua, Stryfe, Harmony, Teresa, Claudia, Walker, Glenn, Fritz, Fordak, June, Cleopetra, Jean, Ivy, Betsy, Roosevelt, Spike, Ken, Which, Tofu, Chiyo, Rob, Zee, dustin, George, Del, Matthew, Cat, Jacqui, Lightfoot, Adrian, Viola, Alfred, Noel, Irfan, Sunil, Yool, Rika, Jane, Xtreme, Frontier, a2, Neo, Siobhan, Yoz, Justin, Elle, Qarl, Benjamin, Isabel, Gulliver, Everett, Christopher, Izzy, Stephany, Garry, Sejong, Sean, Tobin, Iridium, Meta, Anthony, Jeremy, JP, Jake, Maurice, Madhavi, Leopard, Kyle, Joon, Kari, Bert, Belinda, Jon, Kristi, Bridie, Pramod, KJ, Socrates, Maria, Ivan, Aric, Yamasaki, Adreanne, Jay, MitchK, Ceren, Coco, Durl, Jenny, Periapse, Kartic, Storrs, Lotte, Sandy, Rohn, Colossus, Zen, BigPapi, Brad, Pastrami, Kurz, Mani, Neuro, Jaime, MJ, Rowan, Sgt, Elvis, Gecko, Samuel, Sardonyx, Leo, Bryan, Niko, Soft, Poppy, Rachel, Aki, Angelo, Banzai, Alexa, Sue, CeeLo, Bender, CG, Gillian, Pelle, Nick, Echo, Zara, Christine, Shamiran, Emma, Blake, Keiko, Plexus, Joppa, Sidewinder, Erica, Ashlei, Twilight, Kristen, Brett, Q, Enus, Simon, Bevis, Kraft, Kip, Chandler, Ron, LauraP, Ram, KyleJM, Scouse, Prospero, Melissa, Marty, Nat, Hamilton, Kend, Lordan, Jimmy, Kosmo, Seraph, Green, Ekim, Wiggo, JT, Rome, Doris, Miz, Benoc, Whump, Trinity, Patch, Kate, TJ, Bao, Joohwan, Christy, Sofia, Matias, Cogsworth, Johan, Oreh, Cheah, Angela, Brandy, Mango, Lan, Aleks, Gloria, Heidy, Mitchell, Space, Colton, Bambers, Einstein, Maggie, Malbers, Rose, Winnie, Stella, Milton, Rothman, Niall, Marin, Allison, Katie, Dawn, Katt, Dusty, Kalpana, Judy, Andrea, Ambroff, Infinity, Gail, Rico, Raymond, Yi, William, Christa, M, Teagan, Scout, Molly, Dante, Corr, Dynamike, Usi, Kaylee, Vidtuts, Lil, Danica, Sascha, Kelv, Jacob, Nya, Rodney, Brandon, Elsie, Blondin, Grant, Katrin, Nyx, Gabriel, Locklainn, Claire, Devin, Minerva, Monty, Austin, Bradford, Si, Keira, H, Caitlin, Dita, Makai, Jenn, Ann, Meredith, Clare, Joy, Praveen, Cody, Edmund, Ruthe, Sirena, Gayathri, Spider, FJ, Davidoff, Tian, Jennie, Louise, Oskar, Landon, Noelle, Jarv, Ingrid, Al, Sommer, Doc, Aria, Huin, Gray, Lili, Vir, DJ, Yang, T, Simone, Maestro, Scott, Charlene, Quixote, Amanda, Susan, Zed, Anne, Enkidu, Esbee, Joroan, Katelin, Roxie, Tay, Scarlet, Kevin, Johnny, Wolfgang, Andren, Bob, Howard, Merov, Rand, Ray, Michon, Newell, Galen, Dessie, Les and many others. </text_editor> + <text_editor + height="50" + follows="top|left|bottom" + font="Monospace" + left_delta="0" + name="monospace_text_editor" + tool_tip="text editor" + top_pad="10" + width="200"> +Text Editor +with multiple +lines of text +and hence a +scroll bar gjyrrr + </text_editor> + <text_editor + border_visible="true" + height="50" + follows="top|left|bottom" + font="Monospace" + left_delta="0" + name="monospace_text_editor" + tool_tip="text editor" + top_pad="10" + width="200"> +Text Editor +with multiple +lines of text +and hence a +scroll bar gjyrrr + </text_editor> + <text_editor + height="50" + follows="top|left|bottom" + font="SansSerif" + left_delta="0" + name="sansserif_text_editor" + tool_tip="text editor" + top_pad="10" + width="200"> +Text Editor +with multiple +lines of text +and hence a +scroll bar gjyrrr + </text_editor> + <text height="40" follows="top|left|bottom" diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml index a9b4c1b938..e3851de8e7 100644 --- a/indra/newview/skins/default/xui/en/floater_tools.xml +++ b/indra/newview/skins/default/xui/en/floater_tools.xml @@ -2746,6 +2746,7 @@ even though the user gets a free copy. left="10" name="button align" top_pad="5" + tool_tip="Align media texture (must load first)" width="100" /> </panel> </panel> diff --git a/indra/newview/skins/default/xui/en/floater_world_map.xml b/indra/newview/skins/default/xui/en/floater_world_map.xml index e3db0972ec..c0eca91a46 100644 --- a/indra/newview/skins/default/xui/en/floater_world_map.xml +++ b/indra/newview/skins/default/xui/en/floater_world_map.xml @@ -4,7 +4,7 @@ can_resize="true" center_horiz="true" center_vert="true" - height="600" + height="535" layout="topleft" min_height="520" min_width="520" @@ -17,388 +17,493 @@ width="800"> <panel filename="panel_world_map.xml" - follows="left|top|right|bottom" - height="565" + follows="all" + height="500" layout="topleft" - left="15" + left="10" name="objects_mapview" top="25" width="542" /> - <icon - follows="top|right" - height="16" - image_name="map_avatar_16.tga" - layout="topleft" - left="-230" - mouse_opaque="true" - name="self" - top="34" - width="16" /> + <panel + name="layout_panel_1" + height="22" + width="238" + follows="right|top" + top="25" + left_pad="5" + background_visible="true" + bg_alpha_color="DkGray2"> <text + text_color="White" + font="SansSerifLarge" type="string" length="1" follows="top|right" + halign="left" height="16" layout="topleft" - left_pad="4" - name="you_label" - top_delta="0" - width="145"> - You + left="15" + name="events_label" + top="3" + width="215"> + Legend </text> - <icon - follows="top|right" - height="16" - image_name="map_home.tga" + </panel> +<panel + follows="right|top" + height="126" + top_pad="0" + width="238"> +<button + follows="right|top" + height="22" + image_overlay="map_avatar_16.tga" + scale_image="true" + left="4" layout="topleft" - left_delta="50" - mouse_opaque="true" - name="home" - top_delta="0" - width="16" /> - <text + name="Show My Location" + tool_tip="Center map on your avatar's location" + top="6" + width="24" > + <button.commit_callback + function="WMap.ShowAgent" /> + </button> + <text type="string" length="1" follows="top|right" - height="16" + halign="left" + height="13" + top_delta="6" + left_pad="5" layout="topleft" - left_pad="4" - name="home_label" - top_delta="0" - width="145"> - Home + name="person_label" + width="90"> + Me </text> - <icon - color="0.5 0.25 1 1" + <check_box + control_name="MapShowPeople" follows="top|right" height="16" - image_name="legend.tga" layout="topleft" - left="-230" + left="3" + name="people_chk" + top_pad="9" + width="22" /> + <icon + color="0 1 0 1" + follows="top|right" + height="8" + image_name="map_avatar_8.tga" + layout="topleft" + left_pad="3" mouse_opaque="true" - name="square2" - top="54" - width="16" /> - <text + name="person" + top_delta="3" + width="8" /> + <text type="string" length="1" follows="top|right" + halign="left" height="16" + top_delta="-2" + left_pad="7" layout="topleft" - left_pad="4" - name="auction_label" - top_delta="0" - width="145"> - Auction + name="person_label" + width="90"> + Person </text> - <icon - color="1 1 0.25 1" + <check_box + control_name="MapShowInfohubs" follows="top|right" height="16" - image_name="legend.tga" layout="topleft" - left_delta="50" + left="3" + name="infohub_chk" + top_pad="3" + width="22" /> + <icon + follows="top|right" + height="16" + image_name="map_infohub.tga" + layout="topleft" + left_pad="0" mouse_opaque="true" - name="square" + name="infohub" top_delta="0" width="16" /> - <text + <text type="string" length="1" follows="top|right" + halign="left" height="16" + top_delta="2" + left_pad="3" layout="topleft" - left_pad="4" - name="land_for_sale_label" - top_delta="0" - width="145"> - Land For Sale + name="infohub_label" + width="90"> + Infohub </text> - <button + <check_box + control_name="MapShowLandForSale" follows="top|right" height="16" - label="Go Home" - label_selected="Go Home" layout="topleft" - left="-90" - name="Go Home" - tool_tip="Teleport to your home" - top="34" - width="88" > - <button.commit_callback - function="WMap.GoHome" /> - </button> + left="3" + name="land_for_sale_chk" + top_pad="2" + width="22" /> <icon - color="0 1 0 1" follows="top|right" - height="8" - image_name="map_avatar_8.tga" + height="16" + image_name="icon_for_sale.tga" layout="topleft" - left="-226" mouse_opaque="true" - name="person" - top="84" - width="8" /> - <check_box - control_name="MapShowPeople" + name="landforsale" + top_delta="0" + left_pad="0" + width="16" /> + <text + type="string" + length="1" follows="top|right" + halign="left" height="16" - label="Resident" + top_delta="2" + left_pad="3" layout="topleft" - left_pad="8" - name="people_chk" - top_delta="-4" - width="110" /> + name="land_sale_label" + width="90"> + Land Sale + </text> <icon + color="1 1 0.25 1" follows="top|right" height="16" - image_name="map_infohub.tga" + image_name="legend.tga" layout="topleft" - left="-230" mouse_opaque="true" - name="infohub" - top="100" + name="square2" + left="41" + top_pad="-2" width="16" /> - <check_box - control_name="MapShowInfohubs" + <text + type="string" + length="1" follows="top|right" height="16" - label="Infohub" layout="topleft" - left_pad="4" - name="infohub_chk" - top_delta="0" - width="110" /> - <icon + left_pad="0" + name="auction_label" + top_delta="3" + width="100"> + by owner + </text> + <icon + color="0.5 0.25 1 1" follows="top|right" height="16" - image_name="map_telehub.tga" + image_name="legend.tga" layout="topleft" - left="-230" mouse_opaque="true" - name="telehub" - top="120" + name="square2" + left="41" + top_pad="-3" width="16" /> - <check_box - control_name="MapShowTelehubs" + <text + type="string" + length="1" follows="top|right" height="16" - label="Telehub" layout="topleft" - left_pad="4" - name="telehub_chk" - top_delta="0" - width="110" /> - <icon + left_pad="0" + name="auction_label" + top_delta="3" + width="170"> + land auction + </text> + + <button follows="top|right" - height="16" - image_name="icon_for_sale.tga" + height="22" + image_overlay="map_home.tga" + scale_image="true" + label_color="White" layout="topleft" - left="-230" - mouse_opaque="true" - name="landforsale" - top="140" - width="16" /> - <check_box - control_name="MapShowLandForSale" + left="136" + top="6" + name="Go Home" + tool_tip="Teleport home" + width="24" > + <button.commit_callback + function="WMap.GoHome" /> + </button> + <text + type="string" + length="1" follows="top|right" - height="16" - label="Land for Sale" + halign="left" + height="13" + top_delta="6" + left_pad="5" layout="topleft" - left_pad="4" - name="land_for_sale_chk" - top_delta="0" - width="110" /> + name="Home_label" + width="70"> + Home + </text> <text type="string" length="1" follows="top|right" + halign="left" height="16" layout="topleft" - left="-104" + left="137" name="events_label" - top="80" - width="145"> + top_pad="9" + width="66"> Events: </text> - <icon + + <check_box + control_name="MapShowEvents" + follows="top|right" + height="16" + layout="topleft" + left="135" + top_pad="1" + name="event_chk" + width="22" /> + <icon follows="top|right" height="16" image_name="map_event.tga" layout="topleft" - left="-92" mouse_opaque="true" name="event" - top="100" + left_pad="0" width="16" /> + <text + type="string" + length="1" + follows="top|right" + halign="left" + height="16" + top_delta="2" + left_pad="3" + layout="topleft" + name="pg_label" + width="60"> + PG + </text> + <check_box - control_name="MapShowEvents" + control_name="ShowMatureEvents" follows="top|right" height="16" - label="PG" + initial_value="true" layout="topleft" - left_pad="4" - name="event_chk" - top_delta="0" - width="55" /> + left="135" + name="event_mature_chk" + top_pad="3" + width="22" /> <icon follows="top|right" height="16" image_name="map_event_mature.tga" layout="topleft" - left="-92" mouse_opaque="true" name="events_mature_icon" - top="120" + top_delta="0" + left_pad="0" width="16" /> + <text + type="string" + length="1" + follows="top|right" + halign="left" + height="16" + top_delta="2" + left_pad="3" + layout="topleft" + name="mature_label" + width="66"> + Mature + </text> + <check_box - control_name="ShowMatureEvents" + control_name="ShowAdultEvents" follows="top|right" height="16" - initial_value="true" - label="Mature" layout="topleft" - left_pad="4" - name="event_mature_chk" - top_delta="0" - width="55" /> + left="135" + name="event_adult_chk" + top_pad="3" + width="22" /> <icon follows="top|right" height="16" image_name="map_event_adult.tga" layout="topleft" - left="-92" + left_pad="0" mouse_opaque="true" name="events_adult_icon" - top="140" + top_delta="0" width="16" /> - <check_box - control_name="ShowAdultEvents" + <text + type="string" + length="1" follows="top|right" + halign="left" height="16" - label="Adult" + top_delta="2" + left_pad="3" layout="topleft" - left_pad="4" - name="event_adult_chk" - top_delta="0" - width="55" /> - <icon + name="pg_label" + width="66"> + Adult + </text> +</panel> + + + <panel + follows="right|top" + height="22" + top_pad="0" + width="238" + background_visible="true" + bg_alpha_color="DkGray2"> + <text + text_color="White" + font="SansSerifLarge" + type="string" + length="1" + follows="top|right" + halign="left" + height="16" + layout="topleft" + left="15" + name="find_on_map_label" + top="3" + width="215"> + Find on Map + </text> + </panel> + + <panel + follows="right|top|bottom" + height="270" + top_pad="0" + width="238"> + <icon color="0.5 0 0 1" follows="top|right" height="16" image_name="map_track_16.tga" layout="topleft" - left="-230" + left="5" + top="11" mouse_opaque="true" - name="avatar_icon" - top="164" + name="friends_icon" width="16" /> <combo_box allow_text_entry="true" follows="top|right" - height="20" + height="23" label="Online Friends" layout="topleft" - left_pad="4" + top_delta="-4" + left_pad="5" max_chars="60" name="friend combo" - tool_tip="Friend to show on map" - top_delta="-4" - width="202"> + tool_tip="Show friends on map" + width="182"> <combo_box.item - label="Online Friends" + label="My Friends Online" name="item1" value="None" /> <combo_box.commit_callback function="WMap.AvatarCombo"/> </combo_box> - <icon + <icon color="0.5 0 0 1" follows="top|right" height="16" image_name="map_track_16.tga" layout="topleft" - left="-230" + left="5" + top_pad="8" mouse_opaque="true" name="landmark_icon" - top="189" width="16" /> <combo_box allow_text_entry="true" follows="top|right" - height="20" - label="Landmarks" + height="23" + label="My Landmarks" layout="topleft" - left_pad="4" + top_delta="-3" + left_pad="5" max_chars="64" name="landmark combo" tool_tip="Landmark to show on map" - top_delta="-4" - width="202"> + width="182"> <combo_box.item - label="Landmarks" + label="My Landmarks" name="item1" value="None" /> <combo_box.commit_callback function="WMap.Landmark"/> </combo_box> - <icon + <icon color="0.5 0 0 1" follows="top|right" height="16" image_name="map_track_16.tga" layout="topleft" - left="-230" + left="5" + top_pad="7" mouse_opaque="true" - name="location_icon" - top="214" + name="region_icon" width="16" /> - <line_editor + <search_editor follows="top|right" - height="20" - label="Search by Region Name" + search_button_visible="false" + height="22" + text_readonly_color="DkGray" + label="Regions by Name" layout="topleft" - left_pad="4" + top_delta="-2" + left_pad="5" name="location" select_on_focus="true" tool_tip="Type the name of a region" - top_delta="-4" - width="140" /> - <button + width="152" /> + <button follows="top|right" - height="20" - label="Search" + height="23" + label="Find" layout="topleft" - left_pad="5" + left_pad="2" + top_delta="-1" name="DoSearch" tool_tip="Search for region" - top_delta="0" - width="60"> + width="58"> <button.commit_callback function="WMap.Location" /> - </button> - <text - type="string" - length="1" - follows="top|right" - font="SansSerif" - height="16" - layout="topleft" - left="-230" - name="search_label" - top="234" - width="222"> - Search Results: - </text> + </button> <scroll_list draw_stripes="false" - follows="top|right|bottom" - height="200" + bg_writeable_color="MouseGray" + follows="all" + height="115" layout="topleft" - left_delta="0" + left="28" name="search_results" - top_pad="10" - width="222" + top_pad="5" + width="209" sort_column="1"> <scroll_list.columns label="" @@ -407,35 +512,87 @@ <scroll_list.columns label="" name="sim_name" - width="206" /> + width="193" /> <scroll_list.commit_callback function="WMap.SearchResult" /> </scroll_list> - <text + <button + follows="right|bottom" + height="23" + label="Teleport" + layout="topleft" + left="25" + name="Teleport" + tool_tip="Teleport to selected location" + top_pad="7" + width="104"> + <button.commit_callback + function="WMap.Teleport" /> + </button> + <button + follows="right|bottom" + height="23" + label="Copy SLurl" + layout="topleft" + left_pad="5" + name="copy_slurl" + tool_tip="Copies current location as SLurl to be used on the web." + top_delta="0" + width="104"> + <button.commit_callback + function="WMap.CopySLURL" /> + </button> + <!-- <button + follows="right|bottom" + height="23" + label="Clear" + layout="topleft" + left="10" + name="Clear" + tool_tip="Stop tracking" + top_pad="5" + width="105"> + <button.commit_callback + function="WMap.Clear" /> + </button>--> + <button + enabled="false" + follows="right|bottom" + height="23" + label="Show Selection" + left="25" + top_pad="5" + name="Show Destination" + tool_tip="Center map on selected location" + width="213"> + <button.commit_callback + function="WMap.ShowTarget" /> + </button> + +<!-- <text type="string" length="1" follows="bottom|right" - font="SansSerif" + halign="left" height="16" - layout="topleft" - left_delta="0" - name="location_label" top_pad="4" - width="98"> + left="25" + layout="topleft" + name="land_sale_label" + width="250"> Location: </text> - <spinner + <spinner decimal_digits="0" follows="bottom|right" - height="16" increment="1" initial_value="128" layout="topleft" - left_delta="70" + top_pad="0" + left="25" max_val="255" name="spin x" tool_tip="X coordinate of location to show on map" - top_delta="0" width="48"> <spinner.commit_callback function="WMap.CommitLocation" /> @@ -459,7 +616,6 @@ <spinner decimal_digits="0" follows="bottom|right" - height="16" increment="1" initial_value="0" layout="topleft" @@ -471,89 +627,58 @@ width="48"> <spinner.commit_callback function="WMap.CommitLocation" /> - </spinner> - <button - follows="right|bottom" - height="20" - label="Teleport" - label_selected="Teleport" - layout="topleft" - left="-230" - name="Teleport" - tool_tip="Teleport to selected location" - top="494" - width="90"> - <button.commit_callback - function="WMap.Teleport" /> - </button> - <button - follows="right|bottom" - height="20" - label="Show Destination" - label_selected="Show Destination" - layout="topleft" - left_pad="10" - name="Show Destination" - tool_tip="Center map on selected location" - top_delta="0" - width="125"> - <button.commit_callback - function="WMap.ShowTarget" /> - </button> - <button - follows="right|bottom" - height="20" - label="Clear" - label_selected="Clear" - layout="topleft" - left="-230" - name="Clear" - tool_tip="Stop tracking" - top="518" - width="90"> - <button.commit_callback - function="WMap.Clear" /> - </button> - <button - follows="right|bottom" - height="20" - label="Show My Location" - label_selected="Show My Location" + </spinner>--> + </panel> + <panel + follows="right|bottom" + height="22" + top_pad="0" + width="238" + background_visible="true" + bg_alpha_color="DkGray2"> + <text + text_color="White" + font="SansSerifLarge" + type="string" + length="1" + follows="top|right" + halign="left" + height="16" layout="topleft" - left_pad="10" - name="Show My Location" - tool_tip="Center map on your avatar's location" - top_delta="0" - width="125" > - <button.commit_callback - function="WMap.ShowAgent" /> - </button> - <button - enabled="false" - follows="bottom|right" - height="20" - label="Copy SLurl to clipboard" + left="15" + name="zoom_label" + top="3" + width="210"> + Zoom + </text> + </panel> + <panel + follows="right|bottom" + height="30" + min_height="30" + top_pad="0" + width="238"> + <icon + follows="left|bottom" + height="16" + image_name="Zoom_Off" layout="topleft" - left="-230" - name="copy_slurl" - tool_tip="Copies current location as SLurl to be used on the web." - top="542" - width="222"> - <button.commit_callback - function="WMap.CopySLURL" /> - </button> + left="20" + mouse_opaque="true" + name="zoom_icon" + top_pad="7" + width="16" /> <slider - follows="right|bottom" + follows="left|bottom" height="16" increment="0.2" - initial_value="48.5029" - label="Zoom" + initial_value="-2" + left_pad="0" layout="topleft" - left_delta="0" max_val="0" min_val="-8" name="zoom slider" show_text="false" - top_pad="8" - width="222" /> + width="200" /> + </panel> </floater> diff --git a/indra/newview/skins/default/xui/en/main_view.xml b/indra/newview/skins/default/xui/en/main_view.xml index d99205b2fe..eee1134d15 100644 --- a/indra/newview/skins/default/xui/en/main_view.xml +++ b/indra/newview/skins/default/xui/en/main_view.xml @@ -104,7 +104,7 @@ min_width="333" mouse_opaque="false" name="side_tray_container" - user_resize="true" + user_resize="false" visible="false" width="333"/> </layout_stack> diff --git a/indra/newview/skins/default/xui/en/panel_login.xml b/indra/newview/skins/default/xui/en/panel_login.xml index a9a02e8fc7..d07d4ea25f 100644 --- a/indra/newview/skins/default/xui/en/panel_login.xml +++ b/indra/newview/skins/default/xui/en/panel_login.xml @@ -6,7 +6,7 @@ left="0" name="panel_login" top="600" - width="800"> + width="996"> <panel.string name="create_account_url"> http://join.secondlife.com/ @@ -27,128 +27,79 @@ border_visible="false" bottom="600" follows="all" - hide_loading="true" + hide_loading="true" left="0" name="login_html" start_url="" top="0" height="600" - width="800"/> + width="996" /> <panel follows="left|bottom|right" name="login_widgets" layout="topleft" - left="0" - top="0"> + top="519" + width="996" + height="80"> <text follows="left|bottom" - font="SansSerif" + font="SansSerifSmall" height="16" - left="32" + left="20" name="first_name_text" - top="530" - width="120"> - First Name: + top="20" + width="135"> + Name: </text> <line_editor follows="left|bottom" - font="SansSerif" handle_edit_keys_directly="true" - height="20" + height="23" + label="First" left_delta="0" max_length="31" name="first_name_edit" select_on_focus="true" tool_tip="[SECOND_LIFE] First Name" - top_pad="2" - width="120" /> - <text - follows="left|bottom" - font="SansSerif" - height="16" - left="164" - name="last_name_text" - top="530" - width="120"> - Last Name: - </text> + top_pad="0" + width="135" /> <line_editor follows="left|bottom" - font="SansSerif" handle_edit_keys_directly="true" - height="20" - left_delta="0" + height="23" + label="Last" + left_pad="8" max_length="31" name="last_name_edit" select_on_focus="true" tool_tip="[SECOND_LIFE] Last Name" - top_pad="2" - width="120" /> - <text - follows="left|bottom" - font="SansSerif" - height="16" - left="296" - name="password_text" - top="530" - width="120"> - Password: - </text> - <line_editor - follows="left|bottom" - font="SansSerif" - handle_edit_keys_directly="true" - height="20" - left_delta="0" - max_length="16" - name="password_edit" - select_on_focus="true" - top_pad="2" - width="120" /> - <button - follows="left|bottom" - height="23" - label="Log In" - label_selected="Log In" - layout="topleft" - left="425" - name="connect_btn" - top="546" - width="100" /> - <combo_box - allow_text_entry="true" - follows="left|bottom" - height="23" - layout="topleft" - left_pad="5" - name="server_combo" - width="100" /> + top_delta="0" + width="135" /> <text follows="left|bottom" - font="SansSerif" - height="16" - left="32" + font="SansSerifSmall" + height="15" + left_pad="8" name="start_location_text" - top="576" - width="95"> - Start location: + top="20" + width="135"> + Starting location: </text> <combo_box allow_text_entry="true" control_name="LoginLocation" follows="left|bottom" height="23" - left_pad="0" max_chars="128" + top_pad="0" name="start_location_combo" - top_delta="-2" - width="155"> + width="135"> <combo_box.item - label="My Last Location" + label="My last location" name="MyLastLocation" value="last" /> <combo_box.item - label="My Home" + label="My home" name="MyHome" value="home" /> <combo_box.item @@ -156,43 +107,91 @@ name="Typeregionname" value="" /> </combo_box> + <combo_box + allow_text_entry="true" + font="SansSerifSmall" + follows="left|bottom" + height="23" + layout="topleft" + top="60" + name="server_combo" + width="135" + visible="false" /> + <text + follows="left|bottom" + font="SansSerifSmall" + height="15" + left_pad="3" + name="password_text" + top="20" + width="135"> + Password: + </text> + <line_editor + follows="left|bottom" + handle_edit_keys_directly="true" + height="23" + left_delta="0" + max_length="16" + name="password_edit" + select_on_focus="true" + top_pad="0" + width="135" /> <check_box control_name="RememberPassword" follows="left|bottom" + font="SansSerifSmall" height="16" - label="Remember password" - left_pad="10" + label="Remember" + left_pad="5" name="remember_check" - top_delta="3" - width="138" /> + top_delta="5" + width="90" /> + <button + follows="left|bottom" + height="23" + image_unselected="PushButton_On" + image_selected="PushButton_On_Selected" + label="Log In" + label_color="White" + layout="topleft" + left_pad="20" + name="connect_btn" + top="35" + width="90" /> <text follows="right|bottom" + font="SansSerifSmall" + text_color="EmphasisColor" halign="right" height="16" - left="-210" + top="17" + left_pad="10" + right="-10" name="create_new_account_text" - top="539" - width="200"> - Create a new account + width="180"> + Sign up for account </text> <text follows="right|bottom" + font="SansSerifSmall" + text_color="EmphasisColor" halign="right" height="16" - left_delta="0" name="forgot_password_text" - top_pad="4" - width="200"> + top_pad="2" + width="180"> Forgot your name or password? </text> <text follows="right|bottom" + font="SansSerifSmall" halign="right" - height="16" - left="-310" + height="28" + top_pad="2" name="channel_text" - top="579" - width="300"> + width="180" + word_wrap="true"> [VERSION] </text> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml index 9702bd41c8..e8e4a9dbb2 100644 --- a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml +++ b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml @@ -154,7 +154,15 @@ left="0" name="favorite" image_drag_indication="arrow_down.tga" - chevron_button_tool_tip="Show more of My Favorites" - bottom="62" - width="590" /> + bottom="62" + width="590"> + <chevron_button name=">>" + image_unselected="TabIcon_Close_Off" + image_selected="TabIcon_Close_Off" + tab_stop="false" + follows="left|bottom" + tool_tip="Show more of My Favorites" + width="15" + height="15"/> + </favorites_bar> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_region_general_layout.xml b/indra/newview/skins/default/xui/en/panel_region_general_layout.xml deleted file mode 100644 index bffd84877f..0000000000 --- a/indra/newview/skins/default/xui/en/panel_region_general_layout.xml +++ /dev/null @@ -1,242 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<panel - border="true" - follows="top|left" - height="360" - label="Region" - layout="topleft" - left="0" - name="General" - top="360" - width="280"> - <text - follows="left|top" - font="SansSerif" - height="20" - layout="topleft" - left="10" - name="region_text_lbl" - top="10" - width="100"> - Region: - </text> - <text - follows="left|top" - font="SansSerif" - height="20" - layout="topleft" - left_delta="50" - name="region_text" - top_delta="0" - width="200"> - unknown - </text> - <text - follows="left|top" - font="SansSerif" - height="20" - layout="topleft" - left="10" - name="version_channel_text_lbl" - top="30" - width="100"> - Version: - </text> - <text - follows="left|top" - font="SansSerif" - height="20" - layout="topleft" - left_delta="50" - name="version_channel_text" - top_delta="0" - width="200"> - unknown - </text> - <text - follows="left|top" - font="SansSerif" - height="20" - layout="topleft" - left="10" - name="region_type_lbl" - top="50" - width="100"> - Type: - </text> - <text - follows="left|top" - font="SansSerif" - height="20" - layout="topleft" - left_delta="50" - name="region_type" - top_delta="0" - width="200"> - unknown - </text> - <check_box - height="20" - label="Block Terraform" - layout="topleft" - left="10" - name="block_terraform_check" - top="70" - width="80" /> - <check_box - height="20" - label="Block Fly" - layout="topleft" - left="10" - name="block_fly_check" - top="90" - width="80" /> - <check_box - height="20" - label="Allow Damage" - layout="topleft" - left="10" - name="allow_damage_check" - top="110" - width="80" /> - <check_box - height="20" - label="Restrict Pushing" - layout="topleft" - left="10" - name="restrict_pushobject" - top="130" - width="80" /> - <check_box - height="20" - label="Allow Land Resell" - layout="topleft" - left="10" - name="allow_land_resell_check" - top="160" - width="80" /> - <check_box - height="20" - label="Allow Land Join/Divide" - layout="topleft" - left="10" - name="allow_parcel_changes_check" - top="180" - width="80" /> - <check_box - height="20" - label="Block Land Show in Search" - layout="topleft" - left="10" - name="block_parcel_search_check" - tool_tip="Let people see this region and its parcels in search results" - top="200" - width="80" /> - <spinner - follows="left|top" - height="20" - increment="1" - label="Agent Limit" - label_width="97" - layout="topleft" - left="10" - max_val="100" - min_val="1" - name="agent_limit_spin" - top="240" - width="170" /> - <spinner - follows="left|top" - height="20" - increment="0.5" - label="Object Bonus" - label_width="97" - layout="topleft" - left="10" - max_val="10" - min_val="1" - name="object_bonus_spin" - top="260" - width="170" /> - <text - follows="left|top" - height="20" - label="Maturity" - layout="topleft" - left="10" - name="access_text" - top="290" - width="100"> - Rating: - </text> - <combo_box - height="20" - label="Mature" - layout="topleft" - left_delta="100" - name="access_combo" - top_delta="0" - width="85"> - <combo_box.item - label="Adult" - name="Adult" - value="42" /> - <combo_box.item - label="Mature" - name="Mature" - value="21" /> - <combo_box.item - label="PG" - name="PG" - value="13" /> - </combo_box> - <button - enabled="false" - follows="left|top" - height="20" - label="Apply" - layout="topleft" - left="108" - name="apply_btn" - top="320" - width="100"/> - <button - follows="left|top" - height="20" - label="Teleport Home One User..." - layout="topleft" - left="10" - name="kick_btn" - top_pad="10" - width="250" /> - <button - follows="left|top" - height="20" - label="Teleport Home All Users..." - layout="topleft" - left_delta="0" - name="kick_all_btn" - top_pad="3" - width="250" /> - <button - follows="left|top" - height="20" - label="Send Message To Region..." - layout="topleft" - left_delta="0" - name="im_btn" - top_pad="20" - width="200" /> - <button - follows="left|top" - height="20" - label="Manage Telehub..." - layout="topleft" - left_delta="0" - name="manage_telehub_btn" - top_pad="20" - width="150" > - <button.commit_callback - function="RegionInfo.ManageTelehub" /> - </button> -</panel> diff --git a/indra/newview/skins/default/xui/en/widgets/location_input.xml b/indra/newview/skins/default/xui/en/widgets/location_input.xml index ea78f6d0dd..d32952b04f 100644 --- a/indra/newview/skins/default/xui/en/widgets/location_input.xml +++ b/indra/newview/skins/default/xui/en/widgets/location_input.xml @@ -53,35 +53,40 @@ name="voice_icon" width="22" height="18" - top="21" + top="21" + follows="right|top" image_name="parcel_lght_VoiceNo" /> <fly_icon name="fly_icon" width="22" height="18" - top="21" + top="21" + follows="right|top" image_name="parcel_lght_FlyNo" /> <push_icon name="push_icon" width="22" height="18" - top="21" + top="21" + follows="right|top" image_name="parcel_lght_PushNo" /> <build_icon name="build_icon" width="22" height="18" - top="21" + top="21" + follows="right|top" image_name="parcel_lght_BuildNo" /> <scripts_icon name="scripts_icon" width="22" height="18" - top="21" + top="21" + follows="right|top" image_name="parcel_lght_ScriptsNo" /> <!-- NOTE: Placeholder icon, there is no dark grayscale version --> @@ -89,7 +94,8 @@ name="damage_icon" width="22" height="18" - top="21" + top="21" + follows="right|top" image_name="parcel_lght_Damage" /> <!-- Default text color is invisible on top of nav bar background --> @@ -98,6 +104,7 @@ width="35" height="18" top="16" + follows="right|top" halign="right" font="SansSerifSmall" text_color="TextFgColor" |