diff options
| author | James Cook <james@lindenlab.com> | 2009-12-04 10:56:19 -0800 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2009-12-04 10:56:19 -0800 |
| commit | fa8b2135f5eaf92b24abe79f908a62e7e2c0a076 (patch) | |
| tree | 4262266a4b752a7599170b9a75a60f8d4956cd0b | |
| parent | 5b695ac56a7fbbb4d1f63bccb0c147c46e56ebcf (diff) | |
| parent | ab6134c2310bae6aa68565b6a31093c123713135 (diff) | |
merge
57 files changed, 1083 insertions, 770 deletions
diff --git a/indra/llui/lltextbase.cpp b/indra/llui/lltextbase.cpp index db16670f79..82a3c5cf47 100644 --- a/indra/llui/lltextbase.cpp +++ b/indra/llui/lltextbase.cpp @@ -543,9 +543,17 @@ void LLTextBase::drawText() line_end = next_start; } + // A patch for EXT-1944 "Implement ellipses in message well" + // introduced a regression where text in SansSerif ending in the + // letter "r" is clipped. This may be due to an off-by-one in + // font width information out of FreeType with our fractional font + // sizes. For now, just make an extra pixel of space to resolve + // EXT-2971 "Letter R doesn't show when it's the last letter in a + // text block". See James/Richard for details. + const S32 FIX_CLIPPING_HACK = 1; LLRect text_rect(line.mRect.mLeft + mTextRect.mLeft - scrolled_view_rect.mLeft, line.mRect.mTop - scrolled_view_rect.mBottom + mTextRect.mBottom, - llmin(mDocumentView->getRect().getWidth(), line.mRect.mRight) - scrolled_view_rect.mLeft, + llmin(mDocumentView->getRect().getWidth(), line.mRect.mRight) - scrolled_view_rect.mLeft + FIX_CLIPPING_HACK, line.mRect.mBottom - scrolled_view_rect.mBottom + mTextRect.mBottom); // draw a single line of text @@ -2397,12 +2405,20 @@ void LLNormalTextSegment::setToolTip(const std::string& tooltip) bool LLNormalTextSegment::getDimensions(S32 first_char, S32 num_chars, S32& width, S32& height) const { - LLWString text = mEditor.getWText(); - height = mFontHeight; - width = mStyle->getFont()->getWidth(text.c_str(), mStart + first_char, num_chars); - // if last character is a newline, then return true, forcing line break - llwchar last_char = text[mStart + first_char + num_chars - 1]; + bool force_newline = false; + if (num_chars > 0) + { + LLWString text = mEditor.getWText(); + width = mStyle->getFont()->getWidth(text.c_str(), mStart + first_char, num_chars); + // if last character is a newline, then return true, forcing line break + llwchar last_char = text[mStart + first_char + num_chars - 1]; + force_newline = (last_char == '\n'); + } + else + { + width = 0; + } LLUIImagePtr image = mStyle->getImage(); if( image.notNull()) @@ -2411,7 +2427,7 @@ bool LLNormalTextSegment::getDimensions(S32 first_char, S32 num_chars, S32& widt height = llmax(height, image->getHeight()); } - return num_chars >= 1 && last_char == '\n'; + return force_newline; } S32 LLNormalTextSegment::getOffset(S32 segment_local_x_coord, S32 start_offset, S32 num_chars, bool round) const diff --git a/indra/llui/llview.cpp b/indra/llui/llview.cpp index 23e4131e6d..6f8455774d 100644 --- a/indra/llui/llview.cpp +++ b/indra/llui/llview.cpp @@ -2533,6 +2533,7 @@ void LLView::setupParams(LLView::Params& p, LLView* parent) else { p.rect.left = p.rect.left + parent_rect.getWidth()/2 - p.rect.width/2; + p.rect.right.setProvided(false); // recalculate the right } } else @@ -2553,6 +2554,7 @@ void LLView::setupParams(LLView::Params& p, LLView* parent) else { p.rect.bottom = p.rect.bottom + parent_rect.getHeight()/2 - p.rect.height/2; + p.rect.top.setProvided(false); // recalculate the top } } else diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 6252bd002e..b301d784f9 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -3706,7 +3706,18 @@ <key>Type</key> <string>F32</string> <key>Value</key> - <real>0.15</real> + <real>0.5</real> + </map> + <key>InspectorShowTime</key> + <map> + <key>Comment</key> + <string>Stay timing for inspectors</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>F32</string> + <key>Value</key> + <real>3.0</real> </map> <key>InstallLanguage</key> <map> @@ -7967,7 +7978,7 @@ <key>ShowPGSearchAll</key> <map> <key>Comment</key> - <string>Display results of search All that are flagged as PG</string> + <string>Display results of search All that are flagged as general</string> <key>Persist</key> <integer>1</integer> <key>HideFromEditor</key> @@ -7980,7 +7991,7 @@ <key>ShowMatureSearchAll</key> <map> <key>Comment</key> - <string>Display results of search All that are flagged as mature</string> + <string>Display results of search All that are flagged as moderate</string> <key>Persist</key> <integer>1</integer> <key>HideFromEditor</key> @@ -8006,7 +8017,7 @@ <key>ShowPGGroups</key> <map> <key>Comment</key> - <string>Display results of find groups that are flagged as PG</string> + <string>Display results of find groups that are flagged as general</string> <key>Persist</key> <integer>1</integer> <key>HideFromEditor</key> @@ -8019,7 +8030,7 @@ <key>ShowMatureGroups</key> <map> <key>Comment</key> - <string>Display results of find groups that are flagged as mature</string> + <string>Display results of find groups that are flagged as moderate</string> <key>Persist</key> <integer>1</integer> <key>HideFromEditor</key> @@ -8045,7 +8056,7 @@ <key>ShowPGClassifieds</key> <map> <key>Comment</key> - <string>Display results of find classifieds that are flagged as PG</string> + <string>Display results of find classifieds that are flagged as general</string> <key>Persist</key> <integer>1</integer> <key>HideFromEditor</key> @@ -8058,7 +8069,7 @@ <key>ShowMatureClassifieds</key> <map> <key>Comment</key> - <string>Display results of find classifieds that are flagged as mature</string> + <string>Display results of find classifieds that are flagged as moderate</string> <key>Persist</key> <integer>1</integer> <key>HideFromEditor</key> @@ -8084,7 +8095,7 @@ <key>ShowPGEvents</key> <map> <key>Comment</key> - <string>Display results of find events that are flagged as PG</string> + <string>Display results of find events that are flagged as general</string> <key>Persist</key> <integer>1</integer> <key>HideFromEditor</key> @@ -8097,7 +8108,7 @@ <key>ShowMatureEvents</key> <map> <key>Comment</key> - <string>Display results of find events that are flagged as mature</string> + <string>Display results of find events that are flagged as moderate</string> <key>Persist</key> <integer>1</integer> <key>HideFromEditor</key> @@ -8123,7 +8134,7 @@ <key>ShowPGLand</key> <map> <key>Comment</key> - <string>Display results of find land sales that are flagged as PG</string> + <string>Display results of find land sales that are flagged as general</string> <key>Persist</key> <integer>1</integer> <key>HideFromEditor</key> @@ -8136,7 +8147,7 @@ <key>ShowMatureLand</key> <map> <key>Comment</key> - <string>Display results of find land sales that are flagged as mature</string> + <string>Display results of find land sales that are flagged as moderate</string> <key>Persist</key> <integer>1</integer> <key>HideFromEditor</key> @@ -8162,7 +8173,7 @@ <key>ShowPGSims</key> <map> <key>Comment</key> - <string>Display results of find places or find popular that are in PG sims</string> + <string>Display results of find places or find popular that are in general sims</string> <key>Persist</key> <integer>1</integer> <key>HideFromEditor</key> @@ -8175,7 +8186,7 @@ <key>ShowMatureSims</key> <map> <key>Comment</key> - <string>Display results of find places or find popular that are in mature sims</string> + <string>Display results of find places or find popular that are in moderate sims</string> <key>Persist</key> <integer>1</integer> <key>HideFromEditor</key> diff --git a/indra/newview/installers/darwin/firstlook-dmg/_DS_Store b/indra/newview/installers/darwin/firstlook-dmg/_DS_Store Binary files differindex 408a4d4992..9d9fd897e7 100644 --- a/indra/newview/installers/darwin/firstlook-dmg/_DS_Store +++ b/indra/newview/installers/darwin/firstlook-dmg/_DS_Store diff --git a/indra/newview/installers/darwin/publicnightly-dmg/_DS_Store b/indra/newview/installers/darwin/publicnightly-dmg/_DS_Store Binary files differindex b901e46b65..9d9fd897e7 100644 --- a/indra/newview/installers/darwin/publicnightly-dmg/_DS_Store +++ b/indra/newview/installers/darwin/publicnightly-dmg/_DS_Store diff --git a/indra/newview/installers/darwin/release-dmg/_DS_Store b/indra/newview/installers/darwin/release-dmg/_DS_Store Binary files differindex 2c179b11a4..9d9fd897e7 100644 --- a/indra/newview/installers/darwin/release-dmg/_DS_Store +++ b/indra/newview/installers/darwin/release-dmg/_DS_Store diff --git a/indra/newview/installers/darwin/releasecandidate-dmg/_DS_Store b/indra/newview/installers/darwin/releasecandidate-dmg/_DS_Store Binary files differindex 309c8adaaa..9d9fd897e7 100644 --- a/indra/newview/installers/darwin/releasecandidate-dmg/_DS_Store +++ b/indra/newview/installers/darwin/releasecandidate-dmg/_DS_Store diff --git a/indra/newview/llfloaterbuyland.cpp b/indra/newview/llfloaterbuyland.cpp index 59985a61ff..3a8c3ab4d2 100644 --- a/indra/newview/llfloaterbuyland.cpp +++ b/indra/newview/llfloaterbuyland.cpp @@ -494,10 +494,14 @@ void LLFloaterBuyLandUI::updateCovenantInfo() LLViewerRegion* region = LLViewerParcelMgr::getInstance()->getSelectionRegion(); if(!region) return; + U8 sim_access = region->getSimAccess(); + std::string rating = LLViewerRegion::accessToString(sim_access); + LLTextBox* region_name = getChild<LLTextBox>("region_name_text"); if (region_name) { - region_name->setText(region->getName()); + std::string region_name_txt = region->getName() + " ("+rating +")"; + region_name->setText(region_name_txt); } LLTextBox* region_type = getChild<LLTextBox>("region_type_text"); diff --git a/indra/newview/llfolderview.cpp b/indra/newview/llfolderview.cpp index ab49739d58..6a3462f201 100644 --- a/indra/newview/llfolderview.cpp +++ b/indra/newview/llfolderview.cpp @@ -1803,15 +1803,6 @@ BOOL LLFolderView::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop, return handled; } -BOOL LLFolderView::handleScrollWheel(S32 x, S32 y, S32 clicks) -{ - if (mScrollContainer) - { - return mScrollContainer->handleScrollWheel(x, y, clicks); - } - return FALSE; -} - void LLFolderView::deleteAllChildren() { if(mRenamer == gFocusMgr.getTopCtrl()) diff --git a/indra/newview/llfolderview.h b/indra/newview/llfolderview.h index a0e252ae88..eaaba8c13d 100644 --- a/indra/newview/llfolderview.h +++ b/indra/newview/llfolderview.h @@ -230,7 +230,6 @@ public: EAcceptance* accept, std::string& tooltip_msg); /*virtual*/ void reshape(S32 width, S32 height, BOOL called_from_parent = TRUE); - virtual BOOL handleScrollWheel(S32 x, S32 y, S32 clicks); virtual void draw(); virtual void deleteAllChildren(); diff --git a/indra/newview/llinspect.cpp b/indra/newview/llinspect.cpp index aa299014ee..c7b8db9635 100644 --- a/indra/newview/llinspect.cpp +++ b/indra/newview/llinspect.cpp @@ -50,16 +50,16 @@ LLInspect::~LLInspect() void LLInspect::draw() { static LLCachedControl<F32> FADE_TIME(*LLUI::sSettingGroups["config"], "InspectorFadeTime", 1.f); + static LLCachedControl<F32> STAY_TIME(*LLUI::sSettingGroups["config"], "InspectorShowTime", 1.f); if (mOpenTimer.getStarted()) { - F32 alpha = clamp_rescale(mOpenTimer.getElapsedTimeF32(), 0.f, FADE_TIME, 0.f, 1.f); - LLViewDrawContext context(alpha); LLFloater::draw(); - if (alpha == 1.f) + if (mOpenTimer.getElapsedTimeF32() > STAY_TIME) { mOpenTimer.stop(); + mCloseTimer.start(); } - + } else if (mCloseTimer.getStarted()) { @@ -95,3 +95,16 @@ void LLInspect::onFocusLost() mCloseTimer.start(); mOpenTimer.stop(); } + +// virtual +BOOL LLInspect::handleHover(S32 x, S32 y, MASK mask) +{ + mOpenTimer.pause(); + return LLView::handleHover(x, y, mask); +} + +// virtual +void LLInspect::onMouseLeave(S32 x, S32 y, MASK mask) +{ + mOpenTimer.unpause(); +} diff --git a/indra/newview/llinspect.h b/indra/newview/llinspect.h index a461c2fa16..731e99534b 100644 --- a/indra/newview/llinspect.h +++ b/indra/newview/llinspect.h @@ -46,6 +46,9 @@ public: /// Inspectors have a custom fade-in/fade-out animation /*virtual*/ void draw(); + /*virtual*/ BOOL handleHover(S32 x, S32 y, MASK mask); + /*virtual*/ void onMouseLeave(S32 x, S32 y, MASK mask); + /// Start open animation /*virtual*/ void onOpen(const LLSD& avatar_id); diff --git a/indra/newview/llinspectavatar.cpp b/indra/newview/llinspectavatar.cpp index 866669f326..83beae29c1 100644 --- a/indra/newview/llinspectavatar.cpp +++ b/indra/newview/llinspectavatar.cpp @@ -133,7 +133,6 @@ private: LLUUID mAvatarID; // Need avatar name information to spawn friend add request std::string mAvatarName; - LLUUID mPartnerID; // an in-flight request for avatar properties from LLAvatarPropertiesProcessor // is represented by this object LLFetchAvatarData* mPropertiesRequest; @@ -187,8 +186,7 @@ public: LLInspectAvatar::LLInspectAvatar(const LLSD& sd) : LLInspect( LLSD() ), // single_instance, doesn't really need key - mAvatarID(), // set in onOpen() - mPartnerID(), + mAvatarID(), // set in onOpen() *Note: we used to show partner's name but we dont anymore --angela 3rd Dec* mAvatarName(), mPropertiesRequest(NULL) { @@ -257,7 +255,6 @@ void LLInspectAvatar::onOpen(const LLSD& data) // Extract appropriate avatar id mAvatarID = data["avatar_id"]; - mPartnerID = LLUUID::null; BOOL self = mAvatarID == gAgent.getID(); @@ -307,7 +304,6 @@ void LLInspectAvatar::requestUpdate() getChild<LLUICtrl>("user_name")->setValue(""); getChild<LLUICtrl>("user_subtitle")->setValue(""); getChild<LLUICtrl>("user_details")->setValue(""); - getChild<LLUICtrl>("user_partner")->setValue(""); // Make a new request for properties delete mPropertiesRequest; @@ -365,15 +361,6 @@ void LLInspectAvatar::processAvatarData(LLAvatarData* data) std::string details = getString("Details", args); getChild<LLUICtrl>("user_details")->setValue( LLSD(details) ); - // Look up partner name, if there is one - mPartnerID = data->partner_id; - if (mPartnerID.notNull()) - { - gCacheName->get(mPartnerID, FALSE, - boost::bind(&LLInspectAvatar::nameUpdatedCallback, - this, _1, _2, _3, _4)); - } - // Delete the request object as it has been satisfied delete mPropertiesRequest; mPropertiesRequest = NULL; @@ -455,15 +442,6 @@ void LLInspectAvatar::nameUpdatedCallback( mAvatarName = first + " " + last; childSetValue("user_name", LLSD(mAvatarName) ); } - - if (id == mPartnerID) - { - LLStringUtil::format_map_t args; - args["[PARTNER]"] = first + " " + last; - std::string partner = getString("Partner", args); - getChild<LLUICtrl>("user_partner")->setValue(partner); - } - // Otherwise possibly a request for an older inspector, ignore it } void LLInspectAvatar::onClickAddFriend() diff --git a/indra/newview/lllocationinputctrl.cpp b/indra/newview/lllocationinputctrl.cpp index 09c215e660..758d8ff903 100644 --- a/indra/newview/lllocationinputctrl.cpp +++ b/indra/newview/lllocationinputctrl.cpp @@ -243,38 +243,54 @@ LLLocationInputCtrl::LLLocationInputCtrl(const LLLocationInputCtrl::Params& p) addChild(mAddLandmarkBtn); LLButton::Params for_sale_button = p.for_sale_button; + for_sale_button.tool_tip = LLTrans::getString("LocationCtrlForSaleTooltip"); for_sale_button.click_callback.function( boost::bind(&LLLocationInputCtrl::onForSaleButtonClicked, this)); mForSaleBtn = LLUICtrlFactory::create<LLButton>( for_sale_button ); - // *TODO: Make clickable? addChild(mForSaleBtn); // Parcel property icons + // Must be mouse-opaque so cursor stays as an arrow when hovering to + // see tooltip. LLIconCtrl::Params voice_icon = p.voice_icon; + voice_icon.tool_tip = LLTrans::getString("LocationCtrlVoiceTooltip"); + voice_icon.mouse_opaque = true; mParcelIcon[VOICE_ICON] = LLUICtrlFactory::create<LLIconCtrl>(voice_icon); addChild(mParcelIcon[VOICE_ICON]); LLIconCtrl::Params fly_icon = p.fly_icon; + fly_icon.tool_tip = LLTrans::getString("LocationCtrlFlyTooltip"); + fly_icon.mouse_opaque = true; mParcelIcon[FLY_ICON] = LLUICtrlFactory::create<LLIconCtrl>(fly_icon); addChild(mParcelIcon[FLY_ICON]); LLIconCtrl::Params push_icon = p.push_icon; + push_icon.tool_tip = LLTrans::getString("LocationCtrlPushTooltip"); + push_icon.mouse_opaque = true; mParcelIcon[PUSH_ICON] = LLUICtrlFactory::create<LLIconCtrl>(push_icon); addChild(mParcelIcon[PUSH_ICON]); LLIconCtrl::Params build_icon = p.build_icon; + build_icon.tool_tip = LLTrans::getString("LocationCtrlBuildTooltip"); + build_icon.mouse_opaque = true; mParcelIcon[BUILD_ICON] = LLUICtrlFactory::create<LLIconCtrl>(build_icon); addChild(mParcelIcon[BUILD_ICON]); LLIconCtrl::Params scripts_icon = p.scripts_icon; + scripts_icon.tool_tip = LLTrans::getString("LocationCtrlScriptsTooltip"); + scripts_icon.mouse_opaque = true; mParcelIcon[SCRIPTS_ICON] = LLUICtrlFactory::create<LLIconCtrl>(scripts_icon); addChild(mParcelIcon[SCRIPTS_ICON]); LLIconCtrl::Params damage_icon = p.damage_icon; + damage_icon.tool_tip = LLTrans::getString("LocationCtrlDamageTooltip"); + damage_icon.mouse_opaque = true; mParcelIcon[DAMAGE_ICON] = LLUICtrlFactory::create<LLIconCtrl>(damage_icon); addChild(mParcelIcon[DAMAGE_ICON]); LLTextBox::Params damage_text = p.damage_text; + damage_text.tool_tip = LLTrans::getString("LocationCtrlDamageTooltip"); + damage_text.mouse_opaque = true; mDamageText = LLUICtrlFactory::create<LLTextBox>(damage_text); addChild(mDamageText); diff --git a/indra/newview/llnearbychat.cpp b/indra/newview/llnearbychat.cpp index 18e5169930..3a1ae5bf46 100644 --- a/indra/newview/llnearbychat.cpp +++ b/indra/newview/llnearbychat.cpp @@ -264,6 +264,7 @@ void LLNearbyChat::updateChatHistoryStyle() addMessage(*it,false); } } + //static void LLNearbyChat::processChatHistoryStyleUpdate(const LLSD& newvalue) { @@ -271,3 +272,20 @@ void LLNearbyChat::processChatHistoryStyleUpdate(const LLSD& newvalue) if(nearby_chat) nearby_chat->updateChatHistoryStyle(); } + + +//////////////////////////////////////////////////////////////////////////////// +// +void LLNearbyChat::onFocusReceived() +{ + setBackgroundOpaque(true); + LLPanel::onFocusReceived(); +} + +//////////////////////////////////////////////////////////////////////////////// +// +void LLNearbyChat::onFocusLost() +{ + setBackgroundOpaque(false); + LLPanel::onFocusLost(); +} diff --git a/indra/newview/llnearbychat.h b/indra/newview/llnearbychat.h index 1cbc2a3478..938b77df7a 100644 --- a/indra/newview/llnearbychat.h +++ b/indra/newview/llnearbychat.h @@ -51,6 +51,10 @@ public: void onNearbyChatContextMenuItemClicked(const LLSD& userdata); bool onNearbyChatCheckContextMenuItem(const LLSD& userdata); + // focus overrides + /*virtual*/ void onFocusLost(); + /*virtual*/ void onFocusReceived(); + /*virtual*/ void onOpen (const LLSD& key); /*virtual*/ void setVisible(BOOL visible); diff --git a/indra/newview/llpanellogin.cpp b/indra/newview/llpanellogin.cpp index d2a17dbd97..4bae6af12e 100644 --- a/indra/newview/llpanellogin.cpp +++ b/indra/newview/llpanellogin.cpp @@ -191,7 +191,7 @@ LLPanelLogin::LLPanelLogin(const LLRect &rect, gViewerWindow->getRootView()->addChildInBack(this); // Logo - mLogoImage = LLUI::getUIImage("startup_logo.j2c"); + mLogoImage = LLUI::getUIImage("startup_logo"); LLUICtrlFactory::getInstance()->buildPanel(this, "panel_login.xml"); diff --git a/indra/newview/llpanelobjectinventory.cpp b/indra/newview/llpanelobjectinventory.cpp index 342d2bc739..0012f22cdd 100644 --- a/indra/newview/llpanelobjectinventory.cpp +++ b/indra/newview/llpanelobjectinventory.cpp @@ -1696,6 +1696,7 @@ void LLPanelObjectInventory::updateInventory() mFolders->requestArrange(); mInventoryNeedsUpdate = FALSE; + LLEditMenuHandler::gEditMenuHandler = mFolders; } // *FIX: This is currently a very expensive operation, because we have @@ -1940,3 +1941,22 @@ void LLPanelObjectInventory::idle(void* user_data) self->updateInventory(); } } + +void LLPanelObjectInventory::onFocusLost() +{ + // inventory no longer handles cut/copy/paste/delete + if (LLEditMenuHandler::gEditMenuHandler == mFolders) + { + LLEditMenuHandler::gEditMenuHandler = NULL; + } + + LLPanel::onFocusLost(); +} + +void LLPanelObjectInventory::onFocusReceived() +{ + // inventory now handles cut/copy/paste/delete + LLEditMenuHandler::gEditMenuHandler = mFolders; + + LLPanel::onFocusReceived(); +} diff --git a/indra/newview/llpanelobjectinventory.h b/indra/newview/llpanelobjectinventory.h index 6722bb212e..bc339ece35 100644 --- a/indra/newview/llpanelobjectinventory.h +++ b/indra/newview/llpanelobjectinventory.h @@ -74,6 +74,9 @@ public: virtual void deleteAllChildren(); virtual BOOL handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop, EDragAndDropType cargo_type, void *cargo_data, EAcceptance *accept, std::string& tooltip_msg); + /*virtual*/ void onFocusLost(); + /*virtual*/ void onFocusReceived(); + static void idle(void* user_data); protected: diff --git a/indra/newview/llviewerfloaterreg.cpp b/indra/newview/llviewerfloaterreg.cpp index 7c9bd582dd..158c857031 100644 --- a/indra/newview/llviewerfloaterreg.cpp +++ b/indra/newview/llviewerfloaterreg.cpp @@ -226,7 +226,12 @@ void LLViewerFloaterReg::registerFloaters() LLFloaterReg::add("test_inspectors", "floater_test_inspectors.xml", &LLFloaterReg::build<LLFloaterTestInspectors>); //LLFloaterReg::add("test_list_view", "floater_test_list_view.xml",&LLFloaterReg::build<LLFloaterTestListView>); - LLFloaterReg::add("test_widgets", "floater_test_widgets.xml", &LLFloaterReg::build<LLFloater>); + LLFloaterReg::add("test_textbox", "floater_test_textbox.xml", + &LLFloaterReg::build<LLFloater>); + LLFloaterReg::add("test_text_editor", "floater_test_text_editor.xml", + &LLFloaterReg::build<LLFloater>); + LLFloaterReg::add("test_widgets", "floater_test_widgets.xml", + &LLFloaterReg::build<LLFloater>); LLFloaterReg::add("top_objects", "floater_top_objects.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterTopObjects>); LLFloaterReg::add("reporter", "floater_report_abuse.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterReporter>); diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml index 85cb145dbc..acb3262093 100644 --- a/indra/newview/skins/default/colors.xml +++ b/indra/newview/skins/default/colors.xml @@ -686,6 +686,6 @@ value="0.3 0.3 0.3 1.0" /> <color name="ChatToastAgentNameColor" - value="1.0 0.3 1.0 1.0" /> + reference="EmphasisColor" /> </colors> diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml index 3e0820544a..b1116dc0d2 100644 --- a/indra/newview/skins/default/textures/textures.xml +++ b/indra/newview/skins/default/textures/textures.xml @@ -343,8 +343,8 @@ with the same filename but different name <texture name="parcel_drk_BuildNo" file_name="icons/parcel_drk_BuildNo.png" preload="false" /> <texture name="parcel_drk_Damage" file_name="icons/parcel_drk_Damage.png" preload="false" /> <texture name="parcel_drk_DamageNo" file_name="icons/parcel_drk_DamageNo.png" preload="false" /> - <texture name="parcel_drk_EVRY" file_name="icons/parcel_drk_EVRY.png" preload="false" /> - <texture name="parcel_drk_EXP" file_name="icons/parcel_drk_EXP.png" preload="false" /> + <texture name="parcel_drk_EVRY" file_name="icons/parcel_drk_EVRY.png" preload="false" /> + <texture name="parcel_drk_EXP" file_name="icons/parcel_drk_EXP.png" preload="false" /> <texture name="parcel_drk_Fly" file_name="icons/parcel_drk_Fly.png" preload="false" /> <texture name="parcel_drk_FlyNo" file_name="icons/parcel_drk_FlyNo.png" preload="false" /> <texture name="parcel_drk_ForSale" file_name="icons/parcel_drk_ForSale.png" preload="false" /> @@ -363,8 +363,8 @@ with the same filename but different name <texture name="parcel_lght_BuildNo" file_name="icons/parcel_lght_BuildNo.png" preload="false" /> <texture name="parcel_lght_Damage" file_name="icons/parcel_lght_Damage.png" preload="false" /> <texture name="parcel_lght_DamageNo" file_name="icons/parcel_lght_DamageNo.png" preload="false" /> - <texture name="parcel_lght_EVRY" file_name="icons/parcel_lght_EVRY.png" preload="false" /> - <texture name="parcel_lght_EXP" file_name="icons/parcel_lght_EXP.png" preload="false" /> + <texture name="parcel_lght_EVRY" file_name="icons/parcel_lght_EVRY.png" preload="false" /> + <texture name="parcel_lght_EXP" file_name="icons/parcel_lght_EXP.png" preload="false" /> <texture name="parcel_lght_Fly" file_name="icons/parcel_lght_Fly.png" preload="false" /> <texture name="parcel_lght_FlyNo" file_name="icons/parcel_lght_FlyNo.png" preload="false" /> <texture name="parcel_lght_ForSale" file_name="icons/parcel_lght_ForSale.png" preload="false" /> @@ -488,6 +488,8 @@ with the same filename but different name <texture name="Snapshot_Over" file_name="bottomtray/Snapshot_Over.png" preload="false" /> <texture name="Snapshot_Press" file_name="bottomtray/Snapshot_Press.png" preload="false" /> + <texture name="startup_logo" file_name="windows/startup_logo.png" preload="true" /> + <texture name="Stepper_Down_Disabled" file_name="widgets/Stepper_Down_Disabled.png" preload="true" /> <texture name="Stepper_Down_Off" file_name="widgets/Stepper_Down_Off.png" preload="true" /> <texture name="Stepper_Down_Press" file_name="widgets/Stepper_Down_Press.png" preload="true" /> @@ -706,7 +708,6 @@ with the same filename but different name <texture name="tab_top_blue.tga" preload="false" scale.left="8" scale.top="8" scale.right="120" scale.bottom="9" /> <texture name="tab_top_selected_blue.tga" preload="false" scale.left="8" scale.top="8" scale.right="96" scale.bottom="9" /> - <texture name="startup_logo.j2c" preload="true" /> <texture name="color_swatch_alpha.tga" preload="true" /> <texture name="button_anim_pause.tga" /> diff --git a/indra/newview/skins/default/textures/windows/startup_logo.png b/indra/newview/skins/default/textures/windows/startup_logo.png Binary files differnew file mode 100644 index 0000000000..b89449692b --- /dev/null +++ b/indra/newview/skins/default/textures/windows/startup_logo.png diff --git a/indra/newview/skins/default/xui/en/floater_about_land.xml b/indra/newview/skins/default/xui/en/floater_about_land.xml index 8bfd64b3df..d1fd42bdd9 100644 --- a/indra/newview/skins/default/xui/en/floater_about_land.xml +++ b/indra/newview/skins/default/xui/en/floater_about_land.xml @@ -7,7 +7,7 @@ help_topic="floaterland" save_rect="true" title="ABOUT LAND" - width="460"> + width="490"> <floater.string name="Minutes"> [MINUTES] minutes @@ -25,25 +25,25 @@ remaining </floater.string> <tab_container - follows="left|top|right|bottom" - height="400" + follows="all" + height="410" layout="topleft" - left="1" + left="0" name="landtab" tab_position="top" - top="20" - width="459"> + tab_height="25" + tab_min_width="67" + top="10" + width="489"> <panel - border="true" - follows="left|top|right|bottom" - height="380" - label="General" + border="false" + follows="all" + label="GENERAL" layout="topleft" - left="1" + left="0" help_topic="land_general_tab" name="land_general_panel" - top="-31" - width="458"> + top="0"> <panel.string name="new users only"> New users only @@ -74,11 +74,11 @@ </panel.string> <panel.string name="profile_text"> - Profile... + Profile </panel.string> <panel.string name="info_text"> - Info... + Info </panel.string> <panel.string name="public_text"> @@ -95,7 +95,6 @@ <panel.string name="no_selection_text"> No parcel selected. -Go to World menu > About Land or select another parcel to show its details. </panel.string> <text type="string" @@ -103,32 +102,29 @@ Go to World menu > About Land or select another parcel to show its details. follows="left|top" height="16" layout="topleft" - left="4" + left="10" name="Name:" - top="4" - width="92"> + top="10" + width="100"> Name: </text> <line_editor - border_style="line" - border_thickness="1" - follows="left|top|right" + follows="left|top" height="16" layout="topleft" left_pad="2" max_length="63" name="Name" top_delta="0" - width="350" /> + width="365" /> <text type="string" length="1" follows="left|top" height="16" layout="topleft" - left="4" + left="10" name="Description:" - top="24" width="100"> Description: </text> @@ -136,10 +132,10 @@ Go to World menu > About Land or select another parcel to show its details. follows="left|top|right" height="52" layout="topleft" - left_delta="92" + left_pad="2" name="Description" top_delta="0" - width="350" + width="365" word_wrap="true" /> <text type="string" @@ -147,10 +143,10 @@ Go to World menu > About Land or select another parcel to show its details. follows="left|top" height="16" layout="topleft" - left="4" + left="10" name="LandType" top="84" - width="92"> + width="100"> Type: </text> <text @@ -159,7 +155,7 @@ Go to World menu > About Land or select another parcel to show its details. follows="left|top" height="16" layout="topleft" - left_delta="92" + left_pad="2" name="LandTypeText" top_delta="0" width="250"> @@ -171,10 +167,9 @@ Go to World menu > About Land or select another parcel to show its details. follows="left|top" height="16" layout="topleft" - left="4" + left="10" name="ContentRating" - top="104" - width="92"> + width="100"> Rating: </text> <text @@ -183,7 +178,7 @@ Go to World menu > About Land or select another parcel to show its details. follows="left|top" height="16" layout="topleft" - left_delta="92" + left_pad="2" name="ContentRatingText" top_delta="0" width="250"> @@ -195,10 +190,10 @@ Go to World menu > About Land or select another parcel to show its details. follows="left|top" height="16" layout="topleft" - left="4" + left="10" name="Owner:" top="124" - width="92"> + width="100"> Owner: </text> <text @@ -207,71 +202,84 @@ Go to World menu > About Land or select another parcel to show its details. follows="left|top" height="16" layout="topleft" - left_delta="92" + left_pad="5" name="OwnerText" - top_delta="0" - width="250"> + width="240"> Leyla Linden </text> - <button + <button + follows="right" + height="16" + image_pressed="Info_Press" + image_unselected="Info_Over" + left_pad="3" + name="info_btn" + top_delta="-2" + width="16" /> + <!-- <button follows="left|top" height="16" - label="Profile..." - label_selected="Profile..." + label="Profile" layout="topleft" left_pad="4" name="Profile..." - top_delta="0" - width="90" /> + width="90" />--> <text type="string" length="1" follows="left|top" height="16" layout="topleft" - left="4" + left="10" name="Group:" - top="144" - width="92"> + width="100"> Group: </text> + <!--TODO: HOOK UP GROUP ICON--> <text enabled="false" follows="left|top" height="16" + left_pad="5" layout="topleft" - left_delta="92" name="GroupText" - top_delta="2" - width="250" /> + width="240" /> + <button + follows="right" + height="16" + image_pressed="Info_Press" + image_unselected="Info_Over" + left_pad="3" + name="info_btn" + top_delta="-2" + width="16" /> <button follows="left|top" - height="16" - label="Set..." - label_selected="Set..." + height="23" + label="Set" layout="topleft" left_pad="4" + right="-10" name="Set..." - top_delta="-2" - width="90" /> + width="50" /> <check_box enabled="false" - height="16" + height="23" label="Allow Deed to Group" layout="topleft" left="96" name="check deed" tool_tip="A group officer can deed this land to the group, so it will be supported by the group's land allocation." top="164" - width="116" /> + width="146" /> <button enabled="false" follows="left|top" - height="16" - label="Deed..." - label_selected="Deed..." + height="23S" + label="Deed" layout="topleft" - left_pad="138" + left_pad="2" + right="-10" name="Deed..." tool_tip="You may only deed land if you are an officer in the selected group." top_delta="0" @@ -284,7 +292,6 @@ Go to World menu > About Land or select another parcel to show its details. left="96" name="check contrib" tool_tip="When the land is deeded to the group, the former owner contributes enough land allocation to support it." - top="184" width="199" /> <text type="string" @@ -292,10 +299,9 @@ Go to World menu > About Land or select another parcel to show its details. follows="left|top" height="16" layout="topleft" - left="4" + left="10" name="For Sale:" - top="204" - width="92"> + width="100"> For Sale: </text> <text @@ -304,11 +310,10 @@ Go to World menu > About Land or select another parcel to show its details. follows="left|top" height="16" layout="topleft" - left_delta="92" + left_pad="2" name="Not for sale." - top_delta="0" width="186"> - Not for sale. + Not for sale </text> <text type="string" @@ -318,9 +323,8 @@ Go to World menu > About Land or select another parcel to show its details. layout="topleft" left_delta="0" name="For Sale: Price L$[PRICE]." - top_delta="0" width="226"> - Price: L$[PRICE] (L$[PRICE_PER_SQM]/m²). + Price: L$[PRICE] (L$[PRICE_PER_SQM]/m²) </text> <text enabled="false" @@ -329,17 +333,16 @@ Go to World menu > About Land or select another parcel to show its details. layout="topleft" left_delta="0" name="SalePending" - top_pad="4" - width="344" /> + top_pad="6" + width="324" /> <button follows="left|top" - height="20" - label="Sell Land..." - label_selected="Sell Land..." + height="23" + label="Sell Land" layout="topleft" - left_delta="199" + left_pad="5" + right="-10" name="Sell Land..." - top_delta="0" width="145" /> <text type="string" @@ -349,7 +352,7 @@ Go to World menu > About Land or select another parcel to show its details. layout="topleft" left_delta="-199" name="For sale to" - top_delta="0" + top_delta="6" width="186"> For sale to: [BUYER] </text> @@ -361,9 +364,9 @@ Go to World menu > About Land or select another parcel to show its details. layout="topleft" left_delta="0" name="Sell with landowners objects in parcel." - top_pad="4" + top_pad="8" width="186"> - Objects included in sale. + Objects included in sale </text> <text type="string" @@ -375,17 +378,17 @@ Go to World menu > About Land or select another parcel to show its details. name="Selling with no objects in parcel." top_delta="0" width="186"> - Objects not included in sale. + Objects not included in sale </text> <button follows="left|top" - height="20" + height="23" label="Cancel Land Sale" label_selected="Cancel Land Sale" layout="topleft" - left="295" + right="-10" name="Cancel Land Sale" - top="228" + left_pad="5" width="145" /> <text type="string" @@ -393,10 +396,10 @@ Go to World menu > About Land or select another parcel to show its details. follows="left|top" height="16" layout="topleft" - left="4" + left="10" name="Claimed:" top="268" - width="92"> + width="100"> Claimed: </text> <text @@ -405,7 +408,7 @@ Go to World menu > About Land or select another parcel to show its details. follows="left|top" height="16" layout="topleft" - left_delta="92" + left_pad="2" name="DateClaimText" top_delta="0" width="186"> @@ -417,10 +420,10 @@ Go to World menu > About Land or select another parcel to show its details. follows="left|top" height="16" layout="topleft" - left="4" + left="10" name="PriceLabel" top="288" - width="92"> + width="100"> Area: </text> <text @@ -429,7 +432,7 @@ Go to World menu > About Land or select another parcel to show its details. follows="left|top" height="16" layout="topleft" - left_delta="92" + left_pad="2" name="PriceText" top_delta="0" width="186"> @@ -441,10 +444,10 @@ Go to World menu > About Land or select another parcel to show its details. follows="left|top" height="16" layout="topleft" - left="4" + left="10" name="Traffic:" top="308" - width="92"> + width="100"> Traffic: </text> <text @@ -453,7 +456,7 @@ Go to World menu > About Land or select another parcel to show its details. follows="left|top" height="16" layout="topleft" - left_delta="92" + left_pad="2" name="DwellText" top_delta="0" width="186"> @@ -462,31 +465,28 @@ Go to World menu > About Land or select another parcel to show its details. <button enabled="false" follows="left|top" - height="20" - label="Buy Land..." - label_selected="Buy Land..." + height="23" + label="Buy Land" layout="topleft" - left="155" + left_delta="82" name="Buy Land..." top="328" width="100" /> <button enabled="false" follows="left|top" - height="20" - label="Buy For Group..." - label_selected="Buy For Group..." + height="23" + label="Buy For Group" layout="topleft" - left="260" + right="-10" name="Buy For Group..." top="352" width="180" /> <button enabled="false" follows="left|top" - height="20" - label="Buy Pass..." - label_selected="Buy Pass..." + height="23" + label="Buy Pass" layout="topleft" left_delta="-105" name="Buy Pass..." @@ -495,30 +495,27 @@ Go to World menu > About Land or select another parcel to show its details. width="100" /> <button follows="left|top" - height="20" - label="Abandon Land..." - label_selected="Abandon Land..." + height="23" + label="Abandon Land" layout="topleft" - left="260" + right="-10" name="Abandon Land..." top="328" width="180" /> <button follows="left|top" - height="20" - label="Reclaim Land..." - label_selected="Reclaim Land..." + height="23" + label="Reclaim Land" layout="topleft" left_delta="0" name="Reclaim Land..." - top_delta="-48" + top_delta="-50" width="180" /> <button enabled="false" follows="left|top" - height="20" - label="Linden Sale..." - label_selected="Linden Sale..." + height="23" + label="Linden Sale" layout="topleft" left_delta="0" name="Linden Sale..." @@ -528,15 +525,13 @@ Go to World menu > About Land or select another parcel to show its details. </panel> <panel border="true" - follows="left|top|right|bottom" - height="380" - label="Covenant" + follows="all" + label="COVENANT" layout="topleft" - left_delta="-1" + left="0" + top="0" help_topic="land_covenant_tab" - name="land_covenant_panel" - top_delta="-47" - width="458"> + name="land_covenant_panel"> <panel.string name="can_resell"> Purchased land in this region may be resold. @@ -557,13 +552,12 @@ Go to World menu > About Land or select another parcel to show its details. type="string" length="1" follows="left|top" - font="SansSerif" - height="20" + height="16" layout="topleft" - left="5" + left="10" mouse_opaque="false" name="estate_section_lbl" - top="0" + top="10" width="100"> Estate: </text> @@ -571,38 +565,24 @@ Go to World menu > About Land or select another parcel to show its details. type="string" length="1" follows="left|top" - height="20" + height="16" layout="topleft" - left="10" - mouse_opaque="false" - name="estate_name_lbl" - top="20" - width="100"> - Name: - </text> - <text - type="string" - length="1" - follows="left|top" - height="20" - layout="topleft" - left_pad="10" + left_pad="0" mouse_opaque="false" name="estate_name_text" top_delta="0" - width="150"> + width="260"> mainland </text> <text type="string" length="1" follows="left|top" - height="20" + height="16" layout="topleft" left="10" mouse_opaque="false" name="estate_owner_lbl" - top="40" width="100"> Owner: </text> @@ -610,55 +590,52 @@ Go to World menu > About Land or select another parcel to show its details. type="string" length="1" follows="left|top" - height="20" + height="16" layout="topleft" - left_pad="10" + left_pad="0" mouse_opaque="false" name="estate_owner_text" - top_delta="0" - width="150"> + width="300"> (none) </text> <text_editor type="string" length="1" enabled="false" - follows="left|top|right|bottom" - handle_edit_keys_directly="true" - height="115" + follows="all" + handle_edit_keys_directly="true" + height="200" layout="topleft" - left_delta="0" + left="10" max_length="65535" name="covenant_editor" - top_delta="20" - width="330" + width="470" word_wrap="true"> There is no Covenant provided for this Estate. </text_editor> <text type="string" length="1" - follows="left|top" - height="20" + follows="right|top" + height="16" + halign="right" layout="topleft" - left_delta="0" + right="-10" + top_pad="0" mouse_opaque="false" name="covenant_timestamp_text" - top_pad="55" - width="250"> + width="460"> Last Modified Wed Dec 31 16:00:00 1969 </text> <text type="string" length="1" follows="left|top" - font="SansSerif" - height="20" + height="16" layout="topleft" - left="5" + left="10" mouse_opaque="false" name="region_section_lbl" - top="250" width="100"> Region: </text> @@ -666,38 +643,23 @@ Go to World menu > About Land or select another parcel to show its details. type="string" length="1" follows="left|top" - height="20" - layout="topleft" - left="10" - mouse_opaque="false" - name="region_name_lbl" - top="270" - width="100"> - Name: - </text> - <text - type="string" - length="1" - follows="left|top" - height="20" + height="16" layout="topleft" left_pad="10" mouse_opaque="false" name="region_name_text" - top_delta="0" width="150"> - leyla + EricaVille </text> <text type="string" length="1" follows="left|top" - height="20" + height="16" layout="topleft" left="10" mouse_opaque="false" name="region_landtype_lbl" - top="290" width="100"> Type: </text> @@ -705,12 +667,11 @@ Go to World menu > About Land or select another parcel to show its details. type="string" length="1" follows="left|top" - height="20" + height="16" layout="topleft" left_pad="10" mouse_opaque="false" name="region_landtype_text" - top_delta="0" width="150"> Mainland / Homestead </text> @@ -718,12 +679,11 @@ Go to World menu > About Land or select another parcel to show its details. type="string" length="1" follows="left|top" - height="20" + height="16" layout="topleft" left="10" mouse_opaque="false" name="region_maturity_lbl" - top="310" width="100"> Rating: </text> @@ -731,12 +691,11 @@ Go to World menu > About Land or select another parcel to show its details. type="string" length="1" follows="left|top" - height="20" + height="16" layout="topleft" left_pad="10" mouse_opaque="false" name="region_maturity_text" - top_delta="0" width="150"> Adult </text> @@ -744,12 +703,11 @@ Go to World menu > About Land or select another parcel to show its details. type="string" length="1" follows="left|top" - height="20" + height="16" layout="topleft" left="10" mouse_opaque="false" name="resellable_lbl" - top="330" width="100"> Resale: </text> @@ -757,12 +715,11 @@ Go to World menu > About Land or select another parcel to show its details. type="string" length="1" follows="left|top" - height="20" + height="16" layout="topleft" left_pad="10" mouse_opaque="false" name="resellable_clause" - top_delta="0" width="330"> Land in this region may not be resold. </text> @@ -770,12 +727,11 @@ Go to World menu > About Land or select another parcel to show its details. type="string" length="1" follows="left|top" - height="20" + height="30" layout="topleft" left="10" mouse_opaque="false" name="changeable_lbl" - top="350" width="100"> Subdivide: </text> @@ -788,22 +744,20 @@ Go to World menu > About Land or select another parcel to show its details. left_pad="10" mouse_opaque="false" name="changeable_clause" - top_delta="0" + word_wrap="true" width="330"> Land in this region may not be joined/subdivided. </text> </panel> <panel border="true" - follows="left|top|right|bottom" - height="380" - label="Objects" + follows="all" + label="OBJECTS" layout="topleft" - left_delta="0" + left="0" + top="0" help_topic="land_objects_tab" - name="land_objects_panel" - top_delta="-47" - width="458"> + name="land_objects_panel"> <panel.string name="objects_available_text"> [COUNT] out of [MAX] ([AVAILABLE] available) @@ -818,7 +772,7 @@ Go to World menu > About Land or select another parcel to show its details. follows="left|top" height="16" layout="topleft" - left="4" + left="10" name="parcel_object_bonus" top="4" visible="false" @@ -835,7 +789,7 @@ Go to World menu > About Land or select another parcel to show its details. name="Simulator primitive usage:" top_pad="4" width="364"> - Simulator primitive usage: + Primative usage: </text> <text type="string" @@ -855,11 +809,11 @@ Go to World menu > About Land or select another parcel to show its details. follows="left|top" height="16" layout="topleft" - left="4" + left="10" name="Primitives parcel supports:" top="44" width="152"> - Primitives parcel supports: + Prims parcel supports: </text> <text type="string" @@ -879,11 +833,11 @@ Go to World menu > About Land or select another parcel to show its details. follows="left|top" height="16" layout="topleft" - left="4" + left="10" name="Primitives on parcel:" top="64" width="152"> - Primitives on parcel: + Prims on parcel: </text> <text type="string" @@ -925,7 +879,7 @@ Go to World menu > About Land or select another parcel to show its details. bottom="100" enabled="false" follows="left|top" - height="16" + height="20" label="Show" label_selected="Show" layout="topleft" @@ -936,9 +890,8 @@ Go to World menu > About Land or select another parcel to show its details. bottom="100" enabled="false" follows="left|top" - height="16" - label="Return..." - label_selected="Return..." + height="20" + label="Return" layout="topleft" name="ReturnOwner..." right="-10" @@ -972,8 +925,8 @@ Go to World menu > About Land or select another parcel to show its details. bottom="120" enabled="false" follows="left|top" - height="16" label="Show" + height="20" label_selected="Show" layout="topleft" name="ShowGroup" @@ -983,9 +936,8 @@ Go to World menu > About Land or select another parcel to show its details. bottom="120" enabled="false" follows="left|top" - height="16" - label="Return..." - label_selected="Return..." + height="20" + label="Return" layout="topleft" name="ReturnGroup..." right="-10" @@ -1019,7 +971,7 @@ Go to World menu > About Land or select another parcel to show its details. bottom="140" enabled="false" follows="left|top" - height="16" + height="20" label="Show" label_selected="Show" layout="topleft" @@ -1030,9 +982,8 @@ Go to World menu > About Land or select another parcel to show its details. bottom="140" enabled="false" follows="left|top" - height="16" - label="Return..." - label_selected="Return..." + height="20" + label="Return" layout="topleft" name="ReturnOther..." right="-10" @@ -1068,7 +1019,7 @@ Go to World menu > About Land or select another parcel to show its details. follows="left|top" height="16" layout="topleft" - left="4" + left="10" name="Autoreturn" top="164" width="294"> @@ -1091,44 +1042,43 @@ Go to World menu > About Land or select another parcel to show its details. follows="left|top" height="16" layout="topleft" - left="4" + left="10" name="Object Owners:" top="184" width="104"> Object Owners: </text> - <button - follows="left|top" - height="16" - label="Refresh List" - label_selected="Refresh List" - layout="topleft" - left_delta="104" - name="Refresh List" - top_delta="0" - width="106" /> + <button + follows="top|right" + height="20" + image_overlay="Refresh_Off" + layout="topleft" + name="Refresh List" + left_pad="5" + right="-183" + tool_tip="Refresh Object List" + width="20" /> <button enabled="false" follows="left|top" - height="16" - label="Return objects..." - label_selected="Return objects..." + height="20" + label="Return Objects" layout="topleft" left_pad="6" name="Return objects..." top_delta="0" + right="-10" width="164" /> <name_list column_padding="0" draw_heading="true" - follows="left|top|right|bottom" - height="165" + follows="all" + height="190" layout="topleft" - left="4" + left="10" name="owner list" name_column="name" - top="210" - width="450"> + width="470"> <name_list.columns label="Type" name="type" @@ -1153,15 +1103,13 @@ Go to World menu > About Land or select another parcel to show its details. </panel> <panel border="true" - follows="left|top|right|bottom" - height="333" - label="Options" + follows="all" + label="OPTIONS" layout="topleft" - left_delta="0" help_topic="land_options_tab" name="land_options_panel" - top_delta="31" - width="458"> + left="0" + top="0"> <panel.string name="search_enabled_tooltip"> Let people see this parcel in search results @@ -1177,7 +1125,7 @@ Only large parcels can be listed in search. </panel.string> <panel.string name="mature_check_mature"> - Mature Content + Moderate Content </panel.string> <panel.string name="mature_check_adult"> @@ -1185,7 +1133,7 @@ Only large parcels can be listed in search. </panel.string> <panel.string name="mature_check_mature_tooltip"> - Your parcel information or content is considered mature. + Your parcel information or content is considered moderate. </panel.string> <panel.string name="mature_check_adult_tooltip"> @@ -1207,11 +1155,12 @@ Only large parcels can be listed in search. type="string" length="1" follows="left|top" + text_color="white" height="16" layout="topleft" - left="4" + left="10" name="allow_label" - top="4" + top="10" width="278"> Allow other residents to: </text> @@ -1222,44 +1171,40 @@ Only large parcels can be listed in search. left="14" name="edit land check" tool_tip="If checked, anyone can terraform your land. It is best to leave this unchecked, as you can always edit your own land." - top="24" - width="268" /> + top_pad="4" + width="147i" /> <check_box height="16" label="Fly" layout="topleft" - left_delta="0" name="check fly" tool_tip="If checked, Residents can fly on your land. If unchecked, they can only fly into and over your land." - top_pad="4" - width="268" /> + left_pad="4" + width="150" /> <text type="string" length="1" follows="left|top" height="16" layout="topleft" - left="178" + left="14" name="allow_label2" - top="24" - width="104"> - Create Objects: + width="150"> + Build: </text> <check_box height="16" - label="All Residents" + label="Everyone" layout="topleft" - left_delta="92" + left_pad="2" name="edit objects check" - top_delta="0" - width="104" /> + width="120" /> <check_box height="16" label="Group" layout="topleft" - left_delta="100" + left_pad="2" name="edit group objects check" - top_delta="0" width="70" /> <text type="string" @@ -1267,17 +1212,16 @@ Only large parcels can be listed in search. follows="left|top" height="16" layout="topleft" - left="178" + left="14" name="allow_label3" - top="44" - width="124"> + width="150"> Object Entry: </text> <check_box height="16" - label="All Residents" + label="Everyone" layout="topleft" - left_delta="92" + left_pad="2" name="all object entry check" top_delta="0" width="120" /> @@ -1285,7 +1229,7 @@ Only large parcels can be listed in search. height="16" label="Group" layout="topleft" - left_delta="100" + left_pad="2" name="group object entry check" top_delta="0" width="70" /> @@ -1295,17 +1239,16 @@ Only large parcels can be listed in search. follows="left|top" height="16" layout="topleft" - left="178" + left="14" name="allow_label4" - top="64" - width="124"> + width="150"> Run Scripts: </text> <check_box height="16" - label="All Residents" + label="Everyone" layout="topleft" - left_delta="92" + left_pad="2" name="check other scripts" top_delta="0" width="120" /> @@ -1313,19 +1256,19 @@ Only large parcels can be listed in search. height="16" label="Group" layout="topleft" - left_delta="100" + left_pad="2" name="check group scripts" top_delta="0" width="70" /> <text type="string" + text_color="white" length="1" follows="left|top" height="16" layout="topleft" - left="4" + left="10" name="land_options_label" - top="84" width="278"> Land Options: </text> @@ -1336,33 +1279,31 @@ Only large parcels can be listed in search. left="14" name="check safe" tool_tip="If checked, sets the land to Safe, disabling damage combat. If cleared, damage combat is enabled." - top="104" - width="268" /> + top_pad="5" + width="200" /> <check_box height="16" label="No Pushing" layout="topleft" - left_delta="164" + left_pad="5" name="PushRestrictCheck" tool_tip="Prevents scripts from pushing. Checking this option may be useful for preventing disruptive behavior on your land." top_delta="0" width="119" /> <check_box height="16" - label="Show Place in Search (L$30/week) under" + label="Show Place in Search (L$30/week)" layout="topleft" left="14" name="ShowDirectoryCheck" tool_tip="Let people see this parcel in search results" - top="124" - width="268" /> + width="430" /> <combo_box enabled="false" - height="18" + height="20" layout="topleft" - left_delta="241" + left="30" name="land category with adult" - top_delta="-2" visible="false" width="130"> <combo_box.item @@ -1420,11 +1361,10 @@ Only large parcels can be listed in search. </combo_box> <combo_box enabled="false" - height="18" + height="20" layout="topleft" - left_delta="0" + left="30" name="land category" - top_delta="0" visible="false" width="130"> <combo_box.item @@ -1478,12 +1418,12 @@ Only large parcels can be listed in search. </combo_box> <check_box height="16" - label="Mature Content" + label="Moderate Content" layout="topleft" left="14" name="MatureCheck" + top="177" tool_tip=" " - top="144" width="107" /> <text type="string" @@ -1491,74 +1431,75 @@ Only large parcels can be listed in search. follows="left|top" height="16" layout="topleft" - left="4" + left="10" name="Snapshot:" - top="164" - width="278"> + text_color="white" + top="220" + width="200"> Snapshot: </text> <texture_picker follows="left|top" - height="135" + height="150" layout="topleft" - left_delta="72" + left="14" name="snapshot_ctrl" tool_tip="Click to choose a picture" - top_delta="0" - width="180" /> + width="195" /> <text type="string" length="1" follows="left|top" - height="16" + height="30" layout="topleft" - left="4" + left="220" + top="180" + text_color="white" name="landing_point" - top="287" - width="278"> + word_wrap="true" + width="200"> Landing Point: [LANDING] </text> <button - follows="left|top" - height="16" + follows="right|top" + height="23" label="Set" label_selected="Set" layout="topleft" - left_delta="232" name="Set" + right="-68" tool_tip="Sets the landing point where visitors arrive. Sets to your avatar's location inside this parcel." - top_delta="0" width="50" /> <button - follows="left|top" - height="16" + follows="right|top" + height="23" label="Clear" label_selected="Clear" layout="topleft" left_pad="5" name="Clear" tool_tip="Clear the landing point" - top_delta="0" + right="-10" width="50" /> <text type="string" length="1" + text_color="white" follows="left|top" height="16" layout="topleft" - left="4" + left="220" + top_pad="10" name="Teleport Routing: " - top="307" - width="278"> + width="200"> Teleport Routing: </text> <combo_box - height="18" + height="23" layout="topleft" - left_delta="116" name="landing type" + top_pad="3" tool_tip="Teleport Routing -- select how to handle teleports onto your land" - top_delta="0" width="120"> <combo_box.item enabled="true" @@ -1579,34 +1520,31 @@ Only large parcels can be listed in search. </panel> <panel border="true" - follows="left|top|right|bottom" - height="363" - label="Media" + follows="all" + label="MEDIA" layout="topleft" - left_delta="0" + left="0" + top="0" help_topic="land_media_tab" - name="land_media_panel" - top_delta="1" - width="458"> + name="land_media_panel"> <text type="string" length="1" follows="left|top" - height="16" + height="20" layout="topleft" left="10" name="with media:" - top="9" - width="65"> + top="10" + width="100"> Type: </text> <combo_box - height="18" + height="20" layout="topleft" - left_pad="5" + left_pad="0" name="media type" tool_tip="Specify if the URL is a movie, web page, or other media" - top_delta="-2" width="120" /> <text follows="left|top" @@ -1614,79 +1552,70 @@ Only large parcels can be listed in search. layout="topleft" left_pad="10" name="mime_type" - top_delta="2" width="200" /> <text type="string" length="1" follows="left|top" - height="16" + height="20" layout="topleft" left="10" name="at URL:" - top="29" - width="65"> + width="100"> Home URL: </text> <line_editor - bottom_delta="0" follows="left|top" - height="16" + height="20" layout="topleft" - left="80" + left_pad="0" max_length="255" name="media_url" - right="-80" select_on_focus="true" - text_readonly_color="0.576471 0.662745 0.835294 1" /> + width="300" /> <button - follows="left|top" - height="16" - label="Set..." - label_selected="Set..." + follows="right|top" + height="22" + label="Set" layout="topleft" - left_pad="8" + left_pad="5" + right="-10" name="set_media_url" - top_delta="0" - width="60" /> + width="50" /> <text type="string" length="1" follows="left|top" - height="16" + height="20" layout="topleft" left="10" name="CurrentURL:" - top="49" - width="65"> + width="100"> Current URL: </text> + <button + follows="top|right" + height="20" + image_overlay="Refresh_Off" + layout="topleft" + name="reset_media_url" + left_pad="0" + tool_tip="Refresh URL" + width="20" /> <text follows="left|top" height="16" layout="topleft" - left_pad="5" + left_pad="10" name="current_url" - top_delta="0" width="300" /> - <button - follows="left|top" - height="16" - label="Reset..." - label_selected="Reset..." - layout="topleft" - left_pad="6" - name="reset_media_url" - top_delta="0" - width="60" /> <check_box height="16" label="Hide URL" layout="topleft" - left="100" + left="110" name="hide_media_url" tool_tip="Checking this option will hide the media url to any non-authorized viewers of this parcel information. Note this is not available for HTML types." - top="89" width="200" /> <text type="string" @@ -1696,23 +1625,20 @@ Only large parcels can be listed in search. layout="topleft" left="10" name="Description:" - top="49" width="364"> Description: </text> <line_editor - border_style="line" - border_thickness="1" - bottom_delta="0" follows="left|top" - height="16" + height="20" layout="topleft" - left="80" + left="110" max_length="255" name="url_description" - right="-80" select_on_focus="true" - tool_tip="Text displayed next to play/load button" /> + tool_tip="Text displayed next to play/load button" + top_delta="10" + width="300" /> <text type="string" length="1" @@ -1721,10 +1647,10 @@ Only large parcels can be listed in search. layout="topleft" left="10" name="Media texture:" - top="69" - width="364"> - Replace -Texture: + top_pad="10" + width="364" + word_wrap="true"> + Replace Texture: </text> <texture_picker allow_no_texture="true" @@ -1732,46 +1658,44 @@ Texture: follows="left|top" height="80" layout="topleft" - left_delta="70" + left="110" name="media texture" tool_tip="Click to choose a picture" - top_delta="0" + top_delta="10" width="64" /> <text type="string" length="1" follows="left|top" - height="16" + height="80" layout="topleft" - left_delta="75" + left_pad="8" name="replace_texture_help" - top="85" - width="270"> - Objects using this texture will show the movie or - web page after you click the play arrow. + width="300" + word_wrap="true"> + Objects using this texture will show the movie or web page after you click the play arrow. - Select the thumbnail to choose a different texture. +Select the thumbnail to choose a different texture. </text> <check_box height="16" label="Auto scale" layout="topleft" - left_delta="70" + left="110" name="media_auto_scale" + top_pad="0" tool_tip="Checking this option will scale the content for this parcel automatically. It may be slightly slower and lower quality visually but no other texture scaling or alignment will be required." - top_delta="0" width="200" /> <text type="string" length="1" follows="left|top" - height="16" + height="20" layout="topleft" - left="85" + left="10" name="media_size" tool_tip="Size to render Web media, leave 0 for default." - top="185" - width="85"> + width="100"> Size: </text> <spinner @@ -1779,11 +1703,11 @@ Texture: enabled="false" follows="left|top" halign="right" - height="16" + height="20" increment="1" initial_value="0" layout="topleft" - left_delta="65" + left_pad="0" max_val="1024" name="media_size_width" tool_tip="Size to render Web media, leave 0 for default." @@ -1794,7 +1718,7 @@ Texture: enabled="false" follows="left|top" halign="right" - height="16" + height="20" increment="1" initial_value="0" layout="topleft" @@ -1811,7 +1735,7 @@ Texture: follows="left|top" height="16" layout="topleft" - left_delta="70" + left_pad="5" name="pixels" right="-10"> pixels @@ -1824,15 +1748,15 @@ Texture: layout="topleft" left="10" name="Options:" - top="237" - width="292"> + top_pad="8" + width="100"> Options: </text> <check_box height="16" label="Loop" layout="topleft" - left_delta="70" + left_pad="0" name="media_loop" tool_tip="Play media in a loop. When the media has finished playing, it will restart from the beginning." top_delta="0" @@ -1840,15 +1764,13 @@ Texture: </panel> <panel border="true" - follows="left|top|right|bottom" - height="363" - label="Audio" + follows="all" + label="SOUND" layout="topleft" - left_delta="0" + left="0" + top="0" help_topic="land_audio_tab" - name="land_audio_panel" - top_delta="1" - width="458"> + name="land_audio_panel"> <text type="string" length="1" @@ -1856,21 +1778,19 @@ Texture: height="16" layout="topleft" left="10" + top="10" name="MusicURL:" - top="225" width="364"> Music URL: </text> <line_editor - border_style="line" - border_thickness="1" - bottom_delta="0" follows="left|top" - height="16" + height="20" layout="topleft" - left="80" + left="100" max_length="255" name="music_url" + top_pad="0" right="-15" select_on_focus="true" /> <text @@ -1881,17 +1801,16 @@ Texture: layout="topleft" left="10" name="Sound:" - top="265" - width="364"> + top_pad="10" + width="100"> Sound: </text> <check_box height="16" label="Restrict gesture and object sounds to this parcel" layout="topleft" - left_delta="70" name="check sound local" - top_delta="0" + left_pad="0" width="292" /> <text type="string" @@ -1902,47 +1821,42 @@ Texture: left="10" mouse_opaque="false" name="Voice settings:" - top="305" - width="364"> + top_pad="10" + width="100"> Voice: </text> <check_box - height="54" + height="16" label="Enable Voice" layout="topleft" - left="80" + left_pad="0" name="parcel_enable_voice_channel" - top="267" - width="463" /> + width="300" /> <check_box enabled="false" - height="54" + height="16" label="Enable Voice (established by the Estate)" layout="topleft" - left_delta="0" + left="110" name="parcel_enable_voice_channel_is_estate_disabled" - top_delta="0" - width="463" /> + width="300" /> <check_box - height="54" + height="16" label="Restrict Voice to this parcel" layout="topleft" - left="100" + left="110" name="parcel_enable_voice_channel_parcel" - top="287" - width="443" /> + width="300" /> </panel> <panel border="true" - follows="left|top|right|bottom" - height="333" - label="Access" + follows="all" + label="ACCESS" layout="topleft" - left_delta="0" + left="0" + top="0" help_topic="land_access_tab" - name="land_access_panel" - top_delta="31" - width="458"> + name="land_access_panel"> <panel.string name="estate_override"> One or more of these options is set at the estate level @@ -1951,13 +1865,13 @@ Texture: type="string" length="1" follows="left|top" - font="SansSerif" - height="20" + height="16" layout="topleft" - left="8" + left="10" name="Limit access to this parcel to:" - top="4" - width="278"> + text_color="White" + top="10" + width="400"> Access To This Parcel </text> <check_box @@ -2012,7 +1926,7 @@ Texture: width="278" /> <check_box enabled="false" - height="16" + height="22" label="Sell passes to:" layout="topleft" left_delta="0" @@ -2021,7 +1935,7 @@ Texture: top_pad="4" width="120" /> <combo_box - height="16" + height="20" layout="topleft" left_pad="22" name="pass_combo" @@ -2039,7 +1953,7 @@ Texture: <spinner enabled="false" follows="left|top" - height="16" + height="22" increment="1" initial_value="10" label="Price in L$:" @@ -2049,12 +1963,12 @@ Texture: max_val="500" min_val="1" name="PriceSpin" - top="149" - width="180" /> + top_pad="5" + width="200" /> <spinner enabled="false" follows="left|top" - height="16" + height="22" increment="0.25" initial_value="1" label="Hours of access:" @@ -2064,8 +1978,15 @@ Texture: max_val="24" min_val="0.01" name="HoursSpin" - top_pad="4" - width="180" /> + top_pad="5" + width="200" /> + <panel + name="Allowed_layout_panel" + follows="top|left" + left="10" + height="170" + top_pad="8" + width="240"> <text type="string" length="1" @@ -2073,44 +1994,48 @@ Texture: height="16" label="Always Allow" layout="topleft" - left="20" + left="0" name="AllowedText" - top="204" - width="195"> + top="0" + width="230"> Allowed Residents </text> <name_list column_padding="0" follows="top|bottom" heading_height="14" - height="80" + height="120" layout="topleft" - left_delta="0" + left="0" multi_select="true" name="AccessList" tool_tip="([LISTED] listed, [MAX] max)" - top_pad="4" - width="195" /> + width="240" /> <button follows="bottom" - height="16" - label="Add..." - label_selected="Add..." + height="23" + label="Add" layout="topleft" - left_delta="5" + left="0" name="add_allowed" - top="308" - width="80" /> + width="100" /> <button follows="bottom" - height="16" + height="23" label="Remove" label_selected="Remove" layout="topleft" - left_pad="20" + left_pad="10" name="remove_allowed" - top_delta="0" - width="80" /> + right="-1" + width="100" /> + </panel> + <panel + name="Banned_layout_panel" + follows="top|right" + height="170" + width="240" + left_pad="8"> <text type="string" length="1" @@ -2118,45 +2043,43 @@ Texture: height="16" label="Ban" layout="topleft" - left="240" + left="0" name="BanCheck" - top="204" - width="195"> + top="0" + width="200"> Banned Residents </text> <name_list column_padding="0" follows="top|bottom" heading_height="14" - height="80" + height="120" layout="topleft" - left_delta="0" + left="0" multi_select="true" name="BannedList" tool_tip="([LISTED] listed, [MAX] max)" - top_pad="4" - width="195" /> + width="240" /> <button follows="bottom" - height="16" - label="Add..." - label_selected="Add..." + height="23" + label="Add" layout="topleft" - left_delta="5" + left="0" name="add_banned" - top="308" - width="80" /> + width="100" /> <button enabled="false" follows="bottom" - height="16" + height="23" label="Remove" label_selected="Remove" layout="topleft" - left_pad="20" + left_pad="10" name="remove_banned" - top_delta="0" - width="80" /> + right="-1" + width="100" /> + </panel> </panel> </tab_container> </floater> diff --git a/indra/newview/skins/default/xui/en/floater_nearby_chat.xml b/indra/newview/skins/default/xui/en/floater_nearby_chat.xml index 0856049374..c8aab2c1e0 100644 --- a/indra/newview/skins/default/xui/en/floater_nearby_chat.xml +++ b/indra/newview/skins/default/xui/en/floater_nearby_chat.xml @@ -1,5 +1,12 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater + border_visible = "false" + border_drop_shadow_visible = "false" + drop_shadow_visible = "false" + border = "false" + bg_opaque_image="Inspector_Background" + bg_alpha_image="Toast_Background" + bg_alpha_color="0 0 0 0" legacy_header_height="18" can_minimize="false" can_tear_off="false" diff --git a/indra/newview/skins/default/xui/en/floater_report_abuse.xml b/indra/newview/skins/default/xui/en/floater_report_abuse.xml index 91ca3ef27a..f1a75bfcb4 100644 --- a/indra/newview/skins/default/xui/en/floater_report_abuse.xml +++ b/indra/newview/skins/default/xui/en/floater_report_abuse.xml @@ -309,7 +309,7 @@ name="Indecency__Mature_content_in_PG_region" value="60" /> <combo_box.item - label="Indecency > Inappropriate content or conduct in a Mature region" + label="Indecency > Inappropriate content or conduct in a Moderate region" name="Indecency__Inappropriate_content_in_Mature_region" value="69" /> <combo_box.item diff --git a/indra/newview/skins/default/xui/en/floater_test_text_editor.xml b/indra/newview/skins/default/xui/en/floater_test_text_editor.xml new file mode 100644 index 0000000000..b0aa5c7c4f --- /dev/null +++ b/indra/newview/skins/default/xui/en/floater_test_text_editor.xml @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<floater + legacy_header_height="18" + can_resize="true" + height="600" + layout="topleft" + name="floater_test_text_editor" + width="800"> + <text_editor + height="50" + follows="top|left|bottom" + layout="topleft" + left="10" + name="test_text_editor" + tool_tip="text editor" + top="25" + width="200"> + Text Editor + </text_editor> +</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 033070607b..8fc2677cbe 100644 --- a/indra/newview/skins/default/xui/en/floater_test_textbox.xml +++ b/indra/newview/skins/default/xui/en/floater_test_textbox.xml @@ -21,6 +21,21 @@ Third line of multiple lines Fourth line of multiple lines Fifth line of multiple lines </text> + <text + clip_partial="true" + top_pad="10" + left="10" + width="267" + height="28" + layout="topleft" + follows="right|left" + text_color="white" + use_ellipses="true" + word_wrap="true" + mouse_opaque="false" + name="title" > + This text has word_wrap set true, use_ellipses set true, and clip_partial set true, so it should wrap around, spilling over to the last line, then clip the last partial line and show ellipses to indicate there is more text + </text> <text font="SansSerif" @@ -28,7 +43,7 @@ Fifth line of multiple lines height="10" layout="topleft" left_delta="0" - top_pad="40" + top_pad="10" width="300"> SansSerif BOLD </text> diff --git a/indra/newview/skins/default/xui/en/floater_world_map.xml b/indra/newview/skins/default/xui/en/floater_world_map.xml index c0eca91a46..9c11a88c34 100644 --- a/indra/newview/skins/default/xui/en/floater_world_map.xml +++ b/indra/newview/skins/default/xui/en/floater_world_map.xml @@ -393,21 +393,21 @@ </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="5" - top="11" - mouse_opaque="true" - name="friends_icon" - width="16" /> + 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="5" + top="11" + mouse_opaque="true" + name="friends_icon" + width="16" /> <combo_box allow_text_entry="true" follows="top|right" diff --git a/indra/newview/skins/default/xui/en/inspect_avatar.xml b/indra/newview/skins/default/xui/en/inspect_avatar.xml index dd3cf079db..8349f594d9 100644 --- a/indra/newview/skins/default/xui/en/inspect_avatar.xml +++ b/indra/newview/skins/default/xui/en/inspect_avatar.xml @@ -19,7 +19,7 @@ <!-- Allowed fields include: [BORN_ON] ("12/3/2008") [SL_PROFILE] (Second Life profile), - [RW_PROFILE] (real world profile), + [RW_PROFILE] (real world profile), [ACCTTYPE] ("Resident"), [PAYMENTINFO] ("Payment Info on File"), [AGE] ("1 year 2 months") @@ -32,10 +32,6 @@ name="Details"> [SL_PROFILE] </string> - <string - name="Partner"> - Partner: [PARTNER] - </string> <text follows="all" font="SansSerifLarge" @@ -52,31 +48,20 @@ height="16" left="8" name="user_subtitle" - font="SansSerifSmall" - text_color="White" + font="SansSerifSmall" + text_color="White" value="11 Months, 3 days old" width="175" use_ellipses="true" /> <text follows="all" - height="25" - left="8" + height="35" + left="8" name="user_details" word_wrap="true" top_pad="6" width="220">This is my second life description and I really think it is great. </text> - <text - follows="all" - height="13" - left="8" - name="user_partner" - top_pad="3" - width="220" - use_ellipses="true" - word_wrap="false"> - Erica Linden - </text> <slider follows="top|left" height="23" @@ -113,8 +98,9 @@ name="avatar_icon" top="10" width="38" /> - <!-- Overlapping buttons for default actions - llinspectavatar.cpp makes visible the most likely default action --> +<!-- Overlapping buttons for default actions + llinspectavatar.cpp makes visible the most likely default action +--> <button follows="bottom|left" height="20" @@ -131,9 +117,8 @@ top_delta="0" name="im_btn" width="80" - commit_callback.function="InspectAvatar.IM" - /> - <button + commit_callback.function="InspectAvatar.IM"/> + <button follows="top|left" height="20" label="More" @@ -153,7 +138,7 @@ right="-5" top_delta="0" width="35" /> - <menu_button + <menu_button follows="top|left" height="20" image_overlay="OptionsMenu_Off" diff --git a/indra/newview/skins/default/xui/en/inspect_group.xml b/indra/newview/skins/default/xui/en/inspect_group.xml index 3929e3277a..37ae5a64d7 100644 --- a/indra/newview/skins/default/xui/en/inspect_group.xml +++ b/indra/newview/skins/default/xui/en/inspect_group.xml @@ -9,7 +9,7 @@ bg_opaque_image="Inspector_Background" can_close="false" can_minimize="false" - height="148" + height="158" layout="topleft" name="inspect_group" single_instance="true" @@ -49,6 +49,7 @@ height="45" left="8" name="group_details" + use_ellipses="true" top_pad="6" width="220" word_wrap="true"> @@ -60,7 +61,7 @@ Fear the moose! Fear it! And the mongoose too! height="13" left="8" name="group_cost" - top_pad="3" + top_pad="13" width="220"> L$123 to join </text> @@ -78,7 +79,7 @@ L$123 to join height="23" label="Join" left="8" - top="266" + top="286" name="join_btn" width="103" commit_callback.function="InspectGroup.Join"/> @@ -87,7 +88,7 @@ L$123 to join height="23" label="Leave" left="8" - top="266" + top="286" name="leave_btn" width="103" commit_callback.function="InspectGroup.Leave"/> @@ -96,7 +97,7 @@ L$123 to join height="23" label="View Profile" name="view_profile_btn" - top="266" + top="286" left="117" width="103" commit_callback.function="InspectGroup.ViewProfile" /> diff --git a/indra/newview/skins/default/xui/en/main_view.xml b/indra/newview/skins/default/xui/en/main_view.xml index eee1134d15..a11ebf5af8 100644 --- a/indra/newview/skins/default/xui/en/main_view.xml +++ b/indra/newview/skins/default/xui/en/main_view.xml @@ -10,22 +10,16 @@ <layout_stack border_size="0" follows="all" mouse_opaque="false" - height="768" + height="749" name="menu_stack" orientation="vertical" - top="0"> + top="19"> <layout_panel auto_resize="false" - height="84" + height="65" mouse_opaque="false" - name="nav_and_status_bar_region" + name="nav_bar_container" width="1024" visible="false"> - <panel follows="left|right|bottom" - left="0" - name="nav_bar_container" - right="1024" - top="19" - height="65"/> </layout_panel> <layout_panel auto_resize="true" follows="all" diff --git a/indra/newview/skins/default/xui/en/menu_login.xml b/indra/newview/skins/default/xui/en/menu_login.xml index 07940e18b6..a22dc80f4e 100644 --- a/indra/newview/skins/default/xui/en/menu_login.xml +++ b/indra/newview/skins/default/xui/en/menu_login.xml @@ -185,21 +185,42 @@ <menu_item_call.on_click function="Advanced.ShowSideTray" /> </menu_item_call> + <menu + label="UI Tests" + name="UI Tests" + tear_off="true"> + <menu_item_call + label="Textbox" + name="Textbox" + shortcut="control|1"> + <menu_item_call.on_click + function="ShowFloater" + parameter="test_textbox" /> + </menu_item_call> + <menu_item_call + label="Text Editor" + name="Text Editor" + shortcut="control|2"> + <menu_item_call.on_click + function="ShowFloater" + parameter="test_text_editor" /> + </menu_item_call> <menu_item_call - label="Widget Test" - name="Widget Test" + label="Widgets" + name="Widgets" shortcut="control|shift|T"> - <menu_item_call.on_click - function="ShowFloater" - parameter="test_widgets" /> + <menu_item_call.on_click + function="ShowFloater" + parameter="test_widgets" /> </menu_item_call> <menu_item_call - label="Inspectors Test" - name="Inspectors Test"> - <menu_item_call.on_click - function="ShowFloater" - parameter="test_inspectors" /> + label="Inspectors" + name="Inspectors"> + <menu_item_call.on_click + function="ShowFloater" + parameter="test_inspectors" /> </menu_item_call> + </menu> <menu_item_check label="Reg In Client Test (restart)" name="Reg In Client Test (restart)"> diff --git a/indra/newview/skins/default/xui/en/menu_text_editor.xml b/indra/newview/skins/default/xui/en/menu_text_editor.xml index 7c9e6f0796..ecd96088e7 100644 --- a/indra/newview/skins/default/xui/en/menu_text_editor.xml +++ b/indra/newview/skins/default/xui/en/menu_text_editor.xml @@ -32,10 +32,10 @@ function="Edit.EnablePaste" /> </menu_item_call> <menu_item_call - label="Delete" - layout="topleft" - name="Delete" - shortcut="Del"> + label="Delete" + layout="topleft" + name="Delete" + shortcut="Del"> <menu_item_call.on_click function="Edit.Delete" /> <menu_item_call.on_enable diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index f48cc6d4bf..d8eb65322b 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -3480,7 +3480,7 @@ Publish this classified now for L$[AMOUNT]? icon="alertmodal.tga" name="SetClassifiedMature" type="alertmodal"> -Does this classified contain Mature content? +Does this classified contain Moderate content? <usetemplate canceltext="Cancel" name="yesnocancelbuttons" @@ -3492,7 +3492,7 @@ Does this classified contain Mature content? icon="alertmodal.tga" name="SetGroupMature" type="alertmodal"> -Does this group contain Mature content? +Does this group contain Moderate content? <usetemplate canceltext="Cancel" name="yesnocancelbuttons" @@ -4568,7 +4568,7 @@ Some terms in your search query were excluded due to content restrictions as cla icon="notifytip.tga" name="NoContentToSearch" type="notifytip"> -Please select at least one type of content to search (PG, Mature, or Adult). +Please select at least one type of content to search (General, Moderate, or Adult). </notification> <notification diff --git a/indra/newview/skins/default/xui/en/panel_classified.xml b/indra/newview/skins/default/xui/en/panel_classified.xml index 18d12aef70..9622313786 100644 --- a/indra/newview/skins/default/xui/en/panel_classified.xml +++ b/indra/newview/skins/default/xui/en/panel_classified.xml @@ -111,11 +111,11 @@ name="select_mature" value="Select" /> <combo_box.item - label="Mature Content" + label="Moderate Content" name="mature" value="Mature" /> <combo_box.item - label="PG Content" + label="General Content" name="pg" value="PG" /> </combo_box> diff --git a/indra/newview/skins/default/xui/en/panel_classified_info.xml b/indra/newview/skins/default/xui/en/panel_classified_info.xml index df889e87c3..5c594d3f14 100644 --- a/indra/newview/skins/default/xui/en/panel_classified_info.xml +++ b/indra/newview/skins/default/xui/en/panel_classified_info.xml @@ -11,11 +11,11 @@ width="333"> <panel.string name="type_mature"> - Mature + Moderate </panel.string> <panel.string name="type_pg"> - PG Content + General Content </panel.string> <button follows="top|right" diff --git a/indra/newview/skins/default/xui/en/panel_edit_classified.xml b/indra/newview/skins/default/xui/en/panel_edit_classified.xml index 2f3277804f..b5760e977f 100644 --- a/indra/newview/skins/default/xui/en/panel_edit_classified.xml +++ b/indra/newview/skins/default/xui/en/panel_edit_classified.xml @@ -189,12 +189,12 @@ <combo_item name="mature_ci" value="Mature"> - Mature Content + Moderate Content </combo_item> <combo_item name="pg_ci" value="PG"> - PG Content + General Content </combo_item> </combo_box> <spinner 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 4c30db4034..043edd10e1 100644 --- a/indra/newview/skins/default/xui/en/panel_group_general.xml +++ b/indra/newview/skins/default/xui/en/panel_group_general.xml @@ -1,14 +1,12 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <panel follows="all" - height="378" + height="395" label="General" class="panel_group_general" layout="topleft" - left="0" - top="0" name="general_tab" - width="310"> + width="323"> <panel.string name="help_text"> The General tab contains general information about this group, a list of members, general Group Preferences and member options. @@ -32,7 +30,7 @@ Hover your mouse over the options for more help. max_length="511" name="charter" top="5" - width="305" + right="-1" word_wrap="true"> Group Charter </text_editor> @@ -41,12 +39,12 @@ Hover your mouse over the options for more help. draw_heading="true" follows="left|top" heading_height="20" - height="130" + height="156" layout="topleft" left="0" + right="-1" name="visible_members" - top_pad="2" - width="310"> + top_pad="2"> <name_list.columns label="Member" name="name" @@ -71,15 +69,15 @@ Hover your mouse over the options for more help. follows="left|top" height="20" layout="topleft" - left_delta="0" + left="5" + right="-5" name="active_title" tool_tip="Sets the title that appears in your avatar's name tag when this group is active." - top_pad="2" - width="300" /> + top_pad="2" /> <check_box height="16" font="SansSerifSmall" - label="Receive notices" + label="Receive group notices" layout="topleft" left="5" name="receive_notices" @@ -101,12 +99,12 @@ Hover your mouse over the options for more help. border="true" bg_alpha_color="FloaterUnfocusBorderColor" follows="left|top" - height="90" + height="88" layout="topleft" - left="5" + left="2" + right="-1" name="preferences_container" - top_pad="5" - width="300"> + top_pad="2"> <check_box follows="right|top" height="16" @@ -132,41 +130,43 @@ Hover your mouse over the options for more help. halign="left" height="16" increment="1" - label_width="20" + label_width="15" label="L$" layout="topleft" right="-10" max_val="99999" - left_pad="2" + left_pad="0" name="spin_enrollment_fee" tool_tip="New members must pay this fee to join the group when Enrollment Fee is checked." width="100" /> - <check_box - height="16" - initial_value="true" - label="Show in search" - layout="topleft" - left="10" - name="show_in_group_list" - tool_tip="Let people see this group in search results" - top_pad="4" - width="300" /> - <combo_box + <combo_box + follows="left|top" height="20" layout="topleft" - left_delta="0" + left="10" name="group_mature_check" - tool_tip="Sets whether your group information is considered mature" - top_pad="2" + tool_tip="Sets whether your group information is considered moderate" + top_pad="0" width="190"> <combo_box.item - label="PG Content" + label="General Content" name="pg" value="Not Mature" /> <combo_box.item - label="Mature Content" + label="Moderate Content" name="mature" value="Mature" /> </combo_box> + <check_box + follows="left|top" + height="16" + initial_value="true" + label="Show in search" + layout="topleft" + left="10" + name="show_in_group_list" + tool_tip="Let people see this group in search results" + top_pad="4" + width="300" /> </panel> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_login.xml b/indra/newview/skins/default/xui/en/panel_login.xml index d07d4ea25f..0bc2b44ad5 100644 --- a/indra/newview/skins/default/xui/en/panel_login.xml +++ b/indra/newview/skins/default/xui/en/panel_login.xml @@ -48,13 +48,13 @@ left="20" name="first_name_text" top="20" - width="135"> + width="150"> Name: </text> <line_editor follows="left|bottom" handle_edit_keys_directly="true" - height="23" + height="22" label="First" left_delta="0" max_length="31" @@ -66,7 +66,7 @@ <line_editor follows="left|bottom" handle_edit_keys_directly="true" - height="23" + height="22" label="Last" left_pad="8" max_length="31" @@ -75,38 +75,6 @@ tool_tip="[SECOND_LIFE] Last Name" top_delta="0" width="135" /> - <text - follows="left|bottom" - font="SansSerifSmall" - height="15" - left_pad="8" - name="start_location_text" - top="20" - width="135"> - Starting location: - </text> - <combo_box - allow_text_entry="true" - control_name="LoginLocation" - follows="left|bottom" - height="23" - max_chars="128" - top_pad="0" - name="start_location_combo" - width="135"> - <combo_box.item - label="My last location" - name="MyLastLocation" - value="last" /> - <combo_box.item - label="My home" - name="MyHome" - value="home" /> - <combo_box.item - label="<Type region name>" - name="Typeregionname" - value="" /> - </combo_box> <combo_box allow_text_entry="true" font="SansSerifSmall" @@ -121,21 +89,21 @@ follows="left|bottom" font="SansSerifSmall" height="15" - left_pad="3" + left_pad="8" name="password_text" top="20" - width="135"> + width="150"> Password: </text> <line_editor follows="left|bottom" handle_edit_keys_directly="true" - height="23" - left_delta="0" + height="22" + left="304" max_length="16" name="password_edit" select_on_focus="true" - top_pad="0" + top_pad="1" width="135" /> <check_box control_name="RememberPassword" @@ -143,10 +111,10 @@ font="SansSerifSmall" height="16" label="Remember" - left_pad="5" + left_pad="20" + top="20" name="remember_check" - top_delta="5" - width="90" /> + width="150" /> <button follows="left|bottom" height="23" @@ -155,10 +123,44 @@ label="Log In" label_color="White" layout="topleft" - left_pad="20" + left="462" name="connect_btn" top="35" width="90" /> + <text + follows="right|bottom" + font="SansSerifSmall" + height="15" + halign="right" + left_pad="10" + right="-240" + name="start_location_text" + top="20" + width="130"> + Starting location: + </text> + <combo_box + allow_text_entry="true" + control_name="LoginLocation" + follows="right|bottom" + height="23" + max_chars="128" + top_pad="0" + name="start_location_combo" + width="135"> + <combo_box.item + label="My last location" + name="MyLastLocation" + value="last" /> + <combo_box.item + label="My home" + name="MyHome" + value="home" /> + <combo_box.item + label="<Type region name>" + name="Typeregionname" + value="" /> + </combo_box> <text follows="right|bottom" font="SansSerifSmall" diff --git a/indra/newview/skins/default/xui/en/panel_place_profile.xml b/indra/newview/skins/default/xui/en/panel_place_profile.xml index 9ab5c6b4f7..3f5da66dce 100644 --- a/indra/newview/skins/default/xui/en/panel_place_profile.xml +++ b/indra/newview/skins/default/xui/en/panel_place_profile.xml @@ -602,7 +602,7 @@ layout="topleft" left_pad="10" name="region_rating" - value="Explicit" + value="Adult" width="159" /> <text follows="left|top" 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 6bb937e3c6..ee9bfbae93 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_general.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_general.xml @@ -143,15 +143,15 @@ top_pad="-10" width="170"> <combo_box.item - label="PG, Mature and Adult" + label="General, Moderate, Adult" name="Desired_Adult" value="42" /> <combo_box.item - label="PG and Mature" + label="General and Moderate" name="Desired_Mature" value="21" /> <combo_box.item - label="PG" + label="General" name="Desired_PG" value="13" /> </combo_box> diff --git a/indra/newview/skins/default/xui/en/panel_region_general.xml b/indra/newview/skins/default/xui/en/panel_region_general.xml index 42c6319699..79d8f3a0ee 100644 --- a/indra/newview/skins/default/xui/en/panel_region_general.xml +++ b/indra/newview/skins/default/xui/en/panel_region_general.xml @@ -171,7 +171,7 @@ </text> <combo_box height="20" - label="Mature" + label="Moderate" layout="topleft" left_delta="100" name="access_combo" @@ -182,11 +182,11 @@ name="Adult" value="42" /> <combo_box.item - label="Mature" + label="Moderate" name="Mature" value="21" /> <combo_box.item - label="PG" + label="General" name="PG" value="13" /> </combo_box> 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 new file mode 100644 index 0000000000..525c5aa8e7 --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_region_general_layout.xml @@ -0,0 +1,242 @@ +<?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="Moderate" + 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="Moderate" + name="Mature" + value="21" /> + <combo_box.item + label="General" + 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/panel_toast.xml b/indra/newview/skins/default/xui/en/panel_toast.xml index 4293051dbd..6479fc91ca 100644 --- a/indra/newview/skins/default/xui/en/panel_toast.xml +++ b/indra/newview/skins/default/xui/en/panel_toast.xml @@ -5,28 +5,28 @@ <floater legacy_header_height="18" - name="toast" - title="" - visible="false" - layout="topleft" - height="40" - width="305" - left="0" - top="0" - follows="right|bottom" - bg_opaque_image="Toast_Background" - bg_alpha_image="Toast_Background" - can_minimize="false" - can_tear_off="false" - can_resize="false" - can_drag_on_left="false" - can_close="false" - can_dock="false" - border_visible = "false" - border_drop_shadow_visible = "false" - drop_shadow_visible = "false" - border = "false" - > + name="toast" + title="" + visible="false" + layout="topleft" + height="40" + width="305" + left="0" + top="0" + follows="right|bottom" + bg_opaque_image="Toast_Background" + bg_alpha_image="Toast_Background" + can_minimize="false" + can_tear_off="false" + can_resize="false" + can_drag_on_left="false" + can_close="false" + can_dock="false" + border_visible = "false" + border_drop_shadow_visible = "false" + drop_shadow_visible = "false" + border = "false" +> <!-- Don't remove this wiget! It is needed for Overflow and Start-Up toasts!--> <text clip_partial="true" diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index e47ec1ebda..b014b8d1c0 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -270,8 +270,8 @@ <string name="NotConnected">Not Connected</string> <!-- Sim Access labels --> - <string name="SIM_ACCESS_PG">PG</string> - <string name="SIM_ACCESS_MATURE">Mature</string> + <string name="SIM_ACCESS_PG">General</string> + <string name="SIM_ACCESS_MATURE">Moderate</string> <string name="SIM_ACCESS_ADULT">Adult</string> <string name="SIM_ACCESS_DOWN">Offline</string> <string name="SIM_ACCESS_MIN">Unknown</string> @@ -2777,11 +2777,19 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. <string name="Wild">Wild</string> <string name="Wrinkles">Wrinkles</string> - <!-- Favorites Bar --> + <!-- Navigation bar location input control. + Strings are here because widget xml is not localizable --> <string name="LocationCtrlAddLandmarkTooltip">Add to My Landmarks</string> <string name="LocationCtrlEditLandmarkTooltip">Edit My Landmark</string> <string name="LocationCtrlInfoBtnTooltip">See more info about the current location</string> <string name="LocationCtrlComboBtnTooltip">My location history</string> + <string name="LocationCtrlForSaleTooltip">Buy this land</string> + <string name="LocationCtrlVoiceTooltip">Voice not available here</string> + <string name="LocationCtrlFlyTooltip">Flying not allowed</string> + <string name="LocationCtrlPushTooltip">No pushing</string> + <string name="LocationCtrlBuildTooltip">Building/dropping objects not allowed</string> + <string name="LocationCtrlScriptsTooltip">Scripts not allowed</string> + <string name="LocationCtrlDamageTooltip">Health</string> <!-- Strings used by the (currently Linux) auto-updater app --> <string name="UpdaterWindowTitle"> diff --git a/indra/newview/skins/default/xui/en/widgets/accordion_tab.xml b/indra/newview/skins/default/xui/en/widgets/accordion_tab.xml index c0e1944f56..9990324d03 100644 --- a/indra/newview/skins/default/xui/en/widgets/accordion_tab.xml +++ b/indra/newview/skins/default/xui/en/widgets/accordion_tab.xml @@ -9,5 +9,6 @@ header_image_over="Accordion_Over" header_image_pressed="Accordion_Press" header_image_expanded="Accordion_Selected" - header_text_color="LtGray" + header_text_color="LtGray" + font="SansSerif" /> diff --git a/indra/newview/skins/default/xui/en/widgets/chat_history.xml b/indra/newview/skins/default/xui/en/widgets/chat_history.xml index 32916c0816..2be37d222a 100644 --- a/indra/newview/skins/default/xui/en/widgets/chat_history.xml +++ b/indra/newview/skins/default/xui/en/widgets/chat_history.xml @@ -15,4 +15,5 @@ track_bottom="true" name="chat_history" type="string" - word_wrap="true" />
\ No newline at end of file + word_wrap="true" + font="SansSerif"/> diff --git a/indra/newview/skins/default/xui/en/widgets/chiclet_script.xml b/indra/newview/skins/default/xui/en/widgets/chiclet_script.xml index 5011bf6a61..e5af961a56 100644 --- a/indra/newview/skins/default/xui/en/widgets/chiclet_script.xml +++ b/indra/newview/skins/default/xui/en/widgets/chiclet_script.xml @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<chiclet_script
- name="script_chiclet">
+ name="script_chiclet"
+ font="SansSerif">
<icon
name="chiclet_icon"
follows="all"
diff --git a/indra/newview/skins/default/xui/en/widgets/floater.xml b/indra/newview/skins/default/xui/en/widgets/floater.xml index 2263866471..b2bd9c38c9 100644 --- a/indra/newview/skins/default/xui/en/widgets/floater.xml +++ b/indra/newview/skins/default/xui/en/widgets/floater.xml @@ -1,25 +1,28 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <!-- See also settings.xml UIFloater* settings for configuration --> -<floater name="floater" - bg_opaque_color="FloaterFocusBackgroundColor" - bg_alpha_color="FloaterDefaultBackgroundColor" - bg_opaque_image="Window_Foreground" - bg_alpha_image="Window_Background" - background_visible="true" - background_opaque="false" - header_height="25" - close_image="Icon_Close_Foreground" - restore_image="Icon_Restore_Foreground" - minimize_image="Icon_Minimize_Foreground" - tear_off_image="tearoffbox.tga" - dock_image="Icon_Dock_Foreground" - undock_image="Icon_Undock_Foreground" - help_image="Icon_Help_Foreground" - close_pressed_image="Icon_Close_Press" - restore_pressed_image="Icon_Restore_Press" - minimize_pressed_image="Icon_Minimize_Press" - tear_off_pressed_image="tearoff_pressed.tga" - dock_pressed_image="Icon_Dock_Press" - undock_pressed_image="Icon_Undock_Press" - help_pressed_image="Icon_Help_Press" +<floater + name="floater" + bg_opaque_color="FloaterFocusBackgroundColor" + bg_alpha_color="FloaterDefaultBackgroundColor" + bg_opaque_image="Window_Foreground" + bg_alpha_image="Window_Background" + background_visible="true" + background_opaque="false" + header_height="25" + top="0" + left="0" + close_image="Icon_Close_Foreground" + restore_image="Icon_Restore_Foreground" + minimize_image="Icon_Minimize_Foreground" + tear_off_image="tearoffbox.tga" + dock_image="Icon_Dock_Foreground" + undock_image="Icon_Undock_Foreground" + help_image="Icon_Help_Foreground" + close_pressed_image="Icon_Close_Press" + restore_pressed_image="Icon_Restore_Press" + minimize_pressed_image="Icon_Minimize_Press" + tear_off_pressed_image="tearoff_pressed.tga" + dock_pressed_image="Icon_Dock_Press" + undock_pressed_image="Icon_Undock_Press" + help_pressed_image="Icon_Help_Press" /> 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 d32952b04f..0e2700cb80 100644 --- a/indra/newview/skins/default/xui/en/widgets/location_input.xml +++ b/indra/newview/skins/default/xui/en/widgets/location_input.xml @@ -20,6 +20,8 @@ follows="left|top" allow_new_values="true" > + <!-- *NOTE: Tooltips are in strings.xml so they can be localized. + See LocationCtrlAddLandmarkTooltip etc. --> <info_button name="Place Information" width="16" height="16" @@ -50,6 +52,7 @@ top="21" /> <voice_icon + enabled="true" name="voice_icon" width="22" height="18" diff --git a/indra/newview/skins/default/xui/en/widgets/menu_item.xml b/indra/newview/skins/default/xui/en/widgets/menu_item.xml index 2bbaa6233f..c65244ae22 100644 --- a/indra/newview/skins/default/xui/en/widgets/menu_item.xml +++ b/indra/newview/skins/default/xui/en/widgets/menu_item.xml @@ -1,4 +1,3 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <!-- Use this for the top-level menu styling --> -<menu_item> -</menu_item> +<menu_item font="SansSerif" /> 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 dd848f3acd..3ddf18b2cb 100644 --- a/indra/newview/skins/default/xui/en/widgets/radio_item.xml +++ b/indra/newview/skins/default/xui/en/widgets/radio_item.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<radio_item follows="left|top"> +<radio_item follows="left|top" font="SansSerif"> <radio_item.label_text name="Radio Item label"/> <radio_item.check_button name="Radio control button" image_unselected="RadioButton_Off" 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 706c89f5ed..89d5950e98 100644 --- a/indra/newview/skins/default/xui/en/widgets/slider_bar.xml +++ b/indra/newview/skins/default/xui/en/widgets/slider_bar.xml @@ -8,4 +8,5 @@ track_image_horizontal="SliderTrack_Horiz" track_image_vertical="SliderTrack_Vert" track_highlight_horizontal_image="SliderTrack_Horiz" - track_highlight_vertical_image="SliderTrack_Vert" /> + track_highlight_vertical_image="SliderTrack_Vert" + font="SansSerif" /> diff --git a/indra/newview/skins/default/xui/en/widgets/spinner.xml b/indra/newview/skins/default/xui/en/widgets/spinner.xml index 7d1a5118cb..ab3f8df5f8 100644 --- a/indra/newview/skins/default/xui/en/widgets/spinner.xml +++ b/indra/newview/skins/default/xui/en/widgets/spinner.xml @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <spinner text_enabled_color="LabelTextColor" text_disabled_color="LabelDisabledColor" + font="SansSerif" decimal_digits="3" label_width="40" > <spinner.up_button name="SpinCtrl Up" diff --git a/indra/newview/skins/default/xui/en/widgets/textbase.xml b/indra/newview/skins/default/xui/en/widgets/textbase.xml index 166e8555fe..f4dc192bc3 100644 --- a/indra/newview/skins/default/xui/en/widgets/textbase.xml +++ b/indra/newview/skins/default/xui/en/widgets/textbase.xml @@ -1,2 +1,3 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<textbase clip_partial="false"/> +<textbase clip_partial="false" + font="SansSerif"/> diff --git a/indra/newview/skins/default/xui/en/widgets/ui_ctrl.xml b/indra/newview/skins/default/xui/en/widgets/ui_ctrl.xml index 2f72ad65a1..f4dbb8f404 100644 --- a/indra/newview/skins/default/xui/en/widgets/ui_ctrl.xml +++ b/indra/newview/skins/default/xui/en/widgets/ui_ctrl.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <!-- Global settings for all widgets ("UI Controls") --> +<!-- The params in this file aren't currently getting loaded in OSX --> <ui_ctrl - font="SansSerif" /> |
