diff options
Diffstat (limited to 'indra')
125 files changed, 1860 insertions, 1445 deletions
diff --git a/indra/llui/lllineeditor.cpp b/indra/llui/lllineeditor.cpp index d7c0cf4f7b..43c22cbf5d 100644 --- a/indra/llui/lllineeditor.cpp +++ b/indra/llui/lllineeditor.cpp @@ -115,6 +115,7 @@ LLLineEditor::Params::Params() mouse_opaque = true; addSynonym(select_on_focus, "select_all_on_focus_received"); addSynonym(border, "border"); + addSynonym(label, "watermark_text"); } LLLineEditor::LLLineEditor(const LLLineEditor::Params& p) diff --git a/indra/llui/llspinctrl.cpp b/indra/llui/llspinctrl.cpp index 5893fcd64b..2d70432182 100644 --- a/indra/llui/llspinctrl.cpp +++ b/indra/llui/llspinctrl.cpp @@ -60,7 +60,9 @@ LLSpinCtrl::Params::Params() decimal_digits("decimal_digits"), allow_text_entry("allow_text_entry", true), text_enabled_color("text_enabled_color"), - text_disabled_color("text_disabled_color") + text_disabled_color("text_disabled_color"), + up_button("up_button"), + down_button("down_button") {} LLSpinCtrl::LLSpinCtrl(const LLSpinCtrl::Params& p) @@ -103,38 +105,28 @@ LLSpinCtrl::LLSpinCtrl(const LLSpinCtrl::Params& p) S32 btn_right = btn_left + spinctrl_btn_width; // Spin buttons - LLButton::Params up_button_params; - up_button_params.name(std::string("SpinCtrl Up")); + LLButton::Params up_button_params(p.up_button); up_button_params.rect .left(btn_left) .top(top) .right(btn_right) .height(spinctrl_btn_height); - up_button_params.follows.flags(FOLLOWS_LEFT|FOLLOWS_BOTTOM); - up_button_params.image_unselected.name("ScrollArrow_Up"); - up_button_params.image_selected.name("ScrollArrow_Up"); up_button_params.click_callback.function(boost::bind(&LLSpinCtrl::onUpBtn, this, _2)); up_button_params.mouse_held_callback.function(boost::bind(&LLSpinCtrl::onUpBtn, this, _2)); - up_button_params.tab_stop(false); mUpBtn = LLUICtrlFactory::create<LLButton>(up_button_params); addChild(mUpBtn); LLRect down_rect( btn_left, top - spinctrl_btn_height, btn_right, bottom ); - LLButton::Params down_button_params; - down_button_params.name(std::string("SpinCtrl Down")); + LLButton::Params down_button_params(p.down_button); down_button_params.rect .left(btn_left) .right(btn_right) .bottom(bottom) .height(spinctrl_btn_height); - down_button_params.follows.flags(FOLLOWS_LEFT|FOLLOWS_BOTTOM); - down_button_params.image_unselected.name("ScrollArrow_Down"); - down_button_params.image_selected.name("ScrollArrow_Down"); down_button_params.click_callback.function(boost::bind(&LLSpinCtrl::onDownBtn, this, _2)); down_button_params.mouse_held_callback.function(boost::bind(&LLSpinCtrl::onDownBtn, this, _2)); - down_button_params.tab_stop(false); mDownBtn = LLUICtrlFactory::create<LLButton>(down_button_params); addChild(mDownBtn); diff --git a/indra/llui/llspinctrl.h b/indra/llui/llspinctrl.h index eb1a2eb8a7..0e610b7741 100644 --- a/indra/llui/llspinctrl.h +++ b/indra/llui/llspinctrl.h @@ -35,6 +35,7 @@ #include "stdtypes.h" +#include "llbutton.h" #include "llf32uictrl.h" #include "v4color.h" #include "llrect.h" @@ -53,6 +54,9 @@ public: Optional<LLUIColor> text_enabled_color; Optional<LLUIColor> text_disabled_color; + Optional<LLButton::Params> up_button; + Optional<LLButton::Params> down_button; + Params(); }; protected: diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index ced072efaa..cb30cada70 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -276,7 +276,7 @@ <key>Value</key> <real>0.5</real> </map> - <key>AudioStreaming</key> + <key>AudioSteamingMedia</key> <map> <key>Comment</key> <string>Enable streaming</string> @@ -1112,6 +1112,28 @@ <key>Value</key> <string /> </map> + <key>CacheLocationTopFolder</key> + <map> + <key>Comment</key> + <string>Controls the top folder location of the local disk cache</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>String</string> + <key>Value</key> + <string /> + </map> + <key>CacheLocationTopFolder</key> + <map> + <key>Comment</key> + <string>Controls the location of the local disk cache</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>String</string> + <key>Value</key> + <string /> + </map> <key>CacheSize</key> <map> <key>Comment</key> @@ -2753,6 +2775,17 @@ <string>Boolean</string> <key>Value</key> <integer>0</integer> + </map> + <key>FirstSelectedEnabledPopups</key> + <map> + <key>Comment</key> + <string>Return false if there is not enable popup selected in the list of floater preferences popups</string> + <key>Persist</key> + <integer>0</integer> + <key>Type</key> + <string>Boolean</string> + <key>Value</key> + <integer>0</integer> </map> <key>FixedWeather</key> <map> @@ -4617,6 +4650,17 @@ <key>Value</key> <string /> </map> + <key>NewCacheLocationTopFolder</key> + <map> + <key>Comment</key> + <string>Change the top folder location of the local disk cache to this</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>String</string> + <key>Value</key> + <string /> + </map> <key>NextLoginLocation</key> <map> <key>Comment</key> @@ -5887,7 +5931,7 @@ <key>Value</key> <integer>0</integer> </map> - <key>RenderHideGroupTitleAll</key> + <key>RenderShowGroupTitleAll</key> <map> <key>Comment</key> <string>Show group titles in name labels</string> @@ -5896,7 +5940,7 @@ <key>Type</key> <string>Boolean</string> <key>Value</key> - <integer>0</integer> + <integer>1</integer> </map> <key>RenderInitError</key> <map> @@ -5964,17 +6008,6 @@ <key>Value</key> <integer>512</integer> </map> - <key>RenderName</key> - <map> - <key>Comment</key> - <string>Controls display of names above avatars (0 = never, 1 = fade, 2 = always)</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>S32</string> - <key>Value</key> - <integer>2</integer> - </map> <key>RenderNameFadeDuration</key> <map> <key>Comment</key> @@ -5986,16 +6019,16 @@ <key>Value</key> <real>1.0</real> </map> - <key>RenderNameHideSelf</key> + <key>RenderNameShowSelf</key> <map> <key>Comment</key> - <string>Don't display own name above avatar</string> + <string>Display own name above avatar</string> <key>Persist</key> <integer>1</integer> <key>Type</key> <string>Boolean</string> <key>Value</key> - <integer>0</integer> + <integer>1</integer> </map> <key>RenderNameShowTime</key> <map> @@ -6608,6 +6641,17 @@ <key>Value</key> <integer>0</integer> </map> + <key>AvatarNameTagMode</key> + <map> + <key>Comment</key> + <string>Select Avatar Name Tag Mode</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>S32</string> + <key>Value</key> + <integer>1</integer> + </map> <key>ShowAxes</key> <map> <key>Comment</key> diff --git a/indra/newview/app_settings/settings_per_account.xml b/indra/newview/app_settings/settings_per_account.xml index dab88a5ec3..893e7acd7a 100644 --- a/indra/newview/app_settings/settings_per_account.xml +++ b/indra/newview/app_settings/settings_per_account.xml @@ -22,17 +22,28 @@ <key>Value</key> <string>|TOKEN COPY BusyModeResponse|</string> </map> - <key>IMLogTimestamp</key> + <key>IMLogOptions</key> <map> <key>Comment</key> - <string>Log Timestamp of Instant Messages</string> + <string>Log options for Instant Messages</string> <key>Persist</key> <integer>1</integer> <key>Type</key> - <string>Boolean</string> + <string>S32</string> <key>Value</key> - <integer>1</integer> + <integer>2</integer> </map> + <key>InstantMessageLogFolder</key> + <map> + <key>Comment</key> + <string>Top level folder to your log files.</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>String</string> + <key>Value</key> + <string /> + </map> <key>InstantMessageLogPath</key> <map> <key>Comment</key> @@ -77,10 +88,10 @@ <key>Value</key> <integer>0</integer> </map> - <key>LogChatTimestamp</key> + <key>LogTimestamp</key> <map> <key>Comment</key> - <string>Log Timestamp of Chat</string> + <string>Log Timestamp</string> <key>Persist</key> <integer>1</integer> <key>Type</key> diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 51b6fc81cd..2299a439e6 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -1775,7 +1775,7 @@ bool LLAppViewer::initConfiguration() LLFirstUse::addConfigVariable("FirstMap"); LLFirstUse::addConfigVariable("FirstGoTo"); LLFirstUse::addConfigVariable("FirstBuild"); - LLFirstUse::addConfigVariable("FirstLeftClickNoHit"); +// LLFirstUse::addConfigVariable("FirstLeftClickNoHit"); LLFirstUse::addConfigVariable("FirstTeleport"); LLFirstUse::addConfigVariable("FirstOverrideKeys"); LLFirstUse::addConfigVariable("FirstAttach"); @@ -1999,7 +1999,9 @@ bool LLAppViewer::initConfiguration() const LLControlVariable* skinfolder = gSavedSettings.getControl("SkinCurrent"); if(skinfolder && LLStringUtil::null != skinfolder->getValue().asString()) { - gDirUtilp->setSkinFolder(skinfolder->getValue().asString()); + // hack to force the skin to default. + //gDirUtilp->setSkinFolder(skinfolder->getValue().asString()); + gDirUtilp->setSkinFolder("default"); } mYieldTime = gSavedSettings.getS32("YieldTime"); @@ -2874,12 +2876,14 @@ bool LLAppViewer::initCache() gDirUtilp->setCacheDir(gSavedSettings.getString("CacheLocation")); purgeCache(); // purge old cache gSavedSettings.setString("CacheLocation", new_cache_location); + gSavedSettings.setString("CacheLocationTopFolder", gDirUtilp->getBaseFileName(new_cache_location)); } if (!gDirUtilp->setCacheDir(gSavedSettings.getString("CacheLocation"))) { LL_WARNS("AppCache") << "Unable to set cache location" << LL_ENDL; gSavedSettings.setString("CacheLocation", ""); + gSavedSettings.setString("CacheLocationTopFolder", ""); } if (mPurgeCache) diff --git a/indra/newview/llappviewer.h b/indra/newview/llappviewer.h index 7bda16d256..bbc2b646c4 100644 --- a/indra/newview/llappviewer.h +++ b/indra/newview/llappviewer.h @@ -161,6 +161,8 @@ public: LLAllocator & getAllocator() { return mAlloc; } + void purgeCache(); // Clear the local cache. + protected: virtual bool initWindow(); // Initialize the viewer's window. virtual bool initLogging(); // Initialize log files, logging system, return false on failure. @@ -182,7 +184,7 @@ private: void initGridChoice(); bool initCache(); // Initialize local client cache. - void purgeCache(); // Clear the local cache. + // We have switched locations of both Mac and Windows cache, make sure // files migrate and old cache is cleared out. diff --git a/indra/newview/llfirstuse.cpp b/indra/newview/llfirstuse.cpp index 352ca3c863..de079b7123 100644 --- a/indra/newview/llfirstuse.cpp +++ b/indra/newview/llfirstuse.cpp @@ -145,7 +145,7 @@ void LLFirstUse::useBuild() LLNotifications::instance().add("FirstBuild"); } } - +/* // static void LLFirstUse::useLeftClickNoHit() { @@ -156,7 +156,7 @@ void LLFirstUse::useLeftClickNoHit() LLNotifications::instance().add("FirstLeftClickNoHit"); } } - +*/ // static void LLFirstUse::useTeleport() { diff --git a/indra/newview/llfirstuse.h b/indra/newview/llfirstuse.h index bb64cdd2c6..7b4f9f516f 100644 --- a/indra/newview/llfirstuse.h +++ b/indra/newview/llfirstuse.h @@ -95,7 +95,7 @@ public: static void useMap(); static void useGoTo(); static void useBuild(); - static void useLeftClickNoHit(); +// static void useLeftClickNoHit(); static void useTeleport(); static void useOverrideKeys(); static void useAttach(); diff --git a/indra/newview/llfloaterchat.cpp b/indra/newview/llfloaterchat.cpp index dd0df15348..1ecbdd8e16 100644 --- a/indra/newview/llfloaterchat.cpp +++ b/indra/newview/llfloaterchat.cpp @@ -85,6 +85,7 @@ const F32 INSTANT_MSG_SIZE = 8.0f; const F32 CHAT_MSG_SIZE = 8.0f; + // // Global statics // @@ -203,7 +204,7 @@ void add_timestamped_line(LLViewerTextEditor* edit, LLChat chat, const LLColor4& void log_chat_text(const LLChat& chat) { std::string histstr; - if (gSavedPerAccountSettings.getBOOL("LogChatTimestamp")) + if (gSavedPerAccountSettings.getBOOL("LogTimestamp")) histstr = LLLogChat::timestamp(gSavedPerAccountSettings.getBOOL("LogTimestampDate")) + chat.mText; else histstr = chat.mText; @@ -213,7 +214,7 @@ void log_chat_text(const LLChat& chat) // static void LLFloaterChat::addChatHistory(const LLChat& chat, bool log_to_file) { - if ( gSavedPerAccountSettings.getBOOL("LogChat") && log_to_file) + if ( (gSavedPerAccountSettings.getS32("IMLogOptions")!=LOG_IM) && log_to_file) { log_chat_text(chat); } @@ -367,7 +368,7 @@ void LLFloaterChat::addChat(const LLChat& chat, } } - if(from_instant_message && gSavedPerAccountSettings.getBOOL("LogChatIM")) + if(from_instant_message && (gSavedPerAccountSettings.getS32("IMLogOptions")== LOG_BOTH_TOGETHER)) log_chat_text(chat); if(from_instant_message && gSavedSettings.getBOOL("IMInChatHistory")) diff --git a/indra/newview/llfloaterchat.h b/indra/newview/llfloaterchat.h index 042d270aa6..b299d1ad10 100644 --- a/indra/newview/llfloaterchat.h +++ b/indra/newview/llfloaterchat.h @@ -51,6 +51,14 @@ class LLLogChat; class LLVector3d; class LLWindow; +enum ELogOptions +{ + LOG_CHAT = 0, + LOG_IM = 1, + LOG_BOTH_TOGETHER = 2, + LOG_BOTH_SEPARATE = 3 +}; + class LLFloaterChat : public LLFloater { public: diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp index f6a50057bc..903471ea94 100644 --- a/indra/newview/llfloaterpreference.cpp +++ b/indra/newview/llfloaterpreference.cpp @@ -58,6 +58,7 @@ #include "llfloatervoicedevicesettings.h" #include "llkeyboard.h" #include "llmodaldialog.h" +#include "llnavigationbar.h" #include "llpanellogin.h" #include "llradiogroup.h" #include "llsky.h" @@ -169,6 +170,7 @@ void LLVoiceSetKeyDialog::onCancel(void* user_data) void free_web_media(LLMediaBase *media_source); void handleHTMLLinkColorChanged(const LLSD& newvalue); +void handleNameTagOptionChanged(const LLSD& newvalue); LLMediaBase *get_web_media(); bool callback_clear_browser_cache(const LLSD& notification, const LLSD& response); @@ -220,11 +222,20 @@ bool callback_clear_browser_cache(const LLSD& notification, const LLSD& response S32 option = LLNotification::getSelectedOption(notification, response); if ( option == 0 ) // YES { + // clean web LLMediaBase *media_source = get_web_media(); if (media_source) media_source->clearCache(); free_web_media(media_source); + + // clean nav bar history + LLNavigationBar::getInstance()->clearHistoryCache(); + + // flag client texture cache for clearing next time the client runs + gSavedSettings.setBOOL("PurgeCacheOnNextStartup", TRUE); + LLNotifications::instance().add("CacheWillClear"); } + return false; } @@ -234,6 +245,18 @@ void handleHTMLLinkColorChanged(const LLSD& newvalue) LLStyleMap::instance().update(); } +void handleNameTagOptionChanged(const LLSD& newvalue) +{ + S32 name_tag_option = S32(newvalue); + if(name_tag_option==2) + { + gSavedSettings.setBOOL("SmallAvatarNames", TRUE); + } + else + { + gSavedSettings.setBOOL("SmallAvatarNames", FALSE); + } +} bool callback_skip_dialogs(const LLSD& notification, const LLSD& response, LLFloaterPreference* floater) { @@ -314,8 +337,8 @@ LLFloaterPreference::LLFloaterPreference(const LLSD& key) mCommitCallbackRegistrar.add("Pref.Cancel", boost::bind(&LLFloaterPreference::onBtnCancel, this)); mCommitCallbackRegistrar.add("Pref.OK", boost::bind(&LLFloaterPreference::onBtnOK, this)); - mCommitCallbackRegistrar.add("Pref.ClearCache", boost::bind(&LLFloaterPreference::onClickClearCache, (void*)NULL)); - mCommitCallbackRegistrar.add("Pref.WebClearCache", boost::bind(&LLFloaterPreference::onClickBrowserClearCache, (void*)NULL)); +// mCommitCallbackRegistrar.add("Pref.ClearCache", boost::bind(&LLFloaterPreference::onClickClearCache, this)); + mCommitCallbackRegistrar.add("Pref.WebClearCache", boost::bind(&LLFloaterPreference::onClickBrowserClearCache, this)); mCommitCallbackRegistrar.add("Pref.SetCache", boost::bind(&LLFloaterPreference::onClickSetCache, this)); mCommitCallbackRegistrar.add("Pref.ResetCache", boost::bind(&LLFloaterPreference::onClickResetCache, this)); mCommitCallbackRegistrar.add("Pref.ClickSkin", boost::bind(&LLFloaterPreference::onClickSkin, this,_1, _2)); @@ -325,6 +348,7 @@ LLFloaterPreference::LLFloaterPreference(const LLSD& key) mCommitCallbackRegistrar.add("Pref.ClickSkipDialogs", boost::bind(&LLFloaterPreference::onClickSkipDialogs, this)); mCommitCallbackRegistrar.add("Pref.ClickResetDialogs", boost::bind(&LLFloaterPreference::onClickResetDialogs, this)); mCommitCallbackRegistrar.add("Pref.ClickEnablePopup", boost::bind(&LLFloaterPreference::onClickEnablePopup, this)); + mCommitCallbackRegistrar.add("Pref.ClickDisablePopup", boost::bind(&LLFloaterPreference::onClickDisablePopup, this)); mCommitCallbackRegistrar.add("Pref.LogPath", boost::bind(&LLFloaterPreference::onClickLogPath, this)); mCommitCallbackRegistrar.add("Pref.Logging", boost::bind(&LLFloaterPreference::onCommitLogging, this)); mCommitCallbackRegistrar.add("Pref.OpenHelp", boost::bind(&LLFloaterPreference::onOpenHelp, this)); @@ -338,6 +362,7 @@ LLFloaterPreference::LLFloaterPreference(const LLSD& key) mCommitCallbackRegistrar.add("Pref.onSelectAspectRatio", boost::bind(&LLFloaterPreference::onKeystrokeAspectRatio, this)); mCommitCallbackRegistrar.add("Pref.QualityPerformance", boost::bind(&LLFloaterPreference::onChangeQuality, this, _2)); + gSavedSettings.getControl("AvatarNameTagMode")->getCommitSignal()->connect(boost::bind(&handleNameTagOptionChanged, _2)); } BOOL LLFloaterPreference::postBuild() @@ -345,6 +370,8 @@ BOOL LLFloaterPreference::postBuild() LLTabContainer* tabcontainer = getChild<LLTabContainer>("pref core"); if (!tabcontainer->selectTab(gSavedSettings.getS32("LastPrefTab"))) tabcontainer->selectFirstTab(); + S32 show_avatar_nametag_options = gSavedSettings.getS32("AvatarNameTagMode"); + handleNameTagOptionChanged(LLSD(show_avatar_nametag_options)); return TRUE; } @@ -366,6 +393,10 @@ void LLFloaterPreference::draw() { BOOL has_first_selected = (getChildRef<LLScrollListCtrl>("disabled_popups").getFirstSelected()!=NULL); gSavedSettings.setBOOL("FirstSelectedDisabledPopups", has_first_selected); + + has_first_selected = (getChildRef<LLScrollListCtrl>("enabled_popups").getFirstSelected()!=NULL); + gSavedSettings.setBOOL("FirstSelectedEnabledPopups", has_first_selected); + LLFloater::draw(); } @@ -622,17 +653,16 @@ void LLFloaterPreference::updateMeterText(LLUICtrl* ctrl) m1->setVisible(two_digits); m2->setVisible(!two_digits); } - -// static -void LLFloaterPreference::onClickClearCache(void*) +/* +void LLFloaterPreference::onClickClearCache() { // flag client cache for clearing next time the client runs gSavedSettings.setBOOL("PurgeCacheOnNextStartup", TRUE); LLNotifications::instance().add("CacheWillClear"); } +*/ -// static -void LLFloaterPreference::onClickBrowserClearCache(void*) +void LLFloaterPreference::onClickBrowserClearCache() { LLNotifications::instance().add("ConfirmClearBrowserCache", LLSD(), LLSD(), callback_clear_browser_cache); } @@ -640,6 +670,8 @@ void LLFloaterPreference::onClickBrowserClearCache(void*) void LLFloaterPreference::onClickSetCache() { std::string cur_name(gSavedSettings.getString("CacheLocation")); +// std::string cur_top_folder(gDirUtilp->getBaseFileName(cur_name)); + std::string proposed_name(cur_name); LLDirPicker& picker = LLDirPicker::instance(); @@ -651,14 +683,17 @@ void LLFloaterPreference::onClickSetCache() std::string dir_name = picker.getDirName(); if (!dir_name.empty() && dir_name != cur_name) { - childSetText("cache_location", dir_name); + std::string new_top_folder(gDirUtilp->getBaseFileName(dir_name)); LLNotifications::instance().add("CacheWillBeMoved"); gSavedSettings.setString("NewCacheLocation", dir_name); + gSavedSettings.setString("NewCacheLocationTopFolder", new_top_folder); } else { std::string cache_location = gDirUtilp->getCacheDir(); - childSetText("cache_location", cache_location); + gSavedSettings.setString("CacheLocation", cache_location); + std::string top_folder(gDirUtilp->getBaseFileName(cache_location)); + gSavedSettings.setString("CacheLocationTopFolder", top_folder); } } @@ -667,10 +702,13 @@ void LLFloaterPreference::onClickResetCache() if (!gSavedSettings.getString("CacheLocation").empty()) { gSavedSettings.setString("NewCacheLocation", ""); + gSavedSettings.setString("NewCacheLocationTopFolder", ""); LLNotifications::instance().add("CacheWillBeMoved"); } std::string cache_location = gDirUtilp->getCacheDir(true); - childSetText("cache_location", cache_location); + gSavedSettings.setString("CacheLocation", cache_location); + std::string top_folder(gDirUtilp->getBaseFileName(cache_location)); + gSavedSettings.setString("CacheLocationTopFolder", top_folder); } void LLFloaterPreference::onClickSkin(LLUICtrl* ctrl, const LLSD& userdata) @@ -1008,6 +1046,22 @@ void LLFloaterPreference::onClickEnablePopup() buildLists(this); } +void LLFloaterPreference::onClickDisablePopup() +{ + LLScrollListCtrl& enabled_popups = getChildRef<LLScrollListCtrl>("enabled_popups"); + + std::vector<LLScrollListItem*> items = enabled_popups.getAllSelected(); + std::vector<LLScrollListItem*>::iterator itor; + for (itor = items.begin(); itor != items.end(); ++itor) + { + LLNotificationTemplatePtr templatep = LLNotifications::instance().getTemplate(*(std::string*)((*itor)->getUserdata())); + //gSavedSettings.setWarning(templatep->mName, TRUE); + std::string notification_name = templatep->mName; + LLUI::sSettingGroups["ignores"]->setBOOL(notification_name, FALSE); + } + + buildLists(this); +} void LLFloaterPreference::resetAllIgnored() { for (LLNotifications::TemplateMap::const_iterator iter = LLNotifications::instance().templatesBegin(); @@ -1036,15 +1090,17 @@ void LLFloaterPreference::setAllIgnored() void LLFloaterPreference::onClickLogPath() { - std::string proposed_name(childGetText("log_path_string")); + std::string proposed_name(gSavedPerAccountSettings.getString("InstantMessageLogPath")); LLDirPicker& picker = LLDirPicker::instance(); if (!picker.getDir(&proposed_name ) ) { return; //Canceled! } - - childSetText("log_path_string", picker.getDirName()); + std::string chat_log_dir = picker.getDirName(); + std::string chat_log_top_folder= gDirUtilp->getBaseFileName(chat_log_dir); + gSavedPerAccountSettings.setString("InstantMessageLogPath",chat_log_dir); + gSavedPerAccountSettings.setString("InstantMessageLogFolder",chat_log_top_folder); } void LLFloaterPreference::onCommitLogging() @@ -1054,15 +1110,17 @@ void LLFloaterPreference::onCommitLogging() void LLFloaterPreference::enableHistory() { - if (childGetValue("log_instant_messages").asBoolean() || childGetValue("log_chat").asBoolean()) + if (childGetValue("log_instant_messages").asBoolean()) { - childEnable("log_show_history"); + childEnable("ChatIMLogs"); childEnable("log_path_button"); + childEnable("show_timestamps_check_im"); } else { - childDisable("log_show_history"); + childDisable("ChatIMLogs"); childDisable("log_path_button"); + childDisable("show_timestamps_check_im"); } } @@ -1096,10 +1154,10 @@ void LLFloaterPreference::setPersonalInfo(const std::string& visibility, bool im childEnable("send_im_to_email"); childSetValue("send_im_to_email", im_via_email); childEnable("log_instant_messages"); - childEnable("log_chat"); +// childEnable("log_chat"); childEnable("busy_response"); - childEnable("log_instant_messages_timestamp"); - childEnable("log_chat_timestamp"); +// childEnable("log_instant_messages_timestamp"); +// childEnable("log_chat_timestamp"); childEnable("log_chat_IM"); childEnable("log_date_timestamp"); diff --git a/indra/newview/llfloaterpreference.h b/indra/newview/llfloaterpreference.h index cf2ccdce6d..23e05a1ccf 100644 --- a/indra/newview/llfloaterpreference.h +++ b/indra/newview/llfloaterpreference.h @@ -87,8 +87,8 @@ protected: void onBtnApply(); void onOpenHelp(); - static void onClickClearCache(void*); - static void onClickBrowserClearCache(void*); +// void onClickClearCache(); + void onClickBrowserClearCache(); // if the custom settings box is clicked void onChangeCustom(); @@ -112,6 +112,7 @@ public: void onClickSkipDialogs(); void onClickResetDialogs(); void onClickEnablePopup(); + void onClickDisablePopup(); void resetAllIgnored(); void setAllIgnored(); void onClickLogPath(); diff --git a/indra/newview/llimpanel.cpp b/indra/newview/llimpanel.cpp index 0652119f18..5b4f711099 100644 --- a/indra/newview/llimpanel.cpp +++ b/indra/newview/llimpanel.cpp @@ -1377,17 +1377,23 @@ void LLFloaterIMPanel::addHistoryLine(const std::string &utf8msg, const LLColor4 prepend_newline = false; } mHistoryEditor->appendColoredText(utf8msg, false, prepend_newline, color); - - if (log_to_file - && gSavedPerAccountSettings.getBOOL("LogInstantMessages") ) + S32 im_log_option = gSavedPerAccountSettings.getS32("IMLogOptions"); + if (log_to_file && (im_log_option!=LOG_CHAT)) { std::string histstr; - if (gSavedPerAccountSettings.getBOOL("IMLogTimestamp")) + if (gSavedPerAccountSettings.getBOOL("LogTimestamp")) histstr = LLLogChat::timestamp(gSavedPerAccountSettings.getBOOL("LogTimestampDate")) + name + separator_string + utf8msg; else histstr = name + separator_string + utf8msg; - LLLogChat::saveHistory(getTitle(),histstr); + if(im_log_option==LOG_BOTH_TOGETHER) + { + LLLogChat::saveHistory(std::string("chat"),histstr); + } + else + { + LLLogChat::saveHistory(getTitle(),histstr); + } } if (!isInVisibleChain()) @@ -1922,19 +1928,19 @@ void LLFloaterIMPanel::chatFromLogFile(LLLogChat::ELogLineType type, std::string { LLFloaterIMPanel* self = (LLFloaterIMPanel*)userdata; std::string message = line; - + S32 im_log_option = gSavedPerAccountSettings.getS32("IMLogOptions"); switch (type) { case LLLogChat::LOG_EMPTY: // add warning log enabled message - if (gSavedPerAccountSettings.getBOOL("LogInstantMessages")) + if (im_log_option!=LOG_CHAT) { message = LLTrans::getString("IM_logging_string"); } break; case LLLogChat::LOG_END: // add log end message - if (gSavedPerAccountSettings.getBOOL("LogInstantMessages")) + if (im_log_option!=LOG_CHAT) { message = LLTrans::getString("IM_logging_string"); } diff --git a/indra/newview/lllocationhistory.cpp b/indra/newview/lllocationhistory.cpp index 179eca2532..ed56e3e195 100644 --- a/indra/newview/lllocationhistory.cpp +++ b/indra/newview/lllocationhistory.cpp @@ -55,6 +55,11 @@ void LLLocationHistory::addItem(std::string item) mItems.erase(mItems.begin(), mItems.end()-max_items); } +void LLLocationHistory::removeItems() +{ + mItems.erase(mItems.begin(), mItems.end()); +} + bool LLLocationHistory::getMatchingItems(std::string substring, location_list_t& result) const { diff --git a/indra/newview/lllocationhistory.h b/indra/newview/lllocationhistory.h index d2a959ae62..b6552c12ca 100644 --- a/indra/newview/lllocationhistory.h +++ b/indra/newview/lllocationhistory.h @@ -50,6 +50,7 @@ public: LLLocationHistory(); void addItem(std::string item); + void removeItems(); size_t getItemCount() const { return mItems.size(); } const location_list_t& getItems() const { return mItems; } bool getMatchingItems(std::string substring, location_list_t& result) const; diff --git a/indra/newview/llnavigationbar.cpp b/indra/newview/llnavigationbar.cpp index b4a6e63de8..fbeff2d628 100644 --- a/indra/newview/llnavigationbar.cpp +++ b/indra/newview/llnavigationbar.cpp @@ -176,7 +176,8 @@ LLNavigationBar::LLNavigationBar() mBtnHome(NULL), mBtnHelp(NULL), mCmbLocation(NULL), - mLeSearch(NULL) + mLeSearch(NULL), + mPurgeTPHistoryItems(false) { setIsChrome(TRUE); @@ -247,6 +248,12 @@ BOOL LLNavigationBar::postBuild() void LLNavigationBar::draw() { + if(mPurgeTPHistoryItems) + { + LLTeleportHistory::getInstance()->purgeItems(); + onTeleportHistoryChanged(); + mPurgeTPHistoryItems = false; + } LLPanel::draw(); } @@ -531,3 +538,12 @@ void LLNavigationBar::invokeSearch(std::string search_text) { LLFloaterReg::showInstance("search", LLSD().insert("panel", "all").insert("id", LLSD(search_text))); } + +void LLNavigationBar::clearHistoryCache() +{ + mCmbLocation->removeall(); + LLLocationHistory* lh = LLLocationHistory::getInstance(); + lh->removeItems(); + lh->save(); + mPurgeTPHistoryItems= true; +} diff --git a/indra/newview/llnavigationbar.h b/indra/newview/llnavigationbar.h index 4c8375839e..846040e506 100644 --- a/indra/newview/llnavigationbar.h +++ b/indra/newview/llnavigationbar.h @@ -59,14 +59,15 @@ public: /*virtual*/ BOOL handleRightMouseDown(S32 x, S32 y, MASK mask); void handleLoginComplete(); - + void clearHistoryCache(); + private: LLNavigationBar(); void rebuildTeleportHistoryMenu(); void showTeleportHistoryMenu(); void invokeSearch(std::string search_text); - + // callbacks bool onLocationContextMenuItemEnabled(const LLSD& userdata); void onLocationContextMenuItemClicked(const LLSD& userdata); @@ -98,6 +99,7 @@ private: LLButton* mBtnHelp; LLLineEditor* mLeSearch; LLLocationInputCtrl* mCmbLocation; + bool mPurgeTPHistoryItems; }; #endif diff --git a/indra/newview/llpanelgroupgeneral.cpp b/indra/newview/llpanelgroupgeneral.cpp index 6f8d161001..b1b464b4e4 100644 --- a/indra/newview/llpanelgroupgeneral.cpp +++ b/indra/newview/llpanelgroupgeneral.cpp @@ -216,8 +216,7 @@ BOOL LLPanelGroupGeneral::postBuild() } mIncompleteMemberDataStr = getString("incomplete_member_data_str"); - mConfirmGroupCreateStr = getString("confirm_group_create_str"); - + // If the group_id is null, then we are creating a new group if (mGroupID.isNull()) { @@ -450,9 +449,7 @@ bool LLPanelGroupGeneral::apply(std::string& mesg) return false; } - LLSD args; - args["MESSAGE"] = mConfirmGroupCreateStr; - LLNotifications::instance().add("GenericAlertYesCancel", args, LLSD(), boost::bind(&LLPanelGroupGeneral::createGroupCallback, this, _1, _2)); + LLNotifications::instance().add("CreateGroupCost", LLSD(), LLSD(), boost::bind(&LLPanelGroupGeneral::createGroupCallback, this, _1, _2)); return false; } diff --git a/indra/newview/llpanelgroupgeneral.h b/indra/newview/llpanelgroupgeneral.h index 5d673d5219..c04b40819d 100644 --- a/indra/newview/llpanelgroupgeneral.h +++ b/indra/newview/llpanelgroupgeneral.h @@ -87,7 +87,6 @@ private: BOOL mChanged; BOOL mFirstUse; std::string mIncompleteMemberDataStr; - std::string mConfirmGroupCreateStr; LLUUID mDefaultIconID; // Group information (include any updates in updateChanged) diff --git a/indra/newview/llpanelpermissions.cpp b/indra/newview/llpanelpermissions.cpp index 96e8cbfd71..371c0f2df3 100644 --- a/indra/newview/llpanelpermissions.cpp +++ b/indra/newview/llpanelpermissions.cpp @@ -53,7 +53,6 @@ #include "llagent.h" #include "llstatusbar.h" // for getBalance() #include "lllineeditor.h" -#include "llradiogroup.h" #include "llcombobox.h" #include "lluiconstants.h" #include "lldbstrings.h" @@ -63,6 +62,7 @@ #include "llnamebox.h" #include "llviewercontrol.h" #include "lluictrlfactory.h" +#include "llspinctrl.h" #include "roles_constants.h" ///---------------------------------------------------------------------------- @@ -100,6 +100,8 @@ BOOL LLPanelPermissions::postBuild() childSetCommitCallback("checkbox for sale",LLPanelPermissions::onCommitSaleInfo,this); childSetCommitCallback("sale type",LLPanelPermissions::onCommitSaleType,this); + + childSetCommitCallback("Edit Cost", LLPanelPermissions::onCommitSaleInfo, this); childSetCommitCallback("checkbox next owner can modify",LLPanelPermissions::onCommitNextOwnerModify,this); childSetCommitCallback("checkbox next owner can copy",LLPanelPermissions::onCommitNextOwnerCopy,this); @@ -208,12 +210,9 @@ void LLPanelPermissions::refresh() childSetValue("search_check", FALSE); childSetEnabled("search_check", false); - LLRadioGroup* RadioSaleType = getChild<LLRadioGroup>("sale type"); - if(RadioSaleType) - { - RadioSaleType->setSelectedIndex(-1); - RadioSaleType->setEnabled(FALSE); - } + LLComboBox* combo_sale_type = getChild<LLComboBox>("sale type"); + combo_sale_type->setValue(LLSaleInfo::FS_COPY); + combo_sale_type->setEnabled(FALSE); childSetEnabled("Cost",false); childSetText("Cost",getString("Cost Default")); @@ -417,22 +416,22 @@ void LLPanelPermissions::refresh() childSetText("Cost",getString("Cost Default")); } - LLLineEditor *editPrice = getChild<LLLineEditor>("Edit Cost"); - if(keyboard_focus_view != editPrice) + LLSpinCtrl *edit_price = getChild<LLSpinCtrl>("Edit Cost"); + if(!edit_price->hasFocus()) { // If the sale price is mixed then set the cost to MIXED, otherwise // set to the actual cost. if (num_for_sale > 0 && is_for_sale_mixed) { - childSetText("Edit Cost",getString("Sale Mixed")); + edit_price->setTentative(TRUE); } else if (num_for_sale > 0 && is_sale_price_mixed) { - childSetText("Edit Cost",getString("Cost Mixed")); + edit_price->setTentative(TRUE); } else { - childSetText("Edit Cost",llformat("%d",individual_sale_price)); + edit_price->setValue(individual_sale_price); } } // The edit fields are only enabled if you can sell this object @@ -742,20 +741,17 @@ void LLPanelPermissions::refresh() BOOL valid_sale_info = LLSelectMgr::getInstance()->selectGetSaleInfo(sale_info); LLSaleInfo::EForSale sale_type = sale_info.getSaleType(); - LLRadioGroup* RadioSaleType = getChild<LLRadioGroup>("sale type"); - if(RadioSaleType) + LLComboBox* combo_sale_type = getChild<LLComboBox>("sale type"); + if (valid_sale_info) { - if (valid_sale_info) - { - RadioSaleType->setSelectedIndex((S32)sale_type - 1); - RadioSaleType->setTentative(FALSE); // unfortunately this doesn't do anything at the moment. - } - else - { - // default option is sell copy, determined to be safest - RadioSaleType->setSelectedIndex((S32)LLSaleInfo::FS_COPY - 1); - RadioSaleType->setTentative(TRUE); // unfortunately this doesn't do anything at the moment. - } + combo_sale_type->setValue(sale_type == LLSaleInfo::FS_NOT ? LLSaleInfo::FS_COPY : sale_type); + combo_sale_type->setTentative(FALSE); // unfortunately this doesn't do anything at the moment. + } + else + { + // default option is sell copy, determined to be safest + combo_sale_type->setValue(LLSaleInfo::FS_COPY); + combo_sale_type->setTentative(TRUE); // unfortunately this doesn't do anything at the moment. } childSetValue("checkbox for sale", num_for_sale != 0); @@ -991,44 +987,14 @@ void LLPanelPermissions::setAllSaleInfo() // Set the sale type if the object(s) are for sale. if(checkPurchase && checkPurchase->get()) { - LLRadioGroup* RadioSaleType = getChild<LLRadioGroup>("sale type"); - if(RadioSaleType) - { - switch(RadioSaleType->getSelectedIndex()) - { - case 0: - sale_type = LLSaleInfo::FS_ORIGINAL; - break; - case 1: - sale_type = LLSaleInfo::FS_COPY; - break; - case 2: - sale_type = LLSaleInfo::FS_CONTENTS; - break; - default: - sale_type = LLSaleInfo::FS_COPY; - break; - } - } + sale_type = static_cast<LLSaleInfo::EForSale>(getChild<LLComboBox>("sale type")->getValue().asInteger()); } S32 price = -1; - LLLineEditor *editPrice = getChild<LLLineEditor>("Edit Cost"); - if (editPrice) - { - // Don't extract the price if it's labeled as MIXED or is empty. - const std::string& editPriceString = editPrice->getText(); - if (editPriceString != getString("Cost Mixed") && editPriceString != getString("Sale Mixed") && - !editPriceString.empty()) - { - price = atoi(editPriceString.c_str()); - } - else - { - price = DEFAULT_PRICE; - } - } + LLSpinCtrl *edit_price = getChild<LLSpinCtrl>("Edit Cost"); + price = (edit_price->getTentative()) ? DEFAULT_PRICE : edit_price->getValue().asInteger(); + // If somehow an invalid price, turn the sale off. if (price < 0) sale_type = LLSaleInfo::FS_NOT; diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index e6a2ab4ace..d0432e7961 100644 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -891,10 +891,13 @@ bool idle_startup() } //Default the path if one isn't set. - if (gSavedPerAccountSettings.getString("InstantMessageLogPath").empty()) + if (gSavedPerAccountSettings.getString("InstantMessageLogFolder").empty()) { gDirUtilp->setChatLogsDir(gDirUtilp->getOSUserAppDir()); - gSavedPerAccountSettings.setString("InstantMessageLogPath",gDirUtilp->getChatLogsDir()); + std::string chat_log_dir = gDirUtilp->getChatLogsDir(); + std::string chat_log_top_folder=gDirUtilp->getBaseFileName(chat_log_dir); + gSavedPerAccountSettings.setString("InstantMessageLogPath",chat_log_dir); + gSavedPerAccountSettings.setString("InstantMessageLogFolder",chat_log_top_folder); } else { diff --git a/indra/newview/llteleporthistory.cpp b/indra/newview/llteleporthistory.cpp index 99389017cb..9754568f56 100644 --- a/indra/newview/llteleporthistory.cpp +++ b/indra/newview/llteleporthistory.cpp @@ -172,6 +172,14 @@ void LLTeleportHistory::onHistoryChanged() mHistoryChangedSignal(); } +void LLTeleportHistory::purgeItems() +{ + mItems.erase(mItems.begin(), mItems.end()-1); + // reset the count + mRequestedItem = -1; + mCurrentItem = 0; +} + // static std::string LLTeleportHistory::getCurrentLocationTitle() { diff --git a/indra/newview/llteleporthistory.h b/indra/newview/llteleporthistory.h index c68aabe9a1..775b21e24c 100644 --- a/indra/newview/llteleporthistory.h +++ b/indra/newview/llteleporthistory.h @@ -106,7 +106,7 @@ public: * @return history items. */ const slurl_list_t& getItems() const { return mItems; } - + void purgeItems(); /** * Is the history empty? * @@ -119,7 +119,6 @@ public: * Get index of the current location in the history. */ int getCurrentItemIndex() const { return mCurrentItem; } - /** * Set a callback to be called upon history changes. * diff --git a/indra/newview/lltoolpie.cpp b/indra/newview/lltoolpie.cpp index a937f156e8..350657538b 100644 --- a/indra/newview/lltoolpie.cpp +++ b/indra/newview/lltoolpie.cpp @@ -292,9 +292,11 @@ BOOL LLToolPie::pickLeftMouseDownCallback() return TRUE; } - // Could be first left-click on nothing - LLFirstUse::useLeftClickNoHit(); - + ////////// + // // Could be first left-click on nothing + // LLFirstUse::useLeftClickNoHit(); + ///////// + // Eat the event return LLTool::handleMouseDown(x, y, mask); } diff --git a/indra/newview/llviewerdisplay.cpp b/indra/newview/llviewerdisplay.cpp index c4ed4db3e2..f08c287529 100644 --- a/indra/newview/llviewerdisplay.cpp +++ b/indra/newview/llviewerdisplay.cpp @@ -312,8 +312,8 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot) LLImageGL::updateStats(gFrameTimeSeconds); - LLVOAvatar::sRenderName = gSavedSettings.getS32("RenderName"); - LLVOAvatar::sRenderGroupTitles = !gSavedSettings.getBOOL("RenderHideGroupTitleAll"); + LLVOAvatar::sRenderName = gSavedSettings.getS32("AvatarNameTagMode"); + LLVOAvatar::sRenderGroupTitles = (gSavedSettings.getBOOL("RenderShowGroupTitleAll") && gSavedSettings.getS32("AvatarNameTagMode")); gPipeline.mBackfaceCull = TRUE; gFrameCount++; diff --git a/indra/newview/llviewerparcelmedia.cpp b/indra/newview/llviewerparcelmedia.cpp index 57f7239a91..26e21133ac 100644 --- a/indra/newview/llviewerparcelmedia.cpp +++ b/indra/newview/llviewerparcelmedia.cpp @@ -208,7 +208,7 @@ void LLViewerParcelMedia::play(LLParcel* parcel) if (!parcel) return; - if (!gSavedSettings.getBOOL("AudioStreaming") || !gSavedSettings.getBOOL("AudioStreamingVideo")) + if (!gSavedSettings.getBOOL("AudioSteamingMedia") || !gSavedSettings.getBOOL("AudioStreamingVideo")) return; std::string media_url = parcel->getMediaURL(); @@ -389,8 +389,8 @@ bool callback_play_media(const LLSD& notification, const LLSD& response, LLParce if (option == 0) { gSavedSettings.setBOOL("AudioStreamingVideo", TRUE); - if(!gSavedSettings.getBOOL("AudioStreaming")) - gSavedSettings.setBOOL("AudioStreaming", TRUE); + if(!gSavedSettings.getBOOL("AudioSteamingMedia")) + gSavedSettings.setBOOL("AudioSteamingMedia", TRUE); LLViewerParcelMedia::play(parcel); } else diff --git a/indra/newview/llviewerparcelmgr.cpp b/indra/newview/llviewerparcelmgr.cpp index a702d3a85d..65f341627a 100644 --- a/indra/newview/llviewerparcelmgr.cpp +++ b/indra/newview/llviewerparcelmgr.cpp @@ -143,8 +143,11 @@ LLViewerParcelMgr::LLViewerParcelMgr() mCollisionSegments = new U8[(mParcelsPerEdge+1)*(mParcelsPerEdge+1)]; resetSegments(mCollisionSegments); - mBlockedImage = LLViewerTextureManager::getFetchedTextureFromFile("noentrylines.j2c"); - mPassImage = LLViewerTextureManager::getFetchedTextureFromFile("noentrypasslines.j2c"); + // JC: Resolved a merge conflict here, eliminated + // mBlockedImage->setAddressMode(LLTexUnit::TAM_WRAP); + // because it is done in llviewertexturelist.cpp + mBlockedImage = LLViewerTextureManager::getFetchedTextureFromFile("world/NoEntryLines.png"); + mPassImage = LLViewerTextureManager::getFetchedTextureFromFile("world/NoEntryPassLines.png"); S32 overlay_size = mParcelsPerEdge * mParcelsPerEdge / PARCEL_OVERLAY_CHUNKS; sPackedOverlay = new U8[overlay_size]; @@ -1710,7 +1713,7 @@ void LLViewerParcelMgr::processParcelProperties(LLMessageSystem *msg, void **use void optionally_start_music(const std::string& music_url) { - if (gSavedSettings.getBOOL("AudioStreamingMusic") && gSavedSettings.getBOOL("AudioStreaming")) + if (gSavedSettings.getBOOL("AudioStreamingMusic") && gSavedSettings.getBOOL("AudioSteamingMedia")) { // Make the user click the start button on the overlay bar. JC // llinfos << "Starting parcel music " << music_url << llendl; diff --git a/indra/newview/llviewertexturelist.cpp b/indra/newview/llviewertexturelist.cpp index c96914975b..2f3ed0e68a 100644 --- a/indra/newview/llviewertexturelist.cpp +++ b/indra/newview/llviewertexturelist.cpp @@ -136,18 +136,26 @@ void LLViewerTextureList::doPreloadImages() image->setAddressMode(LLTexUnit::TAM_WRAP); mImagePreloads.insert(image); } - image = LLViewerTextureManager::getFetchedTextureFromFile("noentrylines.j2c", MIPMAP_YES, IMMEDIATE_YES); + image = LLViewerTextureManager::getFetchedTextureFromFile("world/NoEntryLines.png", MIPMAP_YES, IMMEDIATE_YES); if (image) { image->setAddressMode(LLTexUnit::TAM_WRAP); mImagePreloads.insert(image); } - image = LLViewerTextureManager::getFetchedTextureFromFile("noentrypasslines.j2c", MIPMAP_YES, IMMEDIATE_YES); + else + { + llinfos << "JAMESDEBUG" << llendl; + } + image = LLViewerTextureManager::getFetchedTextureFromFile("world/NoEntryPassLines.png", MIPMAP_YES, IMMEDIATE_YES); if (image) { image->setAddressMode(LLTexUnit::TAM_WRAP); mImagePreloads.insert(image); } + else + { + llinfos << "JAMESDEBUG" << llendl; + } image = LLViewerTextureManager::getFetchedTexture(DEFAULT_WATER_NORMAL, MIPMAP_YES, IMMEDIATE_YES); if (image) { diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index 258061190b..714145ce14 100644 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -170,8 +170,8 @@ const LLColor4 DUMMY_COLOR = LLColor4(0.5,0.5,0.5,1.0); enum ERenderName { RENDER_NAME_NEVER, - RENDER_NAME_FADE, - RENDER_NAME_ALWAYS + RENDER_NAME_ALWAYS, + RENDER_NAME_FADE }; //----------------------------------------------------------------------------- @@ -2603,7 +2603,8 @@ void LLVOAvatar::idleUpdateNameTag(const LLVector3& root_pos_last) { render_name = render_name && !gAgent.cameraMouselook() - && (visible_chat || !gSavedSettings.getBOOL("RenderNameHideSelf")); + && (visible_chat || (gSavedSettings.getBOOL("RenderNameShowSelf") + && gSavedSettings.getS32("AvatarNameTagMode") )); } if ( render_name ) diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml index 69bd09f0e5..179c790aed 100644 --- a/indra/newview/skins/default/colors.xml +++ b/indra/newview/skins/default/colors.xml @@ -260,18 +260,18 @@ <color name="EffectColor" reference="White" /> - <color + <color name="FilterBackgroundColor" - reference="White" /> + reference="FloaterDefaultBackgroundColor" /> <color name="FilterTextColor" value="1 0.78 0.27 1" /> - <color + <color name="FloaterButtonImageColor" reference="LtGray" /> <color name="FloaterDefaultBackgroundColor" - reference="DkGray" /> + reference="DkGray_66" /> <color name="FloaterFocusBackgroundColor" reference="DkGray2" /> diff --git a/indra/newview/skins/default/textures/bottomtray/DownArrow.png b/indra/newview/skins/default/textures/bottomtray/DownArrow.png Binary files differnew file mode 100644 index 0000000000..82f58b22b9 --- /dev/null +++ b/indra/newview/skins/default/textures/bottomtray/DownArrow.png diff --git a/indra/newview/skins/default/textures/bottomtray/Unread_IM.png b/indra/newview/skins/default/textures/bottomtray/Unread_IM.png Binary files differnew file mode 100644 index 0000000000..a355917fca --- /dev/null +++ b/indra/newview/skins/default/textures/bottomtray/Unread_IM.png diff --git a/indra/newview/skins/default/textures/bottomtray/VoicePTT_Lvl1.png b/indra/newview/skins/default/textures/bottomtray/VoicePTT_Lvl1.png Binary files differnew file mode 100644 index 0000000000..cd18ae310d --- /dev/null +++ b/indra/newview/skins/default/textures/bottomtray/VoicePTT_Lvl1.png diff --git a/indra/newview/skins/default/textures/bottomtray/VoicePTT_Lvl2.png b/indra/newview/skins/default/textures/bottomtray/VoicePTT_Lvl2.png Binary files differnew file mode 100644 index 0000000000..b0ed6ee8eb --- /dev/null +++ b/indra/newview/skins/default/textures/bottomtray/VoicePTT_Lvl2.png diff --git a/indra/newview/skins/default/textures/bottomtray/VoicePTT_Lvl3.png b/indra/newview/skins/default/textures/bottomtray/VoicePTT_Lvl3.png Binary files differnew file mode 100644 index 0000000000..14ec77b99a --- /dev/null +++ b/indra/newview/skins/default/textures/bottomtray/VoicePTT_Lvl3.png diff --git a/indra/newview/skins/default/textures/bottomtray/VoicePTT_Off.png b/indra/newview/skins/default/textures/bottomtray/VoicePTT_Off.png Binary files differnew file mode 100644 index 0000000000..48be51e9af --- /dev/null +++ b/indra/newview/skins/default/textures/bottomtray/VoicePTT_Off.png diff --git a/indra/newview/skins/default/textures/bottomtray/VoicePTT_On.png b/indra/newview/skins/default/textures/bottomtray/VoicePTT_On.png Binary files differnew file mode 100644 index 0000000000..be4881b64c --- /dev/null +++ b/indra/newview/skins/default/textures/bottomtray/VoicePTT_On.png diff --git a/indra/newview/skins/default/textures/containers/Accordion_ArrowOpened_Off.png b/indra/newview/skins/default/textures/containers/Accordion_ArrowOpened_Off.png Binary files differnew file mode 100644 index 0000000000..d506cda5c9 --- /dev/null +++ b/indra/newview/skins/default/textures/containers/Accordion_ArrowOpened_Off.png diff --git a/indra/newview/skins/default/textures/icons/AddItem_Off.png b/indra/newview/skins/default/textures/icons/AddItem_Off.png Binary files differnew file mode 100644 index 0000000000..52d4f9bc80 --- /dev/null +++ b/indra/newview/skins/default/textures/icons/AddItem_Off.png diff --git a/indra/newview/skins/default/textures/icons/AddItem_Over.png b/indra/newview/skins/default/textures/icons/AddItem_Over.png Binary files differnew file mode 100644 index 0000000000..cad6e8d52f --- /dev/null +++ b/indra/newview/skins/default/textures/icons/AddItem_Over.png diff --git a/indra/newview/skins/default/textures/icons/AddItem_Press.png b/indra/newview/skins/default/textures/icons/AddItem_Press.png Binary files differnew file mode 100644 index 0000000000..acc898e5f4 --- /dev/null +++ b/indra/newview/skins/default/textures/icons/AddItem_Press.png diff --git a/indra/newview/skins/default/textures/icons/BackArrow_Off.png b/indra/newview/skins/default/textures/icons/BackArrow_Off.png Binary files differnew file mode 100644 index 0000000000..ff32192856 --- /dev/null +++ b/indra/newview/skins/default/textures/icons/BackArrow_Off.png diff --git a/indra/newview/skins/default/textures/icons/BackArrow_Over.png b/indra/newview/skins/default/textures/icons/BackArrow_Over.png Binary files differnew file mode 100644 index 0000000000..b36e03a8cf --- /dev/null +++ b/indra/newview/skins/default/textures/icons/BackArrow_Over.png diff --git a/indra/newview/skins/default/textures/icons/Info.png b/indra/newview/skins/default/textures/icons/Info.png Binary files differnew file mode 100644 index 0000000000..e52560281b --- /dev/null +++ b/indra/newview/skins/default/textures/icons/Info.png diff --git a/indra/newview/skins/default/textures/icons/OptionsMenu_Off.png b/indra/newview/skins/default/textures/icons/OptionsMenu_Off.png Binary files differnew file mode 100644 index 0000000000..25b055bfc0 --- /dev/null +++ b/indra/newview/skins/default/textures/icons/OptionsMenu_Off.png diff --git a/indra/newview/skins/default/textures/icons/OptionsMenu_Over.png b/indra/newview/skins/default/textures/icons/OptionsMenu_Over.png Binary files differnew file mode 100644 index 0000000000..fcabd4c6d3 --- /dev/null +++ b/indra/newview/skins/default/textures/icons/OptionsMenu_Over.png diff --git a/indra/newview/skins/default/textures/icons/OptionsMenu_Press.png b/indra/newview/skins/default/textures/icons/OptionsMenu_Press.png Binary files differnew file mode 100644 index 0000000000..6e91dd7159 --- /dev/null +++ b/indra/newview/skins/default/textures/icons/OptionsMenu_Press.png diff --git a/indra/newview/skins/default/textures/icons/TrashItem_Off.png b/indra/newview/skins/default/textures/icons/TrashItem_Off.png Binary files differnew file mode 100644 index 0000000000..bb64920ec4 --- /dev/null +++ b/indra/newview/skins/default/textures/icons/TrashItem_Off.png diff --git a/indra/newview/skins/default/textures/icons/TrashItem_Over.png b/indra/newview/skins/default/textures/icons/TrashItem_Over.png Binary files differnew file mode 100644 index 0000000000..1a0eea6c67 --- /dev/null +++ b/indra/newview/skins/default/textures/icons/TrashItem_Over.png diff --git a/indra/newview/skins/default/textures/icons/TrashItem_Press.png b/indra/newview/skins/default/textures/icons/TrashItem_Press.png Binary files differnew file mode 100644 index 0000000000..c62f833d86 --- /dev/null +++ b/indra/newview/skins/default/textures/icons/TrashItem_Press.png diff --git a/indra/newview/skins/default/textures/icons/VoicePTT_Lvl1.png b/indra/newview/skins/default/textures/icons/VoicePTT_Lvl1.png Binary files differnew file mode 100644 index 0000000000..cd18ae310d --- /dev/null +++ b/indra/newview/skins/default/textures/icons/VoicePTT_Lvl1.png diff --git a/indra/newview/skins/default/textures/icons/VoicePTT_Lvl2.png b/indra/newview/skins/default/textures/icons/VoicePTT_Lvl2.png Binary files differnew file mode 100644 index 0000000000..b0ed6ee8eb --- /dev/null +++ b/indra/newview/skins/default/textures/icons/VoicePTT_Lvl2.png diff --git a/indra/newview/skins/default/textures/icons/VoicePTT_Lvl3.png b/indra/newview/skins/default/textures/icons/VoicePTT_Lvl3.png Binary files differnew file mode 100644 index 0000000000..14ec77b99a --- /dev/null +++ b/indra/newview/skins/default/textures/icons/VoicePTT_Lvl3.png diff --git a/indra/newview/skins/default/textures/icons/VoicePTT_Off.png b/indra/newview/skins/default/textures/icons/VoicePTT_Off.png Binary files differnew file mode 100644 index 0000000000..48be51e9af --- /dev/null +++ b/indra/newview/skins/default/textures/icons/VoicePTT_Off.png diff --git a/indra/newview/skins/default/textures/icons/VoicePTT_On.png b/indra/newview/skins/default/textures/icons/VoicePTT_On.png Binary files differnew file mode 100644 index 0000000000..be4881b64c --- /dev/null +++ b/indra/newview/skins/default/textures/icons/VoicePTT_On.png diff --git a/indra/newview/skins/default/textures/taskpanel/TabIcon_Close_Off.png b/indra/newview/skins/default/textures/taskpanel/TabIcon_Close_Off.png Binary files differnew file mode 100644 index 0000000000..bc4e00c646 --- /dev/null +++ b/indra/newview/skins/default/textures/taskpanel/TabIcon_Close_Off.png diff --git a/indra/newview/skins/default/textures/taskpanel/TabIcon_Home_Off.png b/indra/newview/skins/default/textures/taskpanel/TabIcon_Home_Off.png Binary files differnew file mode 100644 index 0000000000..1e7d7beafa --- /dev/null +++ b/indra/newview/skins/default/textures/taskpanel/TabIcon_Home_Off.png diff --git a/indra/newview/skins/default/textures/taskpanel/TabIcon_Home_Selected.png b/indra/newview/skins/default/textures/taskpanel/TabIcon_Home_Selected.png Binary files differnew file mode 100644 index 0000000000..a70d3abbbf --- /dev/null +++ b/indra/newview/skins/default/textures/taskpanel/TabIcon_Home_Selected.png diff --git a/indra/newview/skins/default/textures/taskpanel/TabIcon_Me_Off.png b/indra/newview/skins/default/textures/taskpanel/TabIcon_Me_Off.png Binary files differnew file mode 100644 index 0000000000..2d36f70361 --- /dev/null +++ b/indra/newview/skins/default/textures/taskpanel/TabIcon_Me_Off.png diff --git a/indra/newview/skins/default/textures/taskpanel/TabIcon_Me_Selected.png b/indra/newview/skins/default/textures/taskpanel/TabIcon_Me_Selected.png Binary files differnew file mode 100644 index 0000000000..3c20459126 --- /dev/null +++ b/indra/newview/skins/default/textures/taskpanel/TabIcon_Me_Selected.png diff --git a/indra/newview/skins/default/textures/taskpanel/TabIcon_Open_Off.png b/indra/newview/skins/default/textures/taskpanel/TabIcon_Open_Off.png Binary files differnew file mode 100644 index 0000000000..4556602f58 --- /dev/null +++ b/indra/newview/skins/default/textures/taskpanel/TabIcon_Open_Off.png diff --git a/indra/newview/skins/default/textures/taskpanel/TabIcon_People_Off.png b/indra/newview/skins/default/textures/taskpanel/TabIcon_People_Off.png Binary files differnew file mode 100644 index 0000000000..c272372a39 --- /dev/null +++ b/indra/newview/skins/default/textures/taskpanel/TabIcon_People_Off.png diff --git a/indra/newview/skins/default/textures/taskpanel/TabIcon_People_Selected.png b/indra/newview/skins/default/textures/taskpanel/TabIcon_People_Selected.png Binary files differnew file mode 100644 index 0000000000..3828752606 --- /dev/null +++ b/indra/newview/skins/default/textures/taskpanel/TabIcon_People_Selected.png diff --git a/indra/newview/skins/default/textures/taskpanel/TabIcon_Places_Off.png b/indra/newview/skins/default/textures/taskpanel/TabIcon_Places_Off.png Binary files differnew file mode 100644 index 0000000000..d7ec33af55 --- /dev/null +++ b/indra/newview/skins/default/textures/taskpanel/TabIcon_Places_Off.png diff --git a/indra/newview/skins/default/textures/taskpanel/TabIcon_Places_Selected.png b/indra/newview/skins/default/textures/taskpanel/TabIcon_Places_Selected.png Binary files differnew file mode 100644 index 0000000000..dd7e361ea9 --- /dev/null +++ b/indra/newview/skins/default/textures/taskpanel/TabIcon_Places_Selected.png diff --git a/indra/newview/skins/default/textures/taskpanel/TabIcon_Things_Off.png b/indra/newview/skins/default/textures/taskpanel/TabIcon_Things_Off.png Binary files differnew file mode 100644 index 0000000000..e56eda9802 --- /dev/null +++ b/indra/newview/skins/default/textures/taskpanel/TabIcon_Things_Off.png diff --git a/indra/newview/skins/default/textures/taskpanel/TabIcon_Things_Selected.png b/indra/newview/skins/default/textures/taskpanel/TabIcon_Things_Selected.png Binary files differnew file mode 100644 index 0000000000..d4ac451c8e --- /dev/null +++ b/indra/newview/skins/default/textures/taskpanel/TabIcon_Things_Selected.png diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml index e6c9cdb246..7703211c3d 100644 --- a/indra/newview/skins/default/textures/textures.xml +++ b/indra/newview/skins/default/textures/textures.xml @@ -1,7 +1,9 @@ <textures version="101"> + <texture name="ScrollThumb_Horiz" file_name="widgets/ScrollThumb_Horiz.png" preload="true" scale.left="4" scale.top="10" scale.bottom="53" scale.right="4" /> <texture name="ScrollThumb_Vert" file_name="widgets/ScrollThumb_Vert.png" preload="true" scale.left="4" scale.top="53" scale.bottom="10" scale.right="4" /> <texture name="ScrollTrack_Vert" file_name="widgets/ScrollTrack_Vert.png" preload="true" scale.left="2" scale.top="40" scale.bottom="13" scale.right="0" /> + <texture name="ScrollTrack_Horiz" file_name="widgets/ScrollTrack_Horiz.png" preload="true" scale.left="0" scale.top="13" scale.bottom="40" scale.right="2" /> <texture name="sm_rounded_corners_simple.tga" scale.left="4" scale.top="4" scale.bottom="4" scale.right="4"/> <!--There are still references to this old textfield art in the code somewhere -erica--> @@ -30,6 +32,9 @@ <texture name="Checkbox_On_Disabled" file_name="widgets/Checkbox_On_Disabled.png" preload="true" /> <texture name="Checkbox_Off" file_name="widgets/Checkbox_Off.png" preload="true" /> <texture name="Checkbox_On" file_name="widgets/Checkbox_On.png" preload="true" /> + <texture name="Checkbox_On_Press" file_name="widgets/Checkbox_On_Press.png" preload="true" /> + <texture name="Checkbox_Press" file_name="widgets/Checkbox_Press.png" preload="true" /> + <texture name="RadioButton_On_Press" file_name="widgets/RadioButton_On_Press.png" preload="true" /> <texture name="minimize_inactive.tga" preload="true"/> <texture name="minimize.tga" preload="true" /> @@ -38,6 +43,95 @@ <texture name="Icon_Close_Background" file_name="windows/Icon_Close_Background.png" preload="true" /> <texture name="Icon_Close_Foreground" file_name="windows/Icon_Close_Foreground.png" preload="true" /> <texture name="Icon_Close_Press" file_name="windows/Icon_Close_Press.png" preload="true" /> + <texture name="Icon_Close_Toast" file_name="windows/Icon_Close_Toast.png" preload="true" /> + <texture name="Icon_Dock_Background" file_name="windows/Icon_Dock_Background.png" preload="true" /> + <texture name="Icon_Dock_Foreground" file_name="windows/Icon_Dock_Foreground.png" preload="true" /> + <texture name="Icon_Dock_Press" file_name="windows/Icon_Dock_Press.png" preload="true" /> + <texture name="Icon_Undock_Background" file_name="windows/Icon_Undock_Background.png" preload="true" /> + <texture name="Icon_Undock_Foreground" file_name="windows/Icon_Undock_Foreground.png" preload="true" /> + <texture name="Icon_Undock_Press" file_name="windows/Icon_Undock_Press.png" preload="true" /> + <texture name="Toast_CloseBtn" file_name="windows/Toast_CloseBtn.png" preload="true" /> + <texture name="Toast" file_name="windows/Toast.png" preload="true" /> + + <texture name="Window_Background" file_name="windows/Window_Background.png" preload="true" /> + <texture name="Window_Foreground" file_name="windows/Window_Foreground.png" preload="true" /> + + <texture name="Favorite_Star_Active" file_name="navbar/Favorite_Star_Active.png" preload="true" /> + <texture name="Favorite_Star_Off" file_name="navbar/Favorite_Star_Off.png" preload="true" /> + <texture name="Favorite_Star_Press" file_name="navbar/Favorite_Star_Press.png" preload="true" /> + <texture name="FileMenu_BarSelect" file_name="navbar/FileMenu_BarSelect.png" preload="true" /> + <texture name="FileMenu_BG" file_name="navbar/FileMenu_BG.png" preload="true" /> + <texture name="NavBar_BG_NoFav" file_name="navbar/NavBar_BG_NoFav.png" preload="true" /> + <texture name="NavBar_BG" file_name="navbar/NavBar_BG.png" preload="true" /> + <texture name="Row_Selection" file_name="navbar/Row_Selection.png" preload="true" /> + + <texture name="BottomTray_BG" file_name="bottomtray/BottomTray_BG.png" preload="true" /> + <texture name="DownArrow" file_name="bottomtray/DownArrow.png" preload="true" /> + <texture name="NearbyVoice_Lvl1" file_name="bottomtray/NearbyVoice_Lvl1.png" preload="true" /> + <texture name="NearbyVoice_Lvl2" file_name="bottomtray/NearbyVoice_Lvl2.png" preload="true" /> + <texture name="NearbyVoice_Lvl3" file_name="bottomtray/NearbyVoice_Lvl3.png" preload="true" /> + <texture name="NearbyVoice_On" file_name="bottomtray/NearbyVoice_On.png" preload="true" /> + <texture name="Unread_IM" file_name="bottomtray/Unread_IM.png" preload="true" /> + <texture name="Unread_Msg" file_name="bottomtray/Unread_Msg.png" preload="true" /> + <texture name="VoicePPT_Lvl1" file_name="bottomtray/VoicePPT_Lvl1.png" preload="true" /> + <texture name="VoicePPT_Lvl2" file_name="bottomtray/VoicePPT_Lvl2.png" preload="true" /> + <texture name="VoicePPT_Lvl3" file_name="bottomtray/VoicePPT_Lvl3.png" preload="true" /> + <texture name="VoicePPT_Off" file_name="bottomtray/VoicePPT_Off.png" preload="true" /> + <texture name="VoicePPT_On" file_name="bottomtray/VoicePPT_On.png" preload="true" /> + + <texture name="Accordion_ArrowClosed_Off" file_name="containers/Accordion_ArrowClosed_Off.png" preload="true" /> + <texture name="Accordion_ArrowClosed_Press" file_name="containers/Accordion_ArrowClosed_Press.png" preload="true" /> + <texture name="Accordion_ArrowOpened_Off" file_name="containers/Accordion_ArrowOpened_Off.png" preload="true" /> + <texture name="Accordion_ArrowOpened_Press" file_name="containers/Accordion_ArrowOpened_Press.png" preload="true" /> + <texture name="Accordion_Off" file_name="containers/Accordion_Off.png" preload="true" /> + <texture name="Accordion_Press" file_name="containers/Accordion_Press.png" preload="true" /> + <texture name="Container" file_name="containers/Container.png" preload="true" /> + <texture name="TabTop_Divider" file_name="containers/TabTop_Divider.png" preload="true" /> + <texture name="TabTop_Left_Press" file_name="containers/TabTop_Left_Press.png" preload="true" /> + <texture name="TabTop_Middle_Press" file_name="containers/TabTop_Middle_Press.png" preload="true" /> + <texture name="TabTop_Right_Off" file_name="containers/TabTop_Right_Off.png" preload="true" /> + <texture name="TabTop_Right_Press" file_name="containers/TabTop_Right_Press.png" preload="true" /> + <texture name="TabTop_Right_Selected" file_name="containers/TabTop_Right_Selected.png" preload="true" /> + <texture name="Toolbar_Divider" file_name="containers/Toolbar_Divider.png" preload="true" /> + <texture name="Toolbar_Left_Off" file_name="containers/Toolbar_Left_Off.png" preload="true" /> + <texture name="Toolbar_Left_Press" file_name="containers/Toolbar_Left_Press.png" preload="true" /> + <texture name="Toolbar_Left_Selected" file_name="containers/Toolbar_Left_Selected.png" preload="true" /> + <texture name="Toolbar_Middle_Off" file_name="containers/Toolbar_Middle_Off.png" preload="true" /> + <texture name="Toolbar_Middle_Press" file_name="containers/Toolbar_Middle_Press.png" preload="true" /> + <texture name="Toolbar_Middle_Selected" file_name="containers/Toolbar_Middle_Selected.png" preload="true" /> + <texture name="Toolbar_Right_Off" file_name="containers/Toolbar_Right_Off.png" preload="true" /> + <texture name="Toolbar_Right_Press" file_name="containers/Toolbar_Right_Press.png" preload="true" /> + <texture name="Toolbar_Right_Selected" file_name="containers/Toolbar_Right_Selected.png" preload="true" /> + + <texture name="AddItem_Off" file_name="icons/AddItem_Off.png" preload="true" /> + <texture name="AddItem_Press" file_name="icons/AddItem_Press.png" preload="true" /> + <texture name="BackArrow_Off" file_name="icons/BackArrow_Off.png" preload="true" /> + <texture name="BackArrow_Press" file_name="icons/BackArrow_Press.png" preload="true" /> + <texture name="Info" file_name="icons/Info.png" preload="true" /> + <texture name="OptionsMenu_Off" file_name="icons/OptionsMenu_Off.png" preload="true" /> + <texture name="OptionsMenu_Press" file_name="icons/OptionsMenu_Press.png" preload="true" /> + <texture name="TrashItem_Off" file_name="icons/TrashItem_Off.png" preload="true" /> + <texture name="TrashItem_Press" file_name="icons/TrashItem_Press.png" preload="true" /> + <texture name="Widget_DownArrow" file_name="icons/Widget_DownArrow.png" preload="true" /> + + <texture name="TabIcon_Close_Off" file_name="taskpanel/TabIcon_Close_Off.png" preload="true" /> + <texture name="TabIcon_Home_Off" file_name="taskpanel/TabIcon_Home_Off.png" preload="true" /> + <texture name="TabIcon_Home_Selected" file_name="taskpanel/TabIcon_Home_Selected.png" preload="true" /> + <texture name="TabIcon_Me_Off" file_name="taskpanel/TabIcon_Me_Off.png" preload="true" /> + <texture name="TabIcon_Me_Selected" file_name="taskpanel/TabIcon_Me_Selected.png" preload="true" /> + <texture name="TabIcon_Open_Off" file_name="taskpanel/TabIcon_Open_Off.png" preload="true" /> + <texture name="TabIcon_People_Off" file_name="taskpanel/TabIcon_People_Off.png" preload="true" /> + <texture name="TabIcon_People_Selected" file_name="taskpanel/TabIcon_People_Selected.png" preload="true" /> + <texture name="TabIcon_Places_Off" file_name="taskpanel/TabIcon_Places_Off.png" preload="true" /> + <texture name="TabIcon_Places_Selected" file_name="taskpanel/TabIcon_Places_Selected.png" preload="true" /> + <texture name="TabIcon_Things_Off" file_name="taskpanel/TabIcon_Things_Off.png" preload="true" /> + <texture name="TabIcon_Things_Selected" file_name="taskpanel/TabIcon_Things_Selected.png" preload="true" /> + + <texture name="DisclosureArrow_Closed_Off" file_name="widgets/DisclosureArrow_Closed_Off.png" preload="true" /> + <texture name="DisclosureArrow_Closed_Process" file_name="widgets/DisclosureArrow_Closed_Process.png" preload="true" /> + <texture name="DisclosureArrow_Opened_Off" file_name="widgets/DisclosureArrow_Opened_Off.png" preload="true" /> + <texture name="DisclosureArrow_Opened_Press" file_name="widgets/DisclosureArrow_Opened_Press.png" preload="true" /> + <texture name="ListItem_Select" file_name="widgets/ListItem_Select.png" preload="true" /> <texture name="RadioButton_Off" file_name="widgets/RadioButton_Off.png" preload="true" /> <texture name="RadioButton_On" file_name="widgets/RadioButton_On.png" preload="true" /> @@ -171,8 +265,8 @@ <texture name="media_icon.tga" file_name="icn_label_media.tga" /> <texture name="music_icon.tga" file_name="icn_label_music.tga" /> - <texture name="noentrylines.j2c" use_mips="true"/> - <texture name="noentrypasslines.j2c" use_mips="true"/> + <texture name="NoEntryLines" file_name="world/NoEntryLines.png" use_mips="true" preload="true" /> + <texture name="NoEntryPassLines" file_name="world/NoEntryPassLines.png" use_mips="true" preload="true" /> <texture name="notify_tip_icon.tga"/> <texture name="notify_caution_icon.tga"/> @@ -248,8 +342,10 @@ <texture name="mute_icon.tga"/> <texture name="SliderTrack_Horiz" file_name="widgets/SliderTrack_Horiz.png" scale.left="4" scale.top="4" scale.right="100" scale.bottom="2" /> + <texture name="SliderTrack_Vert" file_name="widgets/SliderTrack_Vert.png" scale.left="2" scale.top="100" scale.right="4" scale.bottom="4" /> <texture name="SliderThumb_Off" file_name="widgets/SliderThumb_Off.png" /> - + <texture name="SliderThumb_Disabled" file_name="widgets/SliderThumb_Disabled.png" /> + <texture name="SliderThumb_Press" file_name="widgets/SliderThumb_Press.png" /> <texture name="icn_speaker-muted_dark.tga"/> <texture name="icn_speaker_dark.tga"/> @@ -374,5 +470,11 @@ <texture name="Icon_Gear_Foreground" file_name="windows/Icon_Gear_Foreground.png" preload="true"/> <texture name="Icon_Gear_Press" file_name="windows/Icon_Gear_Press.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"/> + <texture name="Stepper_Up_Disabled" file_name="widgets/Stepper_Up_Disabled.png" preload="true"/> + <texture name="Stepper_Up_Off" file_name="widgets/Stepper_Up_Off.png" preload="true"/> + <texture name="Stepper_Up_Press" file_name="widgets/Stepper_Up_Press.png" preload="true"/> </textures> diff --git a/indra/newview/skins/default/textures/widgets/DisclosureArrow_Closed_Over.png b/indra/newview/skins/default/textures/widgets/DisclosureArrow_Closed_Over.png Binary files differnew file mode 100644 index 0000000000..45bcb0464e --- /dev/null +++ b/indra/newview/skins/default/textures/widgets/DisclosureArrow_Closed_Over.png diff --git a/indra/newview/skins/default/textures/widgets/DisclosureArrow_Opened_Off.png b/indra/newview/skins/default/textures/widgets/DisclosureArrow_Opened_Off.png Binary files differnew file mode 100644 index 0000000000..75057938d2 --- /dev/null +++ b/indra/newview/skins/default/textures/widgets/DisclosureArrow_Opened_Off.png diff --git a/indra/newview/skins/default/textures/widgets/DisclosureArrow_Opened_Over.png b/indra/newview/skins/default/textures/widgets/DisclosureArrow_Opened_Over.png Binary files differnew file mode 100644 index 0000000000..dabbd85b34 --- /dev/null +++ b/indra/newview/skins/default/textures/widgets/DisclosureArrow_Opened_Over.png diff --git a/indra/newview/skins/default/textures/widgets/ListItem_Over.png b/indra/newview/skins/default/textures/widgets/ListItem_Over.png Binary files differnew file mode 100644 index 0000000000..4b2b9ab3e5 --- /dev/null +++ b/indra/newview/skins/default/textures/widgets/ListItem_Over.png diff --git a/indra/newview/skins/default/textures/widgets/ListItem_Select.png b/indra/newview/skins/default/textures/widgets/ListItem_Select.png Binary files differnew file mode 100644 index 0000000000..317c672441 --- /dev/null +++ b/indra/newview/skins/default/textures/widgets/ListItem_Select.png diff --git a/indra/newview/skins/default/textures/widgets/Stepper_Down_Off.png b/indra/newview/skins/default/textures/widgets/Stepper_Down_Off.png Binary files differnew file mode 100644 index 0000000000..cf0d8ee2c1 --- /dev/null +++ b/indra/newview/skins/default/textures/widgets/Stepper_Down_Off.png diff --git a/indra/newview/skins/default/textures/widgets/Stepper_Down_Over.png b/indra/newview/skins/default/textures/widgets/Stepper_Down_Over.png Binary files differnew file mode 100644 index 0000000000..01e0a2d9f1 --- /dev/null +++ b/indra/newview/skins/default/textures/widgets/Stepper_Down_Over.png diff --git a/indra/newview/skins/default/textures/widgets/Stepper_Down_Press.png b/indra/newview/skins/default/textures/widgets/Stepper_Down_Press.png Binary files differnew file mode 100644 index 0000000000..fe3a7beafd --- /dev/null +++ b/indra/newview/skins/default/textures/widgets/Stepper_Down_Press.png diff --git a/indra/newview/skins/default/textures/widgets/Stepper_Up_Off.png b/indra/newview/skins/default/textures/widgets/Stepper_Up_Off.png Binary files differnew file mode 100644 index 0000000000..133589b8a6 --- /dev/null +++ b/indra/newview/skins/default/textures/widgets/Stepper_Up_Off.png diff --git a/indra/newview/skins/default/textures/widgets/Stepper_Up_Over.png b/indra/newview/skins/default/textures/widgets/Stepper_Up_Over.png Binary files differnew file mode 100644 index 0000000000..2ce84ea5be --- /dev/null +++ b/indra/newview/skins/default/textures/widgets/Stepper_Up_Over.png diff --git a/indra/newview/skins/default/textures/widgets/Stepper_Up_Press.png b/indra/newview/skins/default/textures/widgets/Stepper_Up_Press.png Binary files differnew file mode 100644 index 0000000000..e83babc519 --- /dev/null +++ b/indra/newview/skins/default/textures/widgets/Stepper_Up_Press.png diff --git a/indra/newview/skins/default/textures/world/NoEntryLines.png b/indra/newview/skins/default/textures/world/NoEntryLines.png Binary files differnew file mode 100644 index 0000000000..5a1f0ea95e --- /dev/null +++ b/indra/newview/skins/default/textures/world/NoEntryLines.png diff --git a/indra/newview/skins/default/textures/world/NoEntryPassLines.png b/indra/newview/skins/default/textures/world/NoEntryPassLines.png Binary files differnew file mode 100644 index 0000000000..e4b8fc6ae2 --- /dev/null +++ b/indra/newview/skins/default/textures/world/NoEntryPassLines.png diff --git a/indra/newview/skins/default/xui/en/floater_about.xml b/indra/newview/skins/default/xui/en/floater_about.xml index f52c5d6175..ece0cf737f 100644 --- a/indra/newview/skins/default/xui/en/floater_about.xml +++ b/indra/newview/skins/default/xui/en/floater_about.xml @@ -101,7 +101,7 @@ Voice chat Audio coding: Polycom(R) Siren14(TM) (ITU-T Rec. G.722.1 Annex C) - To be a success in business, be daring, be first, be different. --Henry Marchant + Oh, Parabuild, why hast thou forsaken me? </text_editor> <text_editor follows="left|top|right|bottom" 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 aec4de7e0d..1fb0942461 100644 --- a/indra/newview/skins/default/xui/en/floater_about_land.xml +++ b/indra/newview/skins/default/xui/en/floater_about_land.xml @@ -56,7 +56,7 @@ </panel.string> <panel.string name="area_size_text"> - [AREA] sq.m. + [AREA] m² </panel.string> <panel.string name="auction_id_text"> @@ -264,7 +264,7 @@ Go to World menu > About Land or select another parcel to show its details. 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&apos;s land allocation." + 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" /> <button @@ -324,7 +324,7 @@ Go to World menu > About Land or select another parcel to show its details. name="For Sale: Price L$[PRICE]." top_delta="0" width="226"> - Price: L$[PRICE] (L$[PRICE_PER_SQM]/sq.m.). + Price: L$[PRICE] (L$[PRICE_PER_SQM]/m²). </text> <text enabled="false" @@ -437,7 +437,7 @@ Go to World menu > About Land or select another parcel to show its details. name="PriceText" top_delta="0" width="186"> - 4048 sq.m. + 4048 m² </text> <text type="string" @@ -1176,7 +1176,7 @@ Go to World menu > About Land or select another parcel to show its details. </panel.string> <panel.string name="search_disabled_small_tooltip"> - This option is disabled because this parcel's area is 128 sq.m. or smaller. + This option is disabled because this parcel's area is 128 m² or smaller. Only large parcels can be listed in search. </panel.string> <panel.string diff --git a/indra/newview/skins/default/xui/en/floater_buy_contents.xml b/indra/newview/skins/default/xui/en/floater_buy_contents.xml index 22db78a309..0930043659 100644 --- a/indra/newview/skins/default/xui/en/floater_buy_contents.xml +++ b/indra/newview/skins/default/xui/en/floater_buy_contents.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater can_resize="true" - height="250" + height="300" layout="topleft" min_height="150" min_width="200" @@ -62,33 +62,33 @@ width="281"> Buy for L$[AMOUNT] from [NAME]? </text> - <button - follows="right|bottom" + <check_box + follows="left|bottom" height="20" - label="Cancel" - label_selected="Cancel" + label="Wear clothing now" layout="topleft" - left="211" - name="cancel_btn" + left_delta="0" + name="wear_check" top="224" - width="60" /> + width="135" /> <button follows="right|bottom" height="20" label="Buy" label_selected="Buy" layout="topleft" - left_delta="-64" + left_delta="0" name="buy_btn" - top_delta="0" - width="60" /> - <check_box - follows="left|bottom" + top_pad="10" + width="125" /> + <button + follows="right|bottom" height="20" - label="Wear clothing now" + label="Cancel" + label_selected="Cancel" layout="topleft" - left_delta="-139" - name="wear_check" + left_pad="5" + name="cancel_btn" top_delta="0" - width="135" /> + width="125" /> </floater> diff --git a/indra/newview/skins/default/xui/en/floater_buy_land.xml b/indra/newview/skins/default/xui/en/floater_buy_land.xml index 8e0ea68f27..ca025346fd 100644 --- a/indra/newview/skins/default/xui/en/floater_buy_land.xml +++ b/indra/newview/skins/default/xui/en/floater_buy_land.xml @@ -104,7 +104,7 @@ Try selecting a smaller area. </floater.string> <floater.string name="land_holdings"> - You hold [BUYER] sq.m. of land. + You hold [BUYER] m² of land. </floater.string> <floater.string name="pay_to_for_land"> @@ -116,19 +116,19 @@ Try selecting a smaller area. </floater.string> <floater.string name="parcel_meters"> - This parcel is [AMOUNT] sq.m. + This parcel is [AMOUNT] m² </floater.string> <floater.string name="premium_land"> - This land is premium, and will charge as [AMOUNT] sq.m. + This land is premium, and will charge as [AMOUNT] m². </floater.string> <floater.string name="discounted_land"> - This land is discounted, and will charge as [AMOUNT] sq.m. + This land is discounted, and will charge as [AMOUNT] m². </floater.string> <floater.string name="meters_supports_object"> - [AMOUNT] sq.m. + [AMOUNT] m² supports [AMOUNT2] objects </floater.string> <floater.string @@ -142,7 +142,7 @@ supports [AMOUNT2] objects <floater.string name="info_price_string"> L$ [PRICE] -(L$ [PRICE_PER_SQM]/sq.m.) +(L$ [PRICE_PER_SQM]/m²) [SOLD_WITH_OBJECTS] </floater.string> <floater.string @@ -413,7 +413,7 @@ supports [AMOUNT2] objects name="info_size" top_delta="-1" width="180"> - 1024 sq.m. + 1024 m² </text> <text type="string" @@ -437,7 +437,7 @@ supports [AMOUNT2] objects top_delta="-1" width="180"> L$ 1500 -(L$ 1.1/sq.m.) +(L$ 1.1/m²) sold with objects </text> <text @@ -575,8 +575,8 @@ sold with objects name="land_use_reason" right="435" width="215"> - You hold 1309 sq.m. of land. - This parcel is 512 sq.m. of land. + You hold 1309 m² of land. + This parcel is 512 m² of land. </text> <locate height="10" @@ -671,7 +671,7 @@ sold with objects <check_box follows="bottom|left" height="20" - label="Remove [AMOUNT] square meters of contribution from group." + label="Remove [AMOUNT] m² of contribution from group." layout="topleft" left_delta="3" name="remove_contribution" diff --git a/indra/newview/skins/default/xui/en/floater_buy_object.xml b/indra/newview/skins/default/xui/en/floater_buy_object.xml index 499fcf5a8a..24010dda93 100644 --- a/indra/newview/skins/default/xui/en/floater_buy_object.xml +++ b/indra/newview/skins/default/xui/en/floater_buy_object.xml @@ -88,21 +88,21 @@ <button follows="right|bottom" height="20" - label="Cancel" - label_selected="Cancel" + label="Buy" + label_selected="Buy" layout="topleft" - left="211" - name="cancel_btn" - top="224" - width="60" /> + left="10" + name="buy_btn" + top_pad="5" + width="125" /> <button follows="right|bottom" height="20" - label="Buy" - label_selected="Buy" + label="Cancel" + label_selected="Cancel" layout="topleft" - left_delta="-64" - name="buy_btn" + left_pad="5" + name="cancel_btn" top_delta="0" - width="60" /> + width="125" /> </floater> diff --git a/indra/newview/skins/default/xui/en/floater_gesture.xml b/indra/newview/skins/default/xui/en/floater_gesture.xml index 9751ae970b..f042385fb4 100644 --- a/indra/newview/skins/default/xui/en/floater_gesture.xml +++ b/indra/newview/skins/default/xui/en/floater_gesture.xml @@ -38,11 +38,11 @@ <scroll_list.columns label="Name" name="name" - width="105" /> + width="90" /> <scroll_list.columns label="Trigger" name="trigger" - width="70" /> + width="80" /> <scroll_list.columns label="" name="key" diff --git a/indra/newview/skins/default/xui/en/floater_god_tools.xml b/indra/newview/skins/default/xui/en/floater_god_tools.xml index 0359f90ea6..e421b1bb5d 100644 --- a/indra/newview/skins/default/xui/en/floater_god_tools.xml +++ b/indra/newview/skins/default/xui/en/floater_god_tools.xml @@ -415,7 +415,7 @@ name="land cost text" top_delta="0" width="110"> - L$ per sq. meter: + L$ per m²: </text> <button follows="top|right" diff --git a/indra/newview/skins/default/xui/en/floater_land_holdings.xml b/indra/newview/skins/default/xui/en/floater_land_holdings.xml index faf14575e4..0a97a96ee3 100644 --- a/indra/newview/skins/default/xui/en/floater_land_holdings.xml +++ b/indra/newview/skins/default/xui/en/floater_land_holdings.xml @@ -7,7 +7,7 @@ width="280"> <floater.string name="area_string"> - [AREA] sq. meters + [AREA] m² </floater.string> <scroll_list draw_heading="true" @@ -112,7 +112,7 @@ current payment plan: name="allowed_text" top_delta="10" width="132"> - [AREA] sq. meters + [AREA] m² </text> <text type="string" @@ -136,7 +136,7 @@ current payment plan: name="current_text" top_delta="0" width="132"> - [AREA] sq. meters + [AREA] m² </text> <text type="string" @@ -163,6 +163,6 @@ purchases: name="available_text" top_delta="5" width="140"> - [AREA] sq. meters + [AREA] m² </text> </floater>
\ No newline at end of file diff --git a/indra/newview/skins/default/xui/en/floater_live_lsleditor.xml b/indra/newview/skins/default/xui/en/floater_live_lsleditor.xml index 0735ac160a..6d6c6c6644 100644 --- a/indra/newview/skins/default/xui/en/floater_live_lsleditor.xml +++ b/indra/newview/skins/default/xui/en/floater_live_lsleditor.xml @@ -14,7 +14,7 @@ width="500"> <floater.string name="not_allowed"> - You are not allowed to view this script. + You can not view or edit this script, since it has been set as "no copy". You need full permissions to view or edit a script inside an object. </floater.string> <floater.string name="script_running"> diff --git a/indra/newview/skins/default/xui/en/floater_media_browser.xml b/indra/newview/skins/default/xui/en/floater_media_browser.xml index 15ec2e220f..a277294be1 100644 --- a/indra/newview/skins/default/xui/en/floater_media_browser.xml +++ b/indra/newview/skins/default/xui/en/floater_media_browser.xml @@ -9,47 +9,71 @@ save_rect="true" title="Media Browser" width="820"> + <!--TODO: ADD CLOSE X TO WINDOW--> + <!-- <button + follows="bottom|right" + height="20" + label="Close" + layout="topleft" + left_pad="80" + name="close" + top_delta="0" + width="70"> + <button.commit_callback + function="MediaBrowser.Close" /> + </button>--> <layout_stack - bottom="440" follows="left|right|top|bottom" layout="topleft" left="10" name="stack1" top="20" - width="800"> + width="800" + height="400" + > <layout_panel auto_resize="false" - height="20" layout="topleft" - left="0" name="nav_controls" - top="400" - user_resize="false" - width="800"> + user_resize="false"> <button - follows="left|top" - height="20" - label="Back" - layout="topleft" - left="0" - name="back" - top="0" - width="55"> - <button.commit_callback - function="MediaBrowser.Back" /> - </button> + left="1" + follows="left|top" + font="SansSerifSmall" + height="20" + image_disabled="PushButton_Disabled" + image_disabled_selected="PushButton_Disabled" + image_overlay="Arrow_Left_Off" + image_selected="PushButton_Selected" + image_unselected="PushButton_Off" + hover_glow_amount="0.15" + layout="topleft" + name="back" + picture_style="true" + tool_tip="Go back to previous location" + width="20"> + <button.commit_callback + function="MediaBrowser.Back" /> + </button> <button - follows="left|top" - height="20" - label="Forward" - layout="topleft" - left_pad="3" - name="forward" - top_delta="0" - width="68"> - <button.commit_callback - function="MediaBrowser.Forward" /> - </button> + follows="left|top" + font="SansSerifSmall" + height="20" + image_disabled="PushButton_Disabled" + image_disabled_selected="PushButton_Disabled" + image_overlay="Arrow_Right_Off" + image_selected="PushButton_Selected" + image_unselected="PushButton_Off" + hover_glow_amount="0.15" + layout="topleft" + left_pad="2" + name="forward" + picture_style="true" + tool_tip="Go forward one location" + width="20"> + <button.commit_callback + function="MediaBrowser.Forward" /> + </button> <button enabled="false" follows="left|top" @@ -58,24 +82,26 @@ layout="topleft" left_pad="2" name="reload" - top_delta="0" width="70"> - <button.commit_callback - function="MediaBrowser.Refresh" /> - </button> + <button.commit_callback + function="MediaBrowser.Refresh" /> + </button> <combo_box allow_text_entry="true" - follows="left|top|right" - height="20" - layout="topleft" - left_pad="5" - max_chars="255" name="address" - top_delta="0" - width="540"> - <combo_box.commit_callback - function="MediaBrowser.EnterAddress" /> - </combo_box> + follows="left|right|top" + halign="right" + height="20" + label="Location" + layout="topleft" + left_pad="5" + max_chars="254" + mouse_opaque="false" + top_delta="0" + width="340"> + <combo_box.commit_callback + function="MediaBrowser.EnterAddress" /> + </combo_box> <button enabled="false" follows="right|top" @@ -84,22 +110,31 @@ layout="topleft" left_pad="5" name="go" - top_delta="0" - width="55"> - <button.commit_callback - function="MediaBrowser.Go" /> - </button> - </layout_panel> - <layout_panel - auto_resize="false" - height="20" - layout="topleft" - left_delta="0" - name="parcel_owner_controls" - top_delta="0" - user_resize="false" - width="540"> + width="50"> + <button.commit_callback + function="MediaBrowser.Go" /> + </button> <button + follows="right|top" + height="20" + left_pad="20" + label="Open in My Browser" + layout="topleft" + name="open_browser" + width="145"> + <button.commit_callback + function="MediaBrowser.OpenWebBrowser" /> + </button> + <check_box + control_name="UseExternalBrowser" + follows="right|top" + label="Always" + layout="topleft" + left_pad="5" + width="140" + name="open_always" /> + <!-- + <button enabled="false" follows="left|top" height="20" @@ -109,60 +144,22 @@ name="assign" top="0" width="200"> - <button.commit_callback - function="MediaBrowser.Assign" /> - </button> - </layout_panel> + <button.commit_callback + function="MediaBrowser.Assign" /> + </button> + </layout_panel> <layout_panel - height="20" + auto_resize="false" layout="topleft" - left_delta="0" - name="external_controls" - top_delta="0" - user_resize="false" - width="540"> - <web_browser - bottom="-10" + name="browser" + left="0" + top="0" + user_resize="false">--> + <web_browser follows="left|right|top|bottom" layout="topleft" left="0" - name="browser" - top="0" - width="540" /> - <button - follows="bottom|left" - height="20" - label="Open in My Web Browser" - layout="topleft" - left_delta="0" - name="open_browser" - top_pad="5" - width="185"> - <button.commit_callback - function="MediaBrowser.OpenWebBrowser" /> - </button> - <check_box - control_name="UseExternalBrowser" - follows="bottom|left" - height="20" - label="Always open in my web browser" - layout="topleft" - left_pad="5" - name="open_always" - top_delta="0" - width="200" /> - <button - follows="bottom|right" - height="20" - label="Close" - layout="topleft" - left_pad="80" - name="close" - top_delta="0" - width="70"> - <button.commit_callback - function="MediaBrowser.Close" /> - </button> + name="browser" /> </layout_panel> </layout_stack> </floater> diff --git a/indra/newview/skins/default/xui/en/floater_preferences.xml b/indra/newview/skins/default/xui/en/floater_preferences.xml index b57fd00210..8a76c2167f 100644 --- a/indra/newview/skins/default/xui/en/floater_preferences.xml +++ b/indra/newview/skins/default/xui/en/floater_preferences.xml @@ -15,7 +15,7 @@ label="OK" label_selected="OK" layout="topleft" - left="335" + left="427" name="OK" top="435" width="90"> @@ -35,19 +35,6 @@ <button.commit_callback function="Pref.Cancel" /> </button> - <button - follows="right|bottom" - height="20" - label="Apply" - label_selected="Apply" - layout="topleft" - left_pad="3" - name="Apply" - top_delta="0" - width="90"> - <button.commit_callback - function="Pref.Apply" /> - </button> <tab_container follows="left|top|right|bottom" height="410" @@ -100,6 +87,8 @@ label="Setup" layout="topleft" name="input" /> + <!-- I put back the commented out panels for now, pending + implementation of new default settings. James --> <panel class="panel_preference" filename="panel_preferences_advanced.xml" diff --git a/indra/newview/skins/default/xui/en/floater_preview_animation.xml b/indra/newview/skins/default/xui/en/floater_preview_animation.xml index 36accdfc77..e9342b772f 100644 --- a/indra/newview/skins/default/xui/en/floater_preview_animation.xml +++ b/indra/newview/skins/default/xui/en/floater_preview_animation.xml @@ -9,18 +9,6 @@ name="Title"> Animation: [NAME] </floater.string> - <line_editor - border_style="line" - border_thickness="1" - follows="left|top|right" - font="SansSerifSmall" - height="19" - layout="topleft" - left="93" - max_length="127" - name="desc" - top="19" - width="127" /> <text type="string" length="1" @@ -28,32 +16,44 @@ font="SansSerif" height="19" layout="topleft" - left_delta="-80" + left="10" name="desc txt" - top_delta="0" + top="25" width="80"> Description: </text> - <button + <line_editor + border_style="line" + border_thickness="1" + follows="left|top|right" + font="SansSerifSmall" height="19" + layout="topleft" + left_delta="95" + max_length="127" + name="desc" + top="19" + width="170" /> + <button + height="20" font="SansSerifSmall" label="Play in World" label_selected="Stop" layout="topleft" - left="20" + left="10" name="Anim play btn" tool_tip="Play this animation so that others can see it." top="47" - width="96" /> + width="125" /> <button - height="19" + height="20" font="SansSerifSmall" label="Play Locally" label_selected="Stop" layout="topleft" - left_pad="54" + left_pad="5" name="Anim audition btn" tool_tip="Play this animation so that only you can see it." top_delta="0" - width="96" /> + width="125" /> </floater> diff --git a/indra/newview/skins/default/xui/en/floater_sell_land.xml b/indra/newview/skins/default/xui/en/floater_sell_land.xml index 052a880537..85e35926ab 100644 --- a/indra/newview/skins/default/xui/en/floater_sell_land.xml +++ b/indra/newview/skins/default/xui/en/floater_sell_land.xml @@ -61,7 +61,7 @@ left="56" name="info_size" right="-20"> - [AREA] sq. m. + [AREA] m² </text> <text type="string" @@ -141,7 +141,7 @@ name="price_per_m" top_delta="25" width="200"> - (L$[PER_METER] per square meter) + (L$[PER_METER] per m²) </text> <icon follows="top|left" diff --git a/indra/newview/skins/default/xui/en/floater_test_line_editor.xml b/indra/newview/skins/default/xui/en/floater_test_line_editor.xml new file mode 100644 index 0000000000..a17e3ea949 --- /dev/null +++ b/indra/newview/skins/default/xui/en/floater_test_line_editor.xml @@ -0,0 +1,64 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<floater + can_resize="true" + height="400" + layout="topleft" + name="floater_test_line_editor" + width="400"> + <line_editor + height="20" + layout="topleft" + left="10" + name="enabled_line_editor" + top="40" + tool_tip="enabled line editor" + width="200"> + Enabled line editor + </line_editor> + <line_editor + enabled="false" + height="20" + layout="topleft" + left_delta="0" + name="disabled_line_editor" + top_pad="10" + tool_tip="disabled line editor" + width="200"> + Disabled line editor + </line_editor> + <line_editor + height="20" + layout="topleft" + left_delta="0" + name="enabled_colored_line_editor" + text_color="1 0 0 1" + top_pad="10" + tool_tip="enabled colored line editor" + width="200"> + Enabled red-text line editor + </line_editor> + <line_editor + enabled="false" + height="20" + layout="topleft" + left_delta="0" + name="disabled_colored_line_editor" + text_readonly_color="1 0 0 1" + top_pad="10" + tool_tip="disabled colored line editor" + width="200"> + Disabled red-text line editor + </line_editor> + <!-- "search_editor" is a specialized line_editor that shows read-only + help text until the user clicks in the widget. --> + <search_editor + follows="left|top|right" + height="20" + label="Type here to search" + layout="topleft" + left_delta="0" + name="search editor" + tool_tip="search editor" + top_pad="10" + width="200" /> +</floater> diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml index 5369a44cbf..51e4d15e5d 100644 --- a/indra/newview/skins/default/xui/en/floater_tools.xml +++ b/indra/newview/skins/default/xui/en/floater_tools.xml @@ -1000,22 +1000,17 @@ width="170" max_chars="20" mouse_opaque="true" - name="sale type"> - <combo_item - name="Copy" - value="Copy"> - Copy - </combo_item> - <combo_item - name="Contents" - value="Contents"> - Contents - </combo_item> - <combo_item - name="Original" - value="Original"> - Original - </combo_item> + name="sale type" + intial_value="2"> + <combo_item + label="Copy" + value="2" /> + <combo_item + label="Contents" + value="3" /> + <combo_item + label="Original" + value="1" /> </combo_box> <!-- NEW PRICE SPINNER --> <spinner @@ -2793,7 +2788,7 @@ name="label_area_price" top="48" width="150"> - Price: L$[PRICE] for [AREA] sq. m. + Price: L$[PRICE] for [AREA] m² </text> <text type="string" @@ -2805,7 +2800,7 @@ name="label_area" top_delta="0" width="150"> - Area: [AREA] sq. m. + Area: [AREA] m² </text> <button follows="left|top" 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 3a0bdbe75b..6a022e8966 100644 --- a/indra/newview/skins/default/xui/en/floater_world_map.xml +++ b/indra/newview/skins/default/xui/en/floater_world_map.xml @@ -551,11 +551,11 @@ enabled="false" follows="bottom|right" height="20" - label="Copy SLURL to clipboard" + label="Copy SLurl to clipboard" layout="topleft" left="-230" name="copy_slurl" - tool_tip="Copies current location as SLURL to be used on the web." + tool_tip="Copies current location as SLurl to be used on the web." top="542" width="222"> <button.commit_callback diff --git a/indra/newview/skins/default/xui/en/menu_navbar.xml b/indra/newview/skins/default/xui/en/menu_navbar.xml index 725321648b..78dff0bd4a 100644 --- a/indra/newview/skins/default/xui/en/menu_navbar.xml +++ b/indra/newview/skins/default/xui/en/menu_navbar.xml @@ -9,7 +9,7 @@ visible="false" width="128"> <menu_item_call - label="Copy SLURL to Clipboard" + label="Copy SLurl to Clipboard" layout="topleft" name="Copy SLURL"> <menu_item_call.on_click diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml index 84d54f9673..23ba2b6281 100644 --- a/indra/newview/skins/default/xui/en/menu_viewer.xml +++ b/indra/newview/skins/default/xui/en/menu_viewer.xml @@ -415,36 +415,24 @@ function="Floater.Show" parameter="hud" /> </menu_item_call> - <menu - label="Report" - layout="topleft" - name="Report" - tear_off="true"> - <menu_item_call - label="Report Abuse" + <menu_item_separator + layout="topleft" /> + <menu_item_call + label="Report Bug..." + layout="topleft" + name="ReportBug"> + <menu_item_call.on_click + function="PromptShowURL" + parameter="hud,http://help.secondlife.com/en/bugreport/" /> + </menu_item_call> + <menu_item_call + label="Report Abuse..." layout="topleft" name="Report Abuse"> <menu_item_call.on_click function="ShowFloater" parameter="complaint reporter" /> </menu_item_call> - <menu_item_call - label="Report Bug" - layout="topleft" - name="Report Bug"> - <menu_item_call.on_click - function="PromptShowURL" - parameter="WebLaunchPublicIssue,http://jira.secondlife.com" /> - </menu_item_call> - <menu_item_call - label="Bumps, Pushes & Hits." - layout="topleft" - name="Bumps, Pushes &amp; Hits"> - <menu_item_call.on_click - function="Floater.Show" - parameter="bumps" /> - </menu_item_call> - </menu> <menu_item_call label="About Second Life" layout="topleft" @@ -2014,6 +2002,14 @@ function="Floater.Show" parameter="mem_leaking" /> </menu_item_call> + <menu_item_call + label="Bumps, Pushes & Hits..." + layout="topleft" + name="Bumps, Pushes &amp; Hits"> + <menu_item_call.on_click + function="Floater.Show" + parameter="bumps" /> + </menu_item_call> <menu_item_separator layout="topleft" /> <menu diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index d890edcfed..c89eed37ab 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -102,7 +102,7 @@ name="MissingAlert" label="Unknown Alert Message" type="alertmodal"> -Your version of Second Life does not know how to display the alert message it just received. +Your version of Second Life does not know how to display the alert it just received. Please verify that you have the latest Viewer installed. Error details: The alert called '[_NAME]' was not found in notifications.xml. <usetemplate @@ -154,7 +154,7 @@ No tutorial is currently available. icon="alertmodal.tga" name="BadInstallation" type="alertmodal"> -An error occurred while updating Second Life. Please download the latest version from secondlife.com. + An error occurred while updating Second Life. Please download the latest version of the Viewer. http://get.secondlife.com <usetemplate name="okbutton" yestext="Ok"/> @@ -164,9 +164,9 @@ An error occurred while updating Second Life. Please download the latest version icon="alertmodal.tga" name="LoginFailedNoNetwork" type="alertmodal"> -Network Error: Could not establish a connection. +Could not connect to the Second Life Grid. '[DIAGNOSTIC]' -Please check your network connection. +Make sure your Internet connection is working properly. <usetemplate name="okbutton" yestext="Ok"/> @@ -2342,9 +2342,10 @@ You can use [SECOND_LIFE] normally and other users will see you correctly. icon="alertmodal.tga" name="FirstRun" type="alertmodal"> + [SECOND_LIFE] installation is complete. -If this is your first time using [SECOND_LIFE], you will need to create an account before you can log on. +If this is your first time using [SECOND_LIFE], you will need to create an account before you can log in. Return to www.secondlife.com to create a new account? <usetemplate name="okcancelbuttons" @@ -2406,7 +2407,7 @@ Please choose the male or female avatar. You can change your mind later. icon="alertmodal.tga" name="GrantedModifyRights" type="alertmodal"> -You have been granted the privilege to modify [FIRST_NAME] [LAST_NAME]'s objects. +[FIRST_NAME] [LAST_NAME] has given you permission to edit their objects. </notification> <notification @@ -2914,8 +2915,7 @@ Chat and instant messages will be hidden. Instant messages will get your Busy mo icon="alert.tga" name="JoinedTooManyGroupsMember" type="alert"> -You are a member of too many groups to join another one. Please leave at least one group before joining this one, or decline the offer. -To leave a group select the 'Groups...' option from the 'Edit' menu. +You have reached your maximum number of groups. Please leave another group before joining this one, or decline the offer. [NAME] has invited you to join a group as a member. [INVITE] <usetemplate @@ -4173,7 +4173,7 @@ Go to the Second Life web site to see your account history? icon="alertmodal.tga" name="ClickOpenF1Help" type="alertmodal"> -Visit the Second Life Support Web site? +View Second Life help? <usetemplate ignoretext="When visiting the Second Life Support Website." name="okcancelignore" @@ -4189,7 +4189,7 @@ Are you sure you want to quit? <usetemplate ignoretext="When Quitting Second Life." name="okcancelignore" - notext="Continue" + notext="Don't Quit" yestext="Quit"/> </notification> @@ -4385,7 +4385,7 @@ Would you like to leave Busy Mode before completing this transaction? icon="alertmodal.tga" name="ConfirmEmptyTrash" type="alertmodal"> -Are you sure you want to permanently remove the contents of your Trash folder? +Are you sure you want to permanently delete the contents of your Trash? <usetemplate ignoretext="When emptying your inventory trash folder" name="okcancelignore" @@ -4430,7 +4430,7 @@ Are you sure you want to clear your list of saved URLs? icon="alertmodal.tga" name="ConfirmEmptyLostAndFound" type="alertmodal"> -Are you sure you want to permanently remove the contents of your Lost And Found folder? +Are you sure you want to permanently delete the contents of your Lost And Found? <usetemplate ignoretext="When emptying your inventory Lost And Found folder" name="okcancelignore" @@ -4442,13 +4442,13 @@ Are you sure you want to permanently remove the contents of your Lost And Found icon="alertmodal.tga" name="CopySLURL" type="alertmodal"> -The following SLURL has been copied to your clipboard: +The following SLurl has been copied to your clipboard: [SLURL] Put it in a web page to give others easy access to this location or try it out yourself by pasting it into the address bar of your web browser. <form name="form"> <ignore name="ignore" - text="When copying a SLURL to your clipboard"/> + text="When copying a SLurl to your clipboard"/> </form> </notification> @@ -4924,7 +4924,7 @@ Your chat session with [NAME] must close. icon="alertmodal.tga" name="Cannot_Purchase_an_Attachment" type="alertmodal"> -Items may not be purchased while they are part of an attachment. +You can't buy an object while it is attached. </notification> <notification @@ -4942,7 +4942,7 @@ Granting this request gives a script ongoing permission to take Linden dollars ( icon="alertmodal.tga" name="AutoWearNewClothing" type="alertmodal"> -Would you like to automatically wear the clothing item you create? +Automatically wear the clothing you create? <usetemplate ignoretext="Automatically wear new clothing" name="okcancelignore" @@ -4954,13 +4954,12 @@ Would you like to automatically wear the clothing item you create? icon="alertmodal.tga" name="NotAgeVerified" type="alertmodal"> -You need to be age-verified in order to access this parcel. -Would you like to visit the Second Life website to verify your age? +You must be age-verified to visit this area. Visit the Second Life website and verify your age? [_URL] - <url option="0" name="url"> + <url option="0"> - https://secondlife.com/account/verification.php + https://secondlife.com/account/verification.php </url> <usetemplate ignoretext="Warn about lack of age verification" @@ -4973,8 +4972,7 @@ Would you like to visit the Second Life website to verify your age? icon="alertmodal.tga" name="Cannot enter parcel: no payment info on file" type="alertmodal"> -This parcel requires that you have payment information on file before you can access it. -Would you like to visit the Second Life website to set this up? +You must have payment information on file to visit this area. Visit the Second Life website and set this up? [_URL] <url option="0" name="url"> @@ -4992,7 +4990,7 @@ Would you like to visit the Second Life website to set this up? icon="alertmodal.tga" name="MissingString" type="alertmodal"> -The string [STRING_NAME] is missing from strings.xml +How odd. The string [STRING_NAME] is missing from strings.xml </notification> <notification @@ -5055,7 +5053,7 @@ The string [STRING_NAME] is missing from strings.xml icon="notifytip.tga" name="AddSelfFriend" type="notifytip"> - You cannot add yourself as a friend. + Although you're very nice, you can't add yourself as a friend. </notification> <notification @@ -5098,7 +5096,7 @@ The string [STRING_NAME] is missing from strings.xml icon="notifytip.tga" name="GestureMissing" type="notifytip"> - Gesture [NAME] is missing from database. + Hmm. Gesture [NAME] is missing from the database. </notification> <notification @@ -5128,7 +5126,7 @@ The string [STRING_NAME] is missing from strings.xml name="CapsKeyOn" type="notifytip"> Your Caps Lock key is on. - As this will affect the password you type in, you will probably want to turn it off. + This might affect your password. </notification> <notification @@ -5142,7 +5140,7 @@ The string [STRING_NAME] is missing from strings.xml icon="notifytip.tga" name="NotecardNoPermissions" type="notifytip"> - Insufficient permissions to view notecard. + You don't have permission to view this notecard. </notification> <notification @@ -5229,7 +5227,7 @@ The string [STRING_NAME] is missing from strings.xml icon="notifytip.tga" name="CannotBuyObjectsFromDifferentOwners" type="notifytip"> - Cannot buy objects from different owners at the same time. + You can only buy objects from one owner at a time. Please select a single object. </notification> @@ -5237,7 +5235,7 @@ The string [STRING_NAME] is missing from strings.xml icon="notifytip.tga" name="ObjectNotForSale" type="notifytip"> - Object does not appear to be for sale. + This object is not for sale. </notification> <notification @@ -5251,14 +5249,14 @@ The string [STRING_NAME] is missing from strings.xml icon="notifytip.tga" name="LeavingGodMode" type="notifytip"> - Leaving god mode, level [LEVEL] + Now leaving god mode, level [LEVEL] </notification> <notification icon="notifytip.tga" name="CopyFailed" type="notifytip"> - Copy failed because you lack copy permission + You don't have permission to copy this. </notification> <notification @@ -5455,7 +5453,7 @@ The string [STRING_NAME] is missing from strings.xml icon="notify.tga" name="NotSafe" type="notify"> - This land has damage enabled ('not safe'). + This land has damage enabled. You can be hurt here. If you die, you will be teleported to your home location. <unique/> </notification> @@ -5464,8 +5462,8 @@ The string [STRING_NAME] is missing from strings.xml icon="notify.tga" name="NoFly" type="notify"> - This land has flying disabled ('no fly'). - You cannot fly here. + This area has flying disabled. + You can't fly here. <unique/> </notification> @@ -5473,8 +5471,7 @@ The string [STRING_NAME] is missing from strings.xml icon="notify.tga" name="PushRestricted" type="notify"> - This land is 'No Pushing'. - You cannot push others here unless you own the land. + This area does not allow pushing. You can't push others here unless you own the land. <unique/> </notification> @@ -5482,7 +5479,7 @@ The string [STRING_NAME] is missing from strings.xml icon="notify.tga" name="NoVoice" type="notify"> - This land has voice disabled. + This area has voice chat disabled. You won't be able to hear anyone talking. <unique/> </notification> @@ -5490,8 +5487,7 @@ The string [STRING_NAME] is missing from strings.xml icon="notify.tga" name="NoBuild" type="notify"> - This land has building disabled ('no build'). - You cannot create objects here. + This area has building disabled. You can't build or rez objects here. <unique/> </notification> @@ -5513,15 +5509,16 @@ The string [STRING_NAME] is missing from strings.xml icon="notify.tga" name="NoOutsideScripts" type="notify"> - This land has outside scripts disabled ('no outside scripts'). - No scripts will run except those belonging to the land owner. + This land has outside scripts disabled. + + No scripts will work here except those belonging to the land owner. </notification> <notification icon="notify.tga" name="ClaimPublicLand" type="notify"> - Can only claim public land in region you're in. + You can only claim public land in the Region you're in. </notification> <notification @@ -5806,7 +5803,7 @@ The string [STRING_NAME] is missing from strings.xml icon="notify.tga" name="TeleportOffered" type="notify"> - [NAME] has offered to teleport you to his or her location: + [NAME] has offered to teleport you to their location: [MESSAGE] <form name="form"> @@ -5917,8 +5914,8 @@ The string [STRING_NAME] is missing from strings.xml priority="high" sound="UISndAlert" type="notify"> - Region is restarting in [MINUTES] minutes. - If you remain in this region you will be logged out. + This region will restart in [MINUTES] minutes. + If you stay in this region you will be logged out. </notification> <notification @@ -5927,8 +5924,8 @@ The string [STRING_NAME] is missing from strings.xml priority="high" sound="UISndAlert" type="notify"> - Region is restarting in [SECONDS] seconds. - If you remain in this region you will be logged out. + This region will restart in [SECONDS] seconds. + If you stay in this region you will be logged out. </notification> <notification @@ -6002,10 +5999,10 @@ The string [STRING_NAME] is missing from strings.xml name="ScriptQuestionCaution" priority="high" type="notify"> - '[OBJECTNAME]', an object owned by '[NAME]', would like to: + An object named '[OBJECTNAME]', owned by '[NAME]' would like to: [QUESTIONS] - If you do not trust this object and its creator, you should deny the request. For additional information, click the Details button. + If you do not trust this object and its creator, you should deny the request. Grant this request? <form name="form"> @@ -6058,8 +6055,7 @@ The string [STRING_NAME] is missing from strings.xml name="FirstBalanceIncrease" type="notify"> You just received L$[AMOUNT]. - Objects and other users may give you L$. - Your balance is shown in the upper-right corner of the screen. + Your L$ balance is shown in the upper-right. </notification> <notification @@ -6067,7 +6063,7 @@ The string [STRING_NAME] is missing from strings.xml name="FirstBalanceDecrease" type="notify"> You just paid L$[AMOUNT]. - Your balance is shown in the upper-right corner of the screen. + Your L$ balance is shown in the upper-right. </notification> <notification @@ -6075,15 +6071,15 @@ The string [STRING_NAME] is missing from strings.xml name="FirstSit" type="notify"> You are sitting. - Use the arrow keys (or AWSD) to change the view. - Click the 'Stand Up' button to get up. + Use your arrow keys (or AWSD) to look around. + Click the 'Stand Up' button to stand. </notification> <notification icon="notify.tga" name="FirstMap" type="notify"> - Click and drag to scroll the map. + Click and drag the map to look around. Double-click to teleport. Use the controls on the right to find things and display different backgrounds. </notification> @@ -6092,11 +6088,10 @@ The string [STRING_NAME] is missing from strings.xml icon="notify.tga" name="FirstBuild" type="notify"> - You can build new objects in some areas of [SECOND_LIFE]. - Use the tools in the upper left to build, and try holding down Ctrl or Alt to rapidly switch tools. - Press Esc to stop building. + You have opened the Build Tools. Every object you see around you was created using these tools. </notification> +<!-- <notification icon="notify.tga" name="FirstLeftClickNoHit" @@ -6105,14 +6100,12 @@ The string [STRING_NAME] is missing from strings.xml If the mouse pointer changes to a hand, you can interact with the object. Right-click always shows a menu of things you can do. </notification> - +--> <notification icon="notify.tga" name="FirstTeleport" type="notify"> - This region doesn't allow point-to-point teleports, so you've been transported to the nearest telehub. - Your destination is marked with a tall beacon. - Follow the red arrow to the beacon, or click the arrow to dismiss the beacon. + You can only teleport to certain areas in this region. The arrow points to your specific destination. Click to dismiss it. </notification> <notification @@ -6129,19 +6122,19 @@ The string [STRING_NAME] is missing from strings.xml icon="notify.tga" name="FirstAppearance" type="notify"> - You are editing your appearance. - To rotate and zoom view, use the arrow keys. - When you are finished, press 'Save All' to save your look and exit. - You can edit your appearance as often as you like. + You are editing your Appearance. +Use the arrow keys to look around. +When you are done, press 'Save All'. </notification> <notification icon="notify.tga" name="FirstInventory" type="notify"> - This is your inventory, which contains objects, notecards, clothing, and other things you own. - * To wear an object or outfit folder, drag it onto yourself. - * To bring an object into the world, drag it onto the ground. + This is your Inventory, which contains items you own. + + * To wear something, drag it onto yourself. + * To rez something inworld, drag it onto the ground. * To read a notecard, double-click it. </notification> @@ -6149,36 +6142,35 @@ The string [STRING_NAME] is missing from strings.xml icon="notify.tga" name="FirstSandbox" type="notify"> - This is a sandbox region. - Objects you build here may be deleted after you leave the area, Sandboxes clean on a regular basis, please refer to the information at the top of the screen next to the region name. + This is a sandbox area, and is meant to help Residents learn how to build. - Sandbox regions are uncommon, and are marked with signs. + Things you build here will be deleted after you leave, so don't forget to right-click and choose 'take' to move your creation to your Inventory. </notification> <notification icon="notify.tga" name="FirstFlexible" type="notify"> - This object is flexible. - Flexible objects may not be physical and must be phantom until the flexible checkbox is unchecked. + This object is flexible. Flexis must be phantom and not physical. </notification> <notification icon="notify.tga" name="FirstDebugMenus" type="notify"> - You have enabled the Advanced menu. - This menu contains features useful for developers debugging Second Life. - To toggle this menu on Windows press Ctrl-Alt-D. On Mac press Cmd-Opt-Shift-D. + You opened the Advanced menu. + + To toggle this menu, + Windows: Ctrl-Alt-D + Mac: ⌘-Opt-D + </notification> <notification icon="notify.tga" name="FirstSculptedPrim" type="notify"> - You are editing a sculpted prim. - Sculpted prims require a special texture to specify their shape. - You can find example sculpted textures in the inventory library. + You are editing a Sculpted prim. Sculpties require a special texture to define their shape. </notification> <notification @@ -6271,7 +6263,7 @@ Click Accept to join the call or Decline to decline the invitation. Click Block icon="notify.tga" name="VoiceInviteAdHoc" type="notify"> -[NAME] has joined a Voice Chat call with a conference chat... +[NAME] has joined a voice chat call with a conference chat. Click Accept to join the call or Decline to decline the invitation. Click Block to block this user. <unique> <context key="NAME"/> @@ -6398,7 +6390,7 @@ Click Accept to join the chat or Decline to decline the invitation. Click Block icon="notifytip.tga" name="Cannot enter parcel: not a group member" type="notifytip"> - Cannot enter parcel, you are not a member of the appropriate group. + Only members of a certain group can visit this area. </notification> <notification @@ -6441,7 +6433,7 @@ Click Accept to join the chat or Decline to decline the invitation. Click Block name="ServerVersionChanged" priority="high" type="notifytip"> - The region you have entered is running a different simulator version. Click this message for details. + You just entered a region using a different server version, which may affect performance. Click to see the release notes. </notification> <notification @@ -6449,7 +6441,7 @@ Click Accept to join the chat or Decline to decline the invitation. Click Block name="UnableToOpenCommandURL" priority="high" type="notifytip"> - The URL you clicked cannot be opened from this web browser. + The link you clicked cannot be opened from this web browser. </notification> <notification name="IMToast" type="notifytoast"> @@ -6458,6 +6450,21 @@ Click Accept to join the chat or Decline to decline the invitation. Click Block <button index="0" name="respondbutton" text="Respond"/> </form> </notification> + + <notification + icon="alertmodal.tga" + name="CreateGroupCost" + type="alertmodal"> + Creating this group will cost L$100. + Groups need more than one member, or they are deleted forever. + Please invite members within 48 hours. + <usetemplate + canceltext="Cancel" + name="okcancelbuttons" + notext="Cancel" + yestext="Create group for L$100"/> + </notification> + <global name="UnsupportedCPU"> - Your CPU speed does not meet the minimum requirements. diff --git a/indra/newview/skins/default/xui/en/panel_edit_pick.xml b/indra/newview/skins/default/xui/en/panel_edit_pick.xml index 9cc3a00696..a74f560753 100644 --- a/indra/newview/skins/default/xui/en/panel_edit_pick.xml +++ b/indra/newview/skins/default/xui/en/panel_edit_pick.xml @@ -2,14 +2,13 @@ <panel background_visible="true" bevel_style="in" - bg_alpha_color="0.2 0.2 0.2 1" height="640" label="Edit Pick" layout="topleft" left="0" name="panel_edit_pick" top="0" - width="345"> + width="305"> <text type="string" length="1" @@ -21,12 +20,13 @@ name="title" text_color="white" top="0" - width="150"> + width="250"> Edit Pick </text> <panel background_visible="true" - bg_alpha_color="0.5 0.5 0.5 1" + bg_alpha_color="DkGray2" + width="280" follows="left|right|top|bottom" height="570" layout="topleft" @@ -128,8 +128,9 @@ left="10" name="pick_location" right="-10" - text_color="black" + text_color="white" v_pad="10" + width="250" valign="center" word_wrap="true"> loading... diff --git a/indra/newview/skins/default/xui/en/panel_edit_profile.xml b/indra/newview/skins/default/xui/en/panel_edit_profile.xml index 38049c896e..26354ce611 100644 --- a/indra/newview/skins/default/xui/en/panel_edit_profile.xml +++ b/indra/newview/skins/default/xui/en/panel_edit_profile.xml @@ -3,7 +3,6 @@ class="edit_profile_panel" background_visible="true" bevel_style="in" - bg_alpha_color="0.3 0.3 0.3 1" follows="left|top|right|bottom" height="690" label="Profile Edit" @@ -12,7 +11,7 @@ mouse_opaque="true" name="edit_profile_panel" top="10" - width="355"> + width="305"> <text top="0" left="9" @@ -22,19 +21,19 @@ layout="topleft" name="title_text" text_color="white" - width="350"> + width="250"> Edit Profile </text> <panel background_visible="true" - bg_alpha_color="0.6 0.6 0.6 1" + bg_alpha_color="DkGray2" follows="left|top|right|bottom" height="620" layout="topleft" left="9" name="data_panel" top_pad="10" - width="337"> + width="280"> <text top_pad="5" left="9" @@ -51,10 +50,10 @@ follows="left|top" height="120" layout="topleft" - left="9" + left="10" name="lifes_images_panel" top_pad="10" - width="250"> + width="265"> <panel height="120" layout="topleft" @@ -70,7 +69,7 @@ height="20" layout="topleft" left="0" - name="first_life_photo_title_text" + name="second_life_photo_title_text" text_color="white" top="0" width="125"> @@ -102,11 +101,11 @@ height="20" layout="topleft" left="0" - name="second_life_photo_title_text" + name="real_world_photo_title_text" text_color="white" top="0" width="125"> - First Life photo: + Real World photo: </text> <texture_picker allow_no_texture="true" @@ -115,7 +114,7 @@ height="105" layout="topleft" left="0" - name="1st_life_pic" + name="real_world_pic" top_pad="5" width="105" /> </panel> @@ -133,7 +132,7 @@ image_name="image_edit_icon.tga" layout="topleft" left="200" - name="1st_life_edit_icon" + name="real_world_edit_icon" tool_tip="Click to select an image" top="35" width="16" /> @@ -149,7 +148,7 @@ name="title_sl_descr_text" text_color="white" top_pad="10" - width="290"> + width="250"> Second Life description: </text> <text_editor @@ -162,7 +161,7 @@ left="9" name="sl_description_edit" text_color="0.1 0.1 0.1 1" - width="290" + width="265" word_wrap="true"> </text_editor> <text @@ -173,11 +172,11 @@ height="15" layout="topleft" left="9" - name="title_fl_descr_text" + name="title_rw_descr_text" text_color="white" top_pad="10" - width="290"> - First Life description: + width="250"> + Real World description: </text> <text_editor type="string" @@ -189,7 +188,7 @@ left="9" name="fl_description_edit" text_color="0.1 0.1 0.1 1" - width="290" + width="265" word_wrap="true"> </text_editor> <text @@ -215,7 +214,7 @@ left="9" name="homepage_edit" text_color="0.2 0.2 1 1" - width="290"> + width="265"> TODO </line_editor> <check_box @@ -233,7 +232,7 @@ <panel follows="bottom|right" height="30" - left="96" + left="10" name="profile_me_buttons_panel" top_pad="8" width="250"> 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 489d06abfd..71b5f78d59 100644 --- a/indra/newview/skins/default/xui/en/panel_group_general.xml +++ b/indra/newview/skins/default/xui/en/panel_group_general.xml @@ -7,8 +7,8 @@ layout="topleft" left="1" name="general_tab" - top="466" - width="279"> + top="514" + width="280"> <panel.string name="help_text"> The General tab contains general information about @@ -26,25 +26,19 @@ Hover your mouse over the options for more help. Retrieving member data </panel.string> <panel.string - name="confirm_group_create_str"> - Creating this group will cost L$100. -Are you really, really, REALLY sure you want to spend L$100 to create this group? -Be aware that if nobody else joins this group within 48 hours, it will be disbanded and the group's name will be unavailable for future use. - </panel.string> - <panel.string name="group_join_btn"> Join (L$[AMOUNT]) </panel.string> - <button + <!--<button follows="left|top" height="16" label="?" label_selected="?" layout="topleft" - left="250" + left="255" name="help_button" top="8" - width="20" /> + width="20" /> --> <line_editor follows="left|top" font="SansSerifSmall" @@ -52,11 +46,11 @@ Be aware that if nobody else joins this group within 48 hours, it will be disban height="16" label="Type your new group name here" layout="topleft" - left_delta="-245" + left="10" max_length="35" name="group_name_editor" - top_delta="0" - width="200" /> + top="8" + width="235" /> <text type="string" length="1" @@ -67,7 +61,7 @@ Be aware that if nobody else joins this group within 48 hours, it will be disban left_delta="0" name="group_name" top_delta="0" - width="200"> + width="240"> Type your new group name here </text> <text @@ -79,17 +73,17 @@ Be aware that if nobody else joins this group within 48 hours, it will be disban left_delta="0" name="prepend_founded_by" top_pad="4" - width="67"> - Founded by + width="270"> + Founded by: </text> <name_box follows="left|top" height="16" initial_value="(retrieving)" layout="topleft" - left_delta="63" + left="30" name="founder_name" - top_delta="0" + top_pad="0" width="133" /> <text_editor type="string" @@ -101,8 +95,8 @@ Be aware that if nobody else joins this group within 48 hours, it will be disban layout="topleft" max_length="511" name="charter" - right="270" - top="42" + right="275" + top_pad="0" width="170" word_wrap="true"> Group Charter @@ -124,8 +118,8 @@ Be aware that if nobody else joins this group within 48 hours, it will be disban height="16" layout="topleft" name="group_charter_label" - right="270" - top="167" + right="275" + top="190" width="170"> Group Charter </text> @@ -136,7 +130,7 @@ Be aware that if nobody else joins this group within 48 hours, it will be disban label="Join (L$0)" label_selected="Join (L$0)" layout="topleft" - left="7" + left="10" name="join_button" top="160" width="85" /> @@ -160,7 +154,7 @@ Be aware that if nobody else joins this group within 48 hours, it will be disban layout="topleft" left_delta="0" name="text_owners_and_visible_members" - top_pad="15" + top_pad="30" width="270"> Owners & Visible Members </text> @@ -172,7 +166,7 @@ Be aware that if nobody else joins this group within 48 hours, it will be disban layout="topleft" left_delta="0" name="text_owners_are_shown_in_bold" - top_delta="16" + top_pad="0" width="270"> (Owners are shown in bold) </text> @@ -185,7 +179,7 @@ Be aware that if nobody else joins this group within 48 hours, it will be disban layout="topleft" left_delta="0" name="visible_members" - top_pad="8" + top_pad="0" width="263"> <name_list.columns label="Member Name" @@ -202,9 +196,10 @@ Be aware that if nobody else joins this group within 48 hours, it will be disban </name_list> <text follows="left|top" + height="16" type="string" length="1" - bottom_delta="18" + top_pad="10" font="SansSerif" layout="topleft" name="text_group_preferences"> @@ -215,11 +210,11 @@ Be aware that if nobody else joins this group within 48 hours, it will be disban bevel_style="in" border="true" follows="left|top" - height="115" + height="125" layout="topleft" left_delta="0" name="preferences_container" - top_pad="8" + top_pad="0" width="263"> <check_box height="16" @@ -230,7 +225,7 @@ Be aware that if nobody else joins this group within 48 hours, it will be disban name="show_in_group_list" tool_tip="Let people see this group in search results." top="4" - width="63" /> + width="90" /> <check_box follows="right|top" height="16" @@ -239,8 +234,8 @@ Be aware that if nobody else joins this group within 48 hours, it will be disban left_delta="0" name="open_enrollement" tool_tip="Sets whether this group allows new members to join without being invited." - top_pad="2" - width="63" /> + top_pad="5" + width="90" /> <check_box height="16" label="Enrollment fee: L$" @@ -248,8 +243,8 @@ Be aware that if nobody else joins this group within 48 hours, it will be disban left_delta="0" name="check_enrollment_fee" tool_tip="Sets whether to require an enrollment fee to join the group." - top="40" - width="63" /> + top_pad="5" + width="90" /> <spinner decimal_digits="0" follows="left|top" @@ -260,69 +255,69 @@ Be aware that if nobody else joins this group within 48 hours, it will be disban layout="topleft" left="25" max_val="99999" - top="60" + top_pad="5" name="spin_enrollment_fee" tool_tip="New members must pay this fee to join the group when Enrollment Fee is checked." top_delta="-2" width="65" /> - <combo_box - height="20" + <check_box + height="16" + font="SansSerifSmall" + label="Receive notices" layout="topleft" - left="6" - name="group_mature_check" - tool_tip="Sets whether your group information is considered mature." - top="90" - width="120"> - <combo_box.item - label="Select Mature -" - name="select_mature" - value="Select" /> - <combo_box.item - label="Mature Content" - name="mature" - value="Mature" /> - <combo_box.item - label="PG Content" - name="pg" - value="PG" /> - </combo_box> - <text + left="5" + name="receive_notices" + tool_tip="Sets whether you want to receive Notices from this group. Uncheck this box if this group is spamming you." + top_pad="5" + width="240" /> + <check_box + height="16" + label="List in my profile" + layout="topleft" + left="5" + name="list_groups_in_profile" + tool_tip="Sets whether you want to list this group in your Profile" + top_pad="5" + width="240" /> + <text type="string" length="1" height="16" layout="topleft" - left="150" + left="145" name="active_title_label" top="4" width="95"> My Active Title </text> <combo_box - height="16" + height="20" layout="topleft" left_delta="0" name="active_title" tool_tip="Sets the title that appears in your avatar's name tag when this group is active." - top_pad="6" - width="95" /> - <check_box - height="16" - font="SansSerifSmall" - label="Receive notices" - layout="topleft" - left_delta="0" - name="receive_notices" - tool_tip="Sets whether you want to receive Notices from this group. Uncheck this box if this group is spamming you." - top_pad="9" - width="95" /> - <check_box - height="16" - label="List in my profile" + top_pad="0" + width="110" /> + <combo_box + height="20" layout="topleft" left_delta="0" - name="list_groups_in_profile" - tool_tip="Sets whether you want to list this group in your Profile" - top_pad="2" - width="95" /> + name="group_mature_check" + tool_tip="Sets whether your group information is considered mature." + top_pad="10" + width="120"> + <combo_box.item + label="Select Mature -" + name="select_mature" + value="Select" /> + <combo_box.item + label="Mature Content" + name="mature" + value="Mature" /> + <combo_box.item + label="PG Content" + name="pg" + value="Not Mature" /> + </combo_box> </panel> </panel>
\ No newline at end of file diff --git a/indra/newview/skins/default/xui/en/panel_group_land_money.xml b/indra/newview/skins/default/xui/en/panel_group_land_money.xml index 394c8e6a77..b96421ca2f 100644 --- a/indra/newview/skins/default/xui/en/panel_group_land_money.xml +++ b/indra/newview/skins/default/xui/en/panel_group_land_money.xml @@ -29,6 +29,7 @@ name="land_contrib_error"> Unable to set your land contribution. </panel.string> + <!-- <button follows="left|top" height="16" @@ -38,6 +39,7 @@ name="help_button" top="8" width="20" /> + --> <text type="string" length="1" @@ -45,10 +47,10 @@ font="SansSerifBig" height="16" layout="topleft" - left_delta="-250" + left="10" name="group_land_heading" - top_delta="-4" - width="150"> + top_pad="10" + width="260"> Group Owned Land </text> <scroll_list @@ -56,12 +58,12 @@ follows="top" font="SansSerifSmall" heading_height="14" - height="120" + height="100" layout="topleft" left_delta="0" name="group_parcel_list" - top_pad="6" - width="275"> + top_pad="4" + width="265"> <scroll_list.columns label="Parcel" name="name" @@ -86,13 +88,13 @@ <button follows="top" height="20" - label="Map" + label="Show on Map" label_selected="Show on Map" layout="topleft" - left="225" + left="150" name="map_button" - top="150" - width="50" + top_pad="10" + width="125" enabled="false" /> <text type="string" @@ -101,10 +103,10 @@ halign="right" height="16" layout="topleft" - left_delta="-226" + left="5" name="total_contributed_land_label" - top_delta="4" - width="100"> + top_pad="10" + width="130"> Total Contribution: </text> <text @@ -116,8 +118,8 @@ left_pad="5" name="total_contributed_land_value" top_delta="0" - width="100"> - [AREA] sq. meters + width="120"> + [AREA] m² </text> <text type="string" @@ -126,10 +128,10 @@ halign="right" height="16" layout="topleft" - left="0" + left="5" name="total_land_in_use_label" - top="172" - width="100"> + top_pad="0" + width="130"> Total Land In Use: </text> <text @@ -141,8 +143,8 @@ left_pad="5" name="total_land_in_use_value" top_delta="0" - width="150"> - [AREA] sq. meters + width="120"> + [AREA] m² </text> <text type="string" @@ -151,10 +153,10 @@ halign="right" height="16" layout="topleft" - left="10" + left="5" name="land_available_label" - top="190" - width="90"> + top_pad="0" + width="130"> Land Available: </text> <text @@ -167,7 +169,7 @@ name="land_available_value" top_delta="0" width="120"> - [AREA] sq. meters + [AREA] m² </text> <text type="string" @@ -176,10 +178,10 @@ halign="right" height="16" layout="topleft" - left="0" + left="5" name="your_contribution_label" - top="208" - width="100"> + top_pad="0" + width="130"> Your Contribution: </text> <line_editor @@ -192,7 +194,7 @@ max_length="10" name="your_contribution_line_editor" top_delta="-2" - width="70" /> + width="95" /> <text type="string" length="1" @@ -202,7 +204,7 @@ left_pad="5" name="your_contribution_units" top_delta="2"> - sq. meters + ( m² ) </text> <text type="string" @@ -211,11 +213,10 @@ halign="right" height="16" layout="topleft" - left="20" + left_pad="5" name="your_contribution_max_value" - top="226" top_delta="0" - width="180"> + width="95"> ([AMOUNT] max) </text> <icon @@ -224,7 +225,7 @@ layout="topleft" left="9" name="group_over_limit_icon" - top="245" + top_pad="0" visible="false" width="16" /> <text @@ -233,7 +234,7 @@ length="1" word_wrap="true" font="SansSerifSmall" - height="50" + height="40" layout="topleft" left_pad="5" name="group_over_limit_text" @@ -249,21 +250,21 @@ font="SansSerifBig" height="16" layout="topleft" - left="12" + left="10" name="group_money_heading" - top_delta="40" + top_pad="0" width="150"> Group L$ </text> <tab_container follows="all" - height="180" + height="100" layout="topleft" - left="6" + left="10" name="group_money_tab_container" tab_position="top" top_pad="10" - width="270"> + width="265"> <panel border="true" follows="left|top|right|bottom" @@ -320,21 +321,21 @@ label="< Earlier" label_selected="< Earlier" layout="topleft" - left="30" + left="5" name="earlier_details_button" tool_tip="Go back in time" - top_pad="5" - width="80" /> + top_pad="10" + width="125" /> <button height="20" label="Later >" label_selected="Later >" layout="topleft" - left_pad="20" + left_pad="5" name="later_details_button" tool_tip="Go forward in time" top_delta="0" - width="80" /> + width="125" /> </panel> <panel border="true" @@ -366,21 +367,21 @@ label="< Earlier" label_selected="< Earlier" layout="topleft" - left="30" + left="5" name="earlier_sales_button" tool_tip="Go back in time" - top_pad="5" - width="80" /> + top_pad="10" + width="125" /> <button height="20" label="Later >" label_selected="Later >" layout="topleft" - left_pad="20" + left_pad="5" name="later_sales_button" tool_tip="Go forward in time" top_delta="0" - width="80" /> + width="125" /> </panel> </tab_container> </panel>
\ No newline at end of file diff --git a/indra/newview/skins/default/xui/en/panel_group_notices.xml b/indra/newview/skins/default/xui/en/panel_group_notices.xml index 981fd2dde1..2e5f2dcb0b 100644 --- a/indra/newview/skins/default/xui/en/panel_group_notices.xml +++ b/indra/newview/skins/default/xui/en/panel_group_notices.xml @@ -2,13 +2,13 @@ <panel border="true" follows="all" - height="514" + height="530" label="Notices" layout="topleft" left="1" name="notices_tab" - top="466" - width="279"> + top="530" + width="280"> <panel.string name="help_text"> Notices are a quick way to communicate across a @@ -22,7 +22,7 @@ the General tab. name="no_notices_text"> There are no past notices. </panel.string> - <button + <!-- <button follows="left|top" height="16" label="?" @@ -31,18 +31,18 @@ the General tab. left="250" name="help_button" top="8" - width="20" /> - <text + width="20" /> --> + <text follows="left|top" type="string" length="1" font="SansSerifBig" height="16" layout="topleft" - left_delta="-245" + left="10" name="lbl" - top_delta="-4" - width="279"> + top_pad="10" + width="269"> Group Notices Archive </text> <text @@ -54,7 +54,7 @@ the General tab. layout="topleft" left_delta="0" name="lbl2" - top_pad="6" + top_pad="4" width="270"> Notices are kept for 14 days. Click the notice below if you wish to view. Click the 'Refresh' button to check if new notices have been received. Notice lists are limited to 200 notices per group on a daily basis. </text> @@ -68,7 +68,7 @@ the General tab. left_delta="0" name="notice_list" top_pad="0" - width="270"> + width="265"> <scroll_list.columns label="" name="icon" @@ -90,7 +90,7 @@ the General tab. width="-1" /> </scroll_list> <text - follows="left|top" + follows="left|top" type="string" length="1" layout="topleft" @@ -102,12 +102,12 @@ the General tab. follows="left|top" height="20" font="SansSerifSmall" - label="Create New Notice" + label="New Notice" label_selected="Create New Notice" layout="topleft" left_delta="0" name="create_new_notice" - top_delta="-2" + top_delta="4" width="125" /> <button follows="left|top" @@ -116,19 +116,19 @@ the General tab. label="Refresh" label_selected="Refresh List" layout="topleft" - left_pad="70" + left_pad="12" name="refresh_notices" top_delta="0" - width="75" /> + width="125" /> <panel follows="left|top" height="268" label="Create New Notice" layout="topleft" - left="1" + left="0" name="panel_create_new_notice" - top="225" - width="270"> + top="250" + width="265"> <text follows="left|top" type="string" @@ -136,11 +136,11 @@ the General tab. font="SansSerifBig" height="16" layout="topleft" - left="7" + left="10" mouse_opaque="false" name="lbl" - top_pad="10" - width="270"> + top_pad="0" + width="265"> Create a Notice </text> <text @@ -160,13 +160,13 @@ the General tab. follows="left|top" type="string" length="1" - halign="right" + halign="left" height="16" layout="topleft" left_delta="0" name="lbl3" top_pad="10" - width="55"> + width="60"> Subject: </text> <line_editor @@ -174,22 +174,22 @@ the General tab. border_thickness="1" height="16" layout="topleft" - left_pad="2" + left_pad="3" max_length="63" name="create_subject" - top_delta="0" + top_delta="-1" width="200" /> <text follows="left|top" type="string" length="1" - halign="right" + halign="left" height="16" layout="topleft" - left="7" + left="10" name="lbl4" - top_pad="2" - width="55"> + top_pad="10" + width="60"> Message: </text> <text_editor @@ -206,20 +206,20 @@ the General tab. follows="left|top" type="string" length="1" - halign="right" + halign="left" height="16" layout="topleft" - left="7" + left="10" name="lbl5" - top_pad="2" - width="55"> + top_pad="10" + width="60"> Attach: </text> <line_editor enabled="false" height="16" layout="topleft" - left_pad="2" + left_pad="3" max_length="63" mouse_opaque="false" name="create_inventory_name" @@ -239,9 +239,9 @@ the General tab. label="Remove Attachment" label_selected="Remove Attachment" layout="topleft" - left_pad="-15" + left="10" name="remove_attachment" - top_delta="20" + top_pad="10" width="135" /> <button follows="left|top" @@ -250,28 +250,28 @@ the General tab. label="Send" label_selected="Send Notice" layout="topleft" - left_delta="140" + left_delta="138" name="send_notice" top_delta="0" - width="60" /> + width="125" /> <panel bevel_style="in" border="true" - height="76" + height="71" layout="topleft" left="200" name="drop_target2" - top="28" - width="76" /> + top="20" + width="71" /> <icon - height="64" + height="59" image_name="icon_groupnoticeinventory.tga" layout="topleft" - left_delta="5" + left_delta="6" mouse_opaque="true" name="drop_icon" - top="35" - width="64" /> + top="26" + width="59" /> <group_drop_target height="466" layout="topleft" @@ -286,21 +286,21 @@ the General tab. height="268" label="View Past Notice" layout="topleft" - left="1" + left="0" name="panel_view_past_notice" - top="225" - width="270"> + top="250" + width="265"> <text type="string" length="1" font="SansSerifBig" height="16" layout="topleft" - left="7" + left="10" mouse_opaque="false" name="lbl" - top_pad="10" - width="270"> + top_pad="0" + width="265"> Archived Notice </text> <text @@ -311,21 +311,21 @@ the General tab. layout="topleft" left_delta="0" name="lbl2" - top_pad="10" - width="270"> + top_pad="4" + width="265"> To send a new notice, click the 'Create New Notice' button above. </text> <text type="string" length="1" - halign="right" + halign="left" height="16" layout="topleft" left_delta="0" name="lbl3" top_pad="24" visible="false" - width="55"> + width="60"> Subject: </text> <line_editor @@ -334,57 +334,46 @@ the General tab. enabled="false" height="16" layout="topleft" - left_pad="2" + left_pad="3" max_length="63" name="view_subject" - top_delta="0" + top_delta="-1" visible="false" - width="210" /> + width="200" /> <text type="string" length="1" - halign="right" + halign="left" height="16" layout="topleft" - left="7" + left="10" name="lbl4" - top_pad="5" + top_pad="10" visible="false" - width="55"> + width="60"> Message: </text> <text_editor enabled="false" - height="100" + height="150" hide_scrollbar="true" layout="topleft" - left_pad="3" + left="10" max_length="511" name="view_message" - top_delta="2" - width="210" + top_delta="-35" + width="260" word_wrap="true" /> - <button - follows="left|top" - height="20" - font="SansSerifSmall" - label="Open Attachment" - label_selected="Open Attachment" - layout="topleft" - left_delta="-60" - name="open_attachment" - top_pad="20" - width="110" /> <line_editor enabled="false" height="16" layout="topleft" - left_pad="3" + left_delta="0" max_length="63" mouse_opaque="false" name="view_inventory_name" - top_delta="1" - width="145" /> + top_pad="10" + width="260" /> <icon height="16" layout="topleft" @@ -392,5 +381,16 @@ the General tab. name="view_inv_icon" top_delta="0" width="16" /> - </panel> + <button + follows="left|top" + height="20" + font="SansSerifSmall" + label="Open Attachment" + label_selected="Open Attachment" + layout="topleft" + left_delta="0" + name="open_attachment" + top_pad="10" + width="135" /> + </panel> </panel>
\ No newline at end of file diff --git a/indra/newview/skins/default/xui/en/panel_group_roles.xml b/indra/newview/skins/default/xui/en/panel_group_roles.xml index 750f84fbb3..dd6cd8c95e 100644 --- a/indra/newview/skins/default/xui/en/panel_group_roles.xml +++ b/indra/newview/skins/default/xui/en/panel_group_roles.xml @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <panel border="true" - height="514" + height="530" label="Members & Roles" layout="topleft" left="1" name="roles_tab" - top="466" + top="530" width="280"> <panel.string name="default_needs_apply_text"> @@ -18,6 +18,7 @@ </panel.string> <panel.string name="help_text" /> + <!-- <button follows="left|top" height="16" @@ -27,14 +28,15 @@ name="help_button" top="8" width="20" /> + --> <panel follows="left|top" height="24" layout="topleft" - left="7" + left="10" name="members_header" - top="0" - width="273"> + top_pad="10" + width="270"> <text type="string" length="1" @@ -44,7 +46,7 @@ left="0" name="static" top="4" - width="150"> + width="270"> Members & Roles </text> <text @@ -68,7 +70,7 @@ name="roles_header" top_delta="0" visible="false" - width="280"> + width="270"> <text type="string" length="1" @@ -78,7 +80,7 @@ left="0" name="static" top="4" - width="100"> + width="270"> Roles </text> <text @@ -140,7 +142,7 @@ name="actions_header" top_delta="20" visible="false" - width="280"> + width="270"> <text type="string" length="1" @@ -150,7 +152,7 @@ left="0" name="static" top="-16" - width="200"> + width="270"> Abilities </text> <text @@ -169,21 +171,21 @@ <tab_container height="180" layout="topleft" - left_delta="-1" + left_delta="0" name="roles_tab_container" tab_position="top" - top="85" - width="275"> + top="70" + width="265"> <panel border="true" - height="164" + height="165" label="Members" layout="topleft" left="1" name="members_sub_tab" tool_tip="Members" top="16" - width="275"> + width="265"> <panel.string name="help_text"> You can add or remove Roles assigned to Members. @@ -199,8 +201,8 @@ clicking on their names. left="4" max_length="63" name="search_text" - top="5" - width="100" /> + top="10" + width="90" /> <button font="SansSerifSmall" height="20" @@ -209,14 +211,14 @@ clicking on their names. left_pad="5" name="search_button" top_delta="-2" - width="60" /> + width="80" /> <button enabled="false" font="SansSerifSmall" height="20" label="Show All" layout="topleft" - left_pad="5" + left_pad="0" name="show_all_button" top_delta="0" width="80" /> @@ -224,13 +226,13 @@ clicking on their names. column_padding="0" draw_heading="true" heading_height="14" - height="120" + height="100" layout="topleft" left="4" multi_select="true" name="member_list" - top="24" - width="265"> + top_pad="4" + width="255"> <name_list.columns label="Member" name="name" @@ -245,23 +247,23 @@ clicking on their names. width="80" /> </name_list> <button - height="19" + height="20" font="SansSerifSmall" label="Invite" layout="topleft" left_delta="0" name="member_invite" - top_pad="1" - width="100" /> + top_pad="6" + width="125" /> <button - height="19" + height="20" font="SansSerifSmall" label="Eject" layout="topleft" - left_pad="65" + left_pad="5" name="member_eject" top_delta="0" - width="100" /> + width="125" /> <icon height="16" image_name="inv_folder_plain_closed.tga" @@ -278,7 +280,7 @@ clicking on their names. left_delta="0" name="roles_sub_tab" top_delta="0" - width="275"> + width="265"> <panel.string name="help_text"> Roles have a title and an allowed list of Abilities @@ -311,8 +313,8 @@ including the Everyone and Owner Roles. left="4" max_length="63" name="search_text" - top="5" - width="100" /> + top="10" + width="90" /> <button font="SansSerifSmall" height="20" @@ -321,14 +323,14 @@ including the Everyone and Owner Roles. left_pad="5" name="search_button" top_delta="-2" - width="60" /> + width="80" /> <button enabled="false" font="SansSerifSmall" height="20" label="Show All" layout="topleft" - left_pad="5" + left_pad="0" name="show_all_button" top_delta="0" width="80" /> @@ -337,12 +339,12 @@ including the Everyone and Owner Roles. draw_heading="true" follows="left|top" heading_height="14" - height="120" + height="100" layout="topleft" left="4" name="role_list" - top="23" - width="265"> + top_pad="4" + width="255"> <scroll_list.columns label="Role" name="name" @@ -357,20 +359,20 @@ including the Everyone and Owner Roles. width="95" /> </scroll_list> <button - height="19" + height="20" font="SansSerifSmall" label="Create New Role" layout="topleft" left_delta="0" name="role_create" - top_pad="2" + top_pad="6" width="125" /> <button - height="19" + height="20" font="SansSerifSmall" label="Delete Role" layout="topleft" - left_pad="15" + left_pad="5" name="role_delete" top_delta="0" width="125" /> @@ -383,7 +385,7 @@ including the Everyone and Owner Roles. left_delta="0" name="actions_sub_tab" top_delta="0" - width="275"> + width="265"> <panel.string name="help_text"> Abilities allow Members in Roles to do specific @@ -395,11 +397,11 @@ things in this group. There's a broad variety of Abilities. follows="left|top" height="16" layout="topleft" - left="6" + left="4" max_length="63" name="search_text" - top="5" - width="100" /> + top="10" + width="90" /> <button font="SansSerifSmall" height="20" @@ -408,14 +410,14 @@ things in this group. There's a broad variety of Abilities. left_pad="5" name="search_button" top_delta="-2" - width="60" /> + width="80" /> <button enabled="false" font="SansSerifSmall" height="20" label="Show All" layout="topleft" - left_pad="5" + left_pad="0" name="show_all_button" top_delta="0" width="80" /> @@ -423,15 +425,15 @@ things in this group. There's a broad variety of Abilities. column_padding="0" draw_stripes="false" follows="left|top" - height="134" + height="100" layout="topleft" left="6" multi_select="true" name="action_list" search_column="1" tool_tip="Select an Ability to view more details." - top="23" - width="265"> + top_pad="6" + width="255"> <scroll_list.columns label="" name="icon" @@ -450,13 +452,13 @@ things in this group. There's a broad variety of Abilities. width="16" /> </panel> </tab_container> - <panel + <panel height="50" layout="topleft" - left_delta="1" + left="10" name="members_footer" - top_pad="20" - width="270"> + top_pad="10" + width="265"> <text type="string" length="1" @@ -465,7 +467,7 @@ things in this group. There's a broad variety of Abilities. layout="topleft" left="0" name="static" - top="-16" + top_pad="0" width="100"> Assigned Roles </text> @@ -475,7 +477,7 @@ things in this group. There's a broad variety of Abilities. font="SansSerif" height="16" layout="topleft" - left_pad="30" + left_pad="35" name="static2" top_delta="0" width="100"> @@ -488,8 +490,8 @@ things in this group. There's a broad variety of Abilities. layout="topleft" left="0" name="member_assigned_roles" - top="1" - width="125"> + top_pad="5" + width="130"> <scroll_list.columns label="" name="checkbox" @@ -508,7 +510,7 @@ things in this group. There's a broad variety of Abilities. name="member_allowed_actions" tool_tip="For Details of each Allowed Ability see the Abilities tab." top_delta="0" - width="140"> + width="130"> <scroll_list.columns label="" name="icon" @@ -535,7 +537,7 @@ things in this group. There's a broad variety of Abilities. layout="topleft" left="0" name="static" - top="-16" + top="0" width="100"> Name </text> @@ -545,7 +547,7 @@ things in this group. There's a broad variety of Abilities. font="SansSerif" height="16" layout="topleft" - left_pad="40" + left_pad="35" name="static2" top_delta="0" width="100"> @@ -562,7 +564,7 @@ things in this group. There's a broad variety of Abilities. left="0" max_length="20" name="role_name" - top="0" + top_pad="0" width="130"> Employees </line_editor> @@ -574,7 +576,7 @@ things in this group. There's a broad variety of Abilities. layout="topleft" left_delta="0" name="static3" - top_delta="16" + top_pad="10" width="100"> Title </text> @@ -589,7 +591,7 @@ things in this group. There's a broad variety of Abilities. left_delta="0" max_length="20" name="role_title" - top_delta="16" + top_pad="0" width="130"> (waiting) </line_editor> @@ -603,8 +605,8 @@ things in this group. There's a broad variety of Abilities. left="135" max_length="254" name="role_description" - top="0" - width="135" + top="16" + width="130" word_wrap="true"> (waiting) </text_editor> @@ -616,7 +618,7 @@ things in this group. There's a broad variety of Abilities. layout="topleft" left="0" name="static4" - top="58" + top="85" width="120"> Assigned Members </text> @@ -626,7 +628,7 @@ things in this group. There's a broad variety of Abilities. font="SansSerif" height="16" layout="topleft" - left_pad="20" + left_pad="15" name="static5" tool_tip="A list of Abilities the currently selected role can perform." top_delta="0" @@ -636,11 +638,11 @@ things in this group. There's a broad variety of Abilities. <name_list draw_stripes="false" enabled="false" - height="125" + height="75" layout="topleft" left="0" name="role_assigned_members" - top="74" + top_pad="0" width="130" /> <check_box height="16" @@ -649,17 +651,17 @@ things in this group. There's a broad variety of Abilities. left_delta="0" name="role_visible_in_list" tool_tip="Sets whether members of this role are visible in the General tab to people outside of the group." - top_pad="4" + top_pad="10" width="130" /> <scroll_list draw_stripes="false" - height="125" + height="75" layout="topleft" left="135" name="role_allowed_actions" search_column="2" tool_tip="For Details of each Allowed Ability see the Abilities tab." - top="74" + top="101" width="130"> <scroll_list.columns label="" @@ -682,7 +684,7 @@ things in this group. There's a broad variety of Abilities. name="actions_footer" top_delta="0" visible="false" - width="270"> + width="265"> <text type="string" length="1" @@ -691,8 +693,8 @@ things in this group. There's a broad variety of Abilities. layout="topleft" left="0" name="static" - top="-16" - width="100"> + top="0" + width="200"> Description </text> <text_editor @@ -706,8 +708,8 @@ things in this group. There's a broad variety of Abilities. left_delta="0" max_length="512" name="action_description" - top_delta="16" - width="270" + top_pad="0" + width="265" word_wrap="true"> This Ability is 'Eject Members from this Group'. Only an Owner can eject another Owner. </text_editor> @@ -737,19 +739,19 @@ things in this group. There's a broad variety of Abilities. </text> <scroll_list enabled="false" - height="125" + height="75" layout="topleft" left="0" name="action_roles" - top="74" + top="90" width="130" /> <name_list enabled="false" - height="125" + height="75" layout="topleft" left_pad="5" name="action_members" top_delta="0" - width="135" /> + width="130" /> </panel> </panel>
\ No newline at end of file diff --git a/indra/newview/skins/default/xui/en/panel_landmarks.xml b/indra/newview/skins/default/xui/en/panel_landmarks.xml index f27b584c51..9ee80a37d7 100644 --- a/indra/newview/skins/default/xui/en/panel_landmarks.xml +++ b/indra/newview/skins/default/xui/en/panel_landmarks.xml @@ -1,10 +1,34 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<panel name="Landmarks" bottom="0" height="326" left="0" width="380" - border="true" follows="left|top|right|bottom"> - <inventory_panel allow_multi_select="true" border="true" bottom="0" - follows="left|top|right|bottom" height="326" left="0" mouse_opaque="true" - name="landmarks_list" width="380"/> - <button bottom="0" halign="center" height="16" label=">" enabled="false" - mouse_opaque="false" name="selector" width="20" left="0" - follows="right|bottom" tool_tip="View landmark properties"/> +<panel + name="Landmarks" + bottom="0" + height="326" + left="0" + width="380" + border="true" + background_visible="true" + bg_alpha_color="DkGray2" + follows="left|top|right|bottom"> + <inventory_panel + allow_multi_select="true" + border="true" + bottom="0" + follows="left|top|right|bottom" + height="326" + left="0" + mouse_opaque="true" + name="landmarks_list" + width="380"/> + <button + bottom="0" + halign="center" + height="16" + label=">" + enabled="false" + mouse_opaque="false" + name="selector" + width="20" + left="0" + follows="right|bottom" + tool_tip="View landmark properties"/> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_notes.xml b/indra/newview/skins/default/xui/en/panel_notes.xml index 47d9088a62..a0ac9df8a5 100644 --- a/indra/newview/skins/default/xui/en/panel_notes.xml +++ b/indra/newview/skins/default/xui/en/panel_notes.xml @@ -8,25 +8,25 @@ left="10" name="panel_notes" top="10" - width="355"> + width="305"> <scroll_container left="8" - width="340" + width="260" height="570" follows="left|top|right|bottom" layout="topleft" name="profile_scroll" opaque="true" - color="0.5 0.5 0.5 1.0" + color="DkGray2" reserve_scroll_corner="false"> <panel layout="topleft" - width="310" + width="260" height="530" left="0" follows="left|right" top="0"> - <text + <!-- <text type="string" length="1" follows="left|top" @@ -40,28 +40,27 @@ width="250" word_wrap="true"> Private Notes - </text> + </text>--> <text type="string" length="1" follows="left|top" - font="SansSerif" - font.style="ITALIC" + font="SansSerifBold" height="15" layout="topleft" left="10" name="status_message" - text_color="0.1 0.1 0.1 1" - top_pad="10" - width="300"> - Your notes about this user: + text_color="White" + top="20" + width="260"> + Your private notes: </text> <text_editor - bg_focus_color="white" - bg_writeable_color="0.6 0.6 0.6 1" + bg_focus_color="LtGray" + bg_writeable_color="LtGray" follows="left|right" font="SansSerif" - height="300" + height="200" hide_scrollbar="true" layout="topleft" left="10" @@ -69,9 +68,9 @@ name="notes_edit" text_color="black" top_pad="10" - width="290" + width="240" word_wrap="true" /> - <text + <!-- <text type="string" length="1" follows="left|top" @@ -85,26 +84,25 @@ width="250" word_wrap="true"> Private Settings - </text> - <text + </text> --> + <text type="string" length="1" follows="left|top" - font="SansSerif" - font.style="ITALIC" + font="SansSerifBold" height="15" layout="topleft" left="10" name="status_message2" - text_color="0.1 0.1 0.1 1" - top_pad="10" - width="300"> - This user can: + text_color="white" + top_pad="30" + width="260"> + Allow this user to: </text> <check_box enabled="false" follows="left|top" - font="SansSerifBig" + font="SansSerif" height="20" label="See my online status" layout="topleft" @@ -113,11 +111,11 @@ text_disabled_color="0.1 0.1 0.1 1" text_enabled_color="white" top_pad="10" - width="300" /> + width="260" /> <check_box enabled="false" follows="left|top" - font="SansSerifBig" + font="SansSerif" height="20" label="See me on the map" layout="topleft" @@ -126,11 +124,11 @@ text_disabled_color="0.1 0.1 0.1 1" text_enabled_color="white" top_pad="10" - width="300" /> + width="260" /> <check_box enabled="false" follows="left|top" - font="SansSerifBig" + font="SansSerif" height="20" label="Edit, delete or take my objects" layout="topleft" @@ -139,7 +137,7 @@ text_disabled_color="0.1 0.1 0.1 1" text_enabled_color="white" top_pad="10" - width="300" /> + width="260" /> </panel> </scroll_container> <panel @@ -149,7 +147,7 @@ left="8" name="notes_buttons_panel" bottom="625" - width="345"> + width="280"> <button follows="bottom|left" font="SansSerifSmallBold" @@ -160,14 +158,14 @@ mouse_opaque="false" name="add_friend" top="0" - width="75" /> + width="90" /> <button follows="bottom|left" font="SansSerifSmallBold" height="25" label="IM" layout="topleft" - left_pad="5" + left_pad="0" name="im" top="0" width="40" /> @@ -177,7 +175,7 @@ height="25" label="Call" layout="topleft" - left_pad="5" + left_pad="0" name="call" top="0" width="50" @@ -188,20 +186,20 @@ height="25" label="Teleport" layout="topleft" - left_pad="5" + left_pad="0" name="teleport" top="0" - width="65" /> + width="75" /> <button follows="bottom|left" font="SansSerifSmallBold" height="25" label="Share" layout="topleft" - left_pad="5" + left_pad="0" name="share" top="0" - width="50" + width="60" enabled="false"/> </panel> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml index 63082d3150..4fc47d1c42 100644 --- a/indra/newview/skins/default/xui/en/panel_people.xml +++ b/indra/newview/skins/default/xui/en/panel_people.xml @@ -1,225 +1,298 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <panel layout="topleft" - top="0" left="0" width="355" height="465" + top="0" + left="0" + width="305" + height="465" follows="left|top|right|bottom" - background_visible="true" bg_alpha_color="0.3 0.3 0.3 1" - label="People" name="people_panel" -> - <search_editor + background_visible="true" + label="People" + name="people_panel"> + <search_editor layout="topleft" - top="3" left="10" width="335" height="16" + top="3" + left="15" + width="270" + height="20" follows="left|top|right" - max_length="300" - label="Filter" name="filter_input" - font="SansSerif" text_color="black" - /> + max_length="270" + label="Filter People" + name="filter_input" + font="SansSerif" + background_image="TextField_Search_Off" + text_pad_left="23" + text_color="black"/> + <button + name="people_search" + layout="topleft" + top="5" + left="23" + width="13" + height="13" + scale_image="false" + follows="left|top|right" + font="SansSerifBigBold" + image_selected="Search" + image_unselected="Search" + picture_style="true"/> <tab_container layout="topleft" - top="30" left="10" width="335" height="400" + top="30" + left="10" + width="280" + height="400" follows="left|top|right|bottom" name="tabs" - tab_position="top" - bg_alpha_color="0.7 0.7 0.1 1" - > - <panel + tab_position="top"> + <panel layout="topleft" - height="390" width="332" + height="390" + width="280" follows="left|top|right|bottom" - background_visible="true" bevel_style="bright" - label="Nearby" name="nearby_panel" - > + background_visible="true" + bevel_style="bright" + label="Nearby" + name="nearby_panel"> <avatar_list layout="topleft" - top="2" left="0" width="332" height="357" + top="2" + left="0" + width="280" + height="357" follows="left|top|right|bottom" - name="avatar_list" - /> + name="avatar_list"/> <panel layout="topleft" - bottom="390" left="0" width="333" height="30" + bottom="390" + left="0" + width="280" + height="30" follows="left|right|bottom" - background_visible="true" bevel_style="bright" bg_alpha_color="black" - label="bottom_panel" name="bottom_panel" - > + background_visible="true" + bevel_style="bright" + label="bottom_panel" + name="bottom_panel"> <button name="gear_btn" enabled="false" layout="topleft" - top="9" left="305" width="16" height="16" + top="7" + left="20" + width="18" + height="18" follows="bottom|right" font="SansSerifBigBold" - image_hover_selected="gear.tga" - image_selected="gear.tga" - image_unselected="gear.tga" - picture_style="true" - /> - </panel> + hover_glow_amount="0.15" + image_selected="OptionsMenu_Press" + image_unselected="OptionsMenu_Off" + picture_style="true"/> + </panel> </panel> <panel layout="topleft" - height="390" width="332" + height="390" + width="280" follows="left|top|right|bottom" - background_visible="true" bevel_style="bright" - label="Friends" name="friends_panel" - > + background_visible="true" + bevel_style="bright" + label="Friends" + name="friends_panel"> <avatar_list layout="topleft" - top="2" left="0" width="332" height="357" + top="2" + left="0" + width="280" + height="357" follows="left|top|right|bottom" - name="avatar_list" - /> + name="avatar_list"/> <panel layout="topleft" - bottom="390" left="0" width="333" height="30" + bottom="390" + left="0" + width="280" + height="30" follows="left|right|bottom" - background_visible="true" bevel_style="in" bg_alpha_color="black" - label="bottom_panel" name="bottom_panel" - > - <button + background_visible="true" + bevel_style="in" + label="bottom_panel" + name="bottom_panel"> + <button + name="gear_btn" + enabled="false" + layout="topleft" + top="7" + left="20" + width="18" + height="18" + follows="bottom|right" + font="SansSerifBigBold" + hover_glow_amount="0.15" + image_selected="OptionsMenu_Press" + image_unselected="OptionsMenu_Off" + picture_style="true"/> + <button name="add_btn" layout="topleft" - top="9" left="10" width="16" height="16" + top_delta="0" + left_pad="5" + width="18" + height="18" follows="bottom|left" font="SansSerifBigBold" - image_hover_selected="plus.tga" - image_selected="plus.tga" - image_unselected="plus.tga" picture_style="true" - /> + hover_glow_amount="0.15" + image_selected="AddItem_Press" + image_unselected="AddItem_Off" + picture_style="true"/> <button name="del_btn" layout="topleft" - top_delta="0" left_pad="24" width="16" height="16" + top_delta="0" + left_pad="180" + width="18" + height="18" follows="bottom|left" font="SansSerifBigBold" - image_hover_selected="minus.tga" - image_selected="minus.tga" - image_unselected="minus.tga" - picture_style="true" - /> - <button - name="gear_btn" - enabled="false" - layout="topleft" - top_delta="0" left_pad="239" width="16" height="16" - follows="bottom|right" - font="SansSerifBigBold" - image_hover_selected="gear.tga" - image_selected="gear.tga" - image_unselected="gear.tga" - picture_style="true" - /> - </panel> + hover_glow_amount="0.15" + image_selected="TrashItem_Press" + image_unselected="TrashItem_Off" + picture_style="true"/> + </panel> </panel> <panel layout="topleft" - height="390" width="332" + height="390" + width="280" follows="left|top|right|bottom" - background_visible="true" bevel_style="bright" - label="Groups" name="groups_panel" - > + background_visible="true" + bevel_style="bright" + label="Groups" + name="groups_panel"> <group_list layout="topleft" - top="2" left="0" width="332" height="357" + top="2" + left="0" + width="280" + height="357" follows="left|top|right|bottom" - name="group_list" - /> + name="group_list"/> <panel layout="topleft" - bottom="390" left="0" width="333" height="30" + bottom="390" + left="0" + width="280" + height="30" follows="left|right|bottom" - background_visible="true" bevel_style="in" bg_alpha_color="black" - label="bottom_panel" name="bottom_panel" - > + background_visible="true" + bevel_style="in" + label="bottom_panel" + name="bottom_panel"> <button - name="plus_btn" + name="gear_btn" + enabled="false" layout="topleft" - top="9" left="10" width="16" height="16" - follows="bottom|left" + top="7" + left="20" + width="18" + height="18" + follows="bottom|right" font="SansSerifBigBold" - image_hover_selected="plus.tga" - image_selected="plus.tga" - image_unselected="plus.tga" - picture_style="true" - /> + hover_glow_amount="0.15" + image_selected="OptionsMenu_Press" + image_unselected="OptionsMenu_Off" + picture_style="true"/> <button - name="minus_btn" + name="plus_btn" layout="topleft" - top_delta="0" left_pad="24" width="16" height="16" + top_delta="0" + left_pad="5" + width="18" + height="18" follows="bottom|left" font="SansSerifBigBold" - image_hover_selected="minus.tga" - image_selected="minus.tga" - image_unselected="minus.tga" - picture_style="true" - /> + hover_glow_amount="0.15" + image_selected="AddItem_Press" + image_unselected="AddItem_Off" + picture_style="true"/> <button name="activate_btn" layout="topleft" - top_delta="0" left_pad="24" width="16" height="16" + top_delta="5" + left_pad="24" + width="10" + height="10" follows="bottom|left" font="SansSerifBigBold" image_hover_selected="group_activate_btn.tga" image_selected="group_activate_btn.tga" image_unselected="group_activate_btn.tga" - picture_style="true" - /> + picture_style="true"/> <button - name="gear_btn" - enabled="false" + name="minus_btn" layout="topleft" - top_delta="0" left="305" width="16" height="16" - follows="bottom|right" + top_delta="-5" + left_pad="146" + width="18" + height="18" + follows="bottom|left" font="SansSerifBigBold" - image_hover_selected="gear.tga" - image_selected="gear.tga" - image_unselected="gear.tga" - picture_style="true" - /> - </panel> + hover_glow_amount="0.15" + image_selected="TrashItem_Press" + image_unselected="TrashItem_Off" + picture_style="true"/> + </panel> </panel> <panel layout="topleft" - height="390" width="332" + height="390" + width="280" follows="left|top|right|bottom" - background_visible="true" bevel_style="bright" - label="Recent" name="recent_panel" - > + background_visible="true" + bevel_style="bright" + label="Recent" + name="recent_panel"> <avatar_list layout="topleft" - top="2" left="0" width="332" height="357" + top="2" + left="0" + width="280" + height="357" follows="left|top|right|bottom" - name="avatar_list" - /> + name="avatar_list"/> <panel layout="topleft" - bottom="390" left="0" width="333" height="30" + bottom="390" + left="0" + width="280" + height="30" follows="left|right|bottom" - background_visible="true" bevel_style="in" bg_alpha_color="black" - label="bottom_panel" name="bottom_panel" - > + background_visible="true" + bevel_style="in" + label="bottom_panel" + name="bottom_panel"> <button name="gear_btn" enabled="false" layout="topleft" - top="9" left="305" width="16" height="16" + top="7" + left="20" + width="18" + height="18" follows="bottom|right" font="SansSerifBigBold" - image_hover_selected="gear.tga" - image_selected="gear.tga" - image_unselected="gear.tga" - picture_style="true" - /> + hover_glow_amount="0.15" + image_selected="OptionsMenu_Press" + image_unselected="OptionsMenu_Off" + picture_style="true"/> </panel> </panel> </tab_container> - - <layout_stack + <layout_stack name="button_bar" follows="left|right|bottom" bottom="6" left="6" - width="335" + width="280" height="27" orientation="horizontal" animate="false" @@ -234,16 +307,15 @@ left="0" min_width="85" width="85" - visible="true" - > + visible="true"> <button label="View Profile" name="view_profile_btn" layout="topleft" - width="85" height="25" + width="85" + height="25" follows="top|left|right" - font="SansSerifSmallBold" - /> + font="SansSerifSmallBold"/> </layout_panel> <layout_panel name="add_friend_btn_panel" @@ -255,16 +327,14 @@ left="0" min_width="85" width="85" - visible="true" - > + visible="true"> <button label="Add Friend" name="add_friend_btn" layout="topleft" width="85" height="25" follows="top|left|right" - font="SansSerifSmallBold" - /> + font="SansSerifSmallBold"/> </layout_panel> <layout_panel name="group_info_btn_panel" @@ -276,16 +346,15 @@ left="0" min_width="80" width="80" - visible="true" - > + visible="true"> <button label="Group Info" name="group_info_btn" layout="topleft" - width="80" height="25" + width="80" + height="25" follows="top|left|right" - font="SansSerifSmallBold" - /> + font="SansSerifSmallBold"/> </layout_panel> <layout_panel name="chat_btn_panel" border="false" @@ -296,16 +365,14 @@ left="0" min_width="45" width="45" - visible="true" - > + visible="true"> <button label="Chat" name="chat_btn" layout="topleft" width="45" height="25" follows="top|left|right" - font="SansSerifSmallBold" - /> + font="SansSerifSmallBold"/> </layout_panel> <layout_panel name="im_btn_panel" @@ -317,16 +384,15 @@ left="0" min_width="35" width="35" - visible="true" - > + visible="true"> <button label="IM" name="im_btn" layout="topleft" - width="35" height="25" + width="35" + height="25" follows="top|left|right" - font="SansSerifSmallBold" - /> + font="SansSerifSmallBold"/> </layout_panel> <layout_panel name="call_btn_panel" @@ -338,17 +404,16 @@ left="0" min_width="40" width="40" - visible="false" - > + visible="false"> <button label="Call" name="call_btn" enabled="false" layout="topleft" - width="40" height="25" + width="40" + height="25" follows="top|left|right" - font="SansSerifSmallBold" - /> + font="SansSerifSmallBold"/> </layout_panel> <layout_panel name="teleport_btn_panel" @@ -359,8 +424,7 @@ height="25" left="0" min_width="65" - width="65" - > + width="65"> <button label="Teleport" name="teleport_btn" @@ -368,8 +432,7 @@ height="25" layout="topleft" follows="left|top|right" - font="SansSerifSmallBold" - /> + font="SansSerifSmallBold"/> </layout_panel> <layout_panel name="share_btn_panel" @@ -382,8 +445,7 @@ left="0" min_width="50" width="50" - visible="false" - > + visible="false"> <button label="Share" name="share_btn" @@ -392,8 +454,7 @@ width="50" height="25" follows="top|left|right" - font="SansSerifSmallBold" - /> + font="SansSerifSmallBold"/> </layout_panel> <layout_panel name="more_btn_panel" @@ -405,8 +466,7 @@ left="0" min_width="40" width="40" - visible="true" - > + visible="true"> <button label=">>" name="more_btn" @@ -415,10 +475,9 @@ width="40" height="25" follows="top|right" - font="SansSerifSmallBold" - /> + font="SansSerifSmallBold"/> </layout_panel> - </layout_stack> + </layout_stack> <string name="no_people"> No people </string> diff --git a/indra/newview/skins/default/xui/en/panel_pick_info.xml b/indra/newview/skins/default/xui/en/panel_pick_info.xml index e43d8d5c00..393521f1d2 100644 --- a/indra/newview/skins/default/xui/en/panel_pick_info.xml +++ b/indra/newview/skins/default/xui/en/panel_pick_info.xml @@ -1,14 +1,12 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <panel - background_visible="true" bevel_style="in" - bg_alpha_color="0.2 0.2 0.2 1" height="660" layout="topleft" left="0" name="panel_pick_info" top="0" - width="355"> + width="305"> <button follows="top|left" height="20" @@ -36,11 +34,12 @@ Pick Info </text> <panel - background_visible="true" - bg_alpha_color="0.5 0.5 0.5 1" follows="left|right|top|bottom" height="580" + width="280" layout="topleft" + background_visible="true" + bg_alpha_color="DkGray2" left="10" right="-10" top="30"> @@ -73,7 +72,7 @@ left="10" name="pick_name" right="-10" - text_color="black" + text_color="white" word_wrap="true"> [name] </text> @@ -99,7 +98,7 @@ left="10" name="pick_desc" right="-10" - text_color="black" + text_color="white" valign="center" word_wrap="true"> [description] @@ -124,7 +123,7 @@ layout="topleft" left="10" name="pick_location" - text_color="black" + text_color="white" valign="center"> [loading...] </text> @@ -153,20 +152,20 @@ height="25" label="Teleport" layout="topleft" - left_pad="5" + left_pad="0" name="teleport_btn" top="0" - width="70" /> + width="80" /> <button follows="bottom|left" font="SansSerifSmallBold" height="25" label="Show on Map" layout="topleft" - left_pad="5" + left_pad="0" name="show_on_map_btn" top="0" - width="90" /> + width="100" /> <button enabled="false" follows="bottom|left" @@ -174,7 +173,7 @@ height="25" label="Verb" layout="topleft" - right="-5" + left_pad="0" name="verb_btn" top="0" width="50" /> diff --git a/indra/newview/skins/default/xui/en/panel_picks.xml b/indra/newview/skins/default/xui/en/panel_picks.xml index c8a814887a..5b66026f48 100644 --- a/indra/newview/skins/default/xui/en/panel_picks.xml +++ b/indra/newview/skins/default/xui/en/panel_picks.xml @@ -8,8 +8,8 @@ left="0" name="panel_picks" top="0" - width="355"> - <text + width="305"> + <!--<text type="string" length="1" follows="top|left|right" @@ -20,24 +20,24 @@ name="pick_title" text_color="white" top="10" - width="330" + width="270" word_wrap="true"> [NAME]'s favorite places in Second Life... - </text> + </text>--> <!-- below is a special title shown for the Agent on the "Picks" tab--> <text type="string" length="1" follows="top" - font="SansSerifHugeBold" - height="55" + font="SansSerifBold" + height="35" layout="topleft" left="10" name="pick_title_agent" text_color="white" top="10" visible="false" - width="330" + width="270" word_wrap="true"> Tell everyone about your favorite Second Life places... </text> @@ -48,10 +48,10 @@ left="8" name="profile_scroll" opaque="true" - color="0.5 0.5 0.5 1.0" + color="DkGray2" reserve_scroll_corner="false" top_pad="0" - width="340"> + width="260"> <panel bevel_style="in" height="40" @@ -59,12 +59,11 @@ left="0" name="back_panel" top="0" - width="310" /> + width="260" /> </scroll_container> <panel background_visible="true" bevel_style="in" - bg_alpha_color="black" enabled="false" follows="left|right|bottom" height="25" @@ -74,48 +73,52 @@ name="edit_panel" visible="false" top_pad="0" - width="340"> + width="260"> <button enabled="false" follows="bottom|left" font="SansSerifBigBold" - height="16" - image_hover_selected="gear.tga" - image_selected="gear.tga" - image_unselected="gear.tga" + height="18" + hover_glow_amount="0.15" + image_selected="OptionsMenu_Press" + image_unselected="OptionsMenu_Off" layout="topleft" - left="5" + left="10" name="gear_menu_btn" picture_style="true" top="5" - width="16" /> + width="18" /> <button follows="bottom|left" font="SansSerifBigBold" - height="16" - image_hover_selected="plus.tga" - image_selected="plus.tga" - image_unselected="plus.tga" + height="18" + image_disabled="AddItem_Off" + image_disabled_selected="AddItem_Press" + hover_glow_amount="0.15" + image_selected="AddItem_Press" + image_unselected="AddItem_Off" layout="topleft" left="35" name="new_btn" picture_style="true" tool_tip="Create New Pick at Current Location" top="5" - width="16" /> + width="18" /> <button follows="bottom|right" font="SansSerifBigBold" - height="16" - image_hover_selected="minus.tga" - image_selected="minus.tga" - image_unselected="minus.tga" + height="18" + image_disabled="TrashItem_Off" + image_disabled_selected="TrashItem_Press" + hover_glow_amount="0.15" + image_selected="TrashItem_Press" + image_unselected="TrashItem_Off" layout="topleft" name="trash_btn" picture_style="true" right="-10" top="5" - width="16" /> + width="18" /> </panel> <panel follows="bottom|left" @@ -124,7 +127,7 @@ left="8" name="buttons_cucks" bottom="625" - width="345"> + width="280"> <button follows="bottom|left" font="SansSerifSmallBold" @@ -135,29 +138,29 @@ name="info_btn" enabled="false" top="0" - width="50" /> + width="60" /> <button follows="bottom|left" font="SansSerifSmallBold" height="25" label="Teleport" layout="topleft" - left_pad="5" + left_pad="0" name="teleport_btn" enabled="false" top="0" - width="70" /> + width="75" /> <button follows="bottom|left" font="SansSerifSmallBold" height="25" label="Show on Map" layout="topleft" - left_pad="5" + left_pad="0" name="show_on_map_btn" enabled="false" top="0" - width="90" /> + width="105" /> <button enabled="false" follows="bottom|right" @@ -165,9 +168,9 @@ height="25" label="Verb" layout="topleft" - right="-15" + left_pad="0" name="verb_btn" top="0" - width="50" /> + width="60" /> </panel> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_places.xml b/indra/newview/skins/default/xui/en/panel_places.xml index 1743e016ee..61b0ac9b72 100644 --- a/indra/newview/skins/default/xui/en/panel_places.xml +++ b/indra/newview/skins/default/xui/en/panel_places.xml @@ -1,7 +1,6 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <panel background_visible="true" - bg_alpha_color="0.3 0.3 0.3 1" follows="left|top|right|bottom" height="400" label="Places" @@ -11,7 +10,7 @@ min_width="240" name="places panel" top="400" - width="355"> + width="305"> <panel.string name="landmarks_tab_title"> Landmarks @@ -22,22 +21,39 @@ </panel.string> <search_editor follows="left|top|right" - height="16" + height="20" label="Filter" layout="topleft" - left="10" + left="15" name="Filter" - top="4" - width="335" /> + top="3" + width="270" + font="SansSerif" + background_image="TextField_Search_Off" + text_pad_left="23" + text_color="black"/> + <button + name="landmark_search" + layout="topleft" + top="5" + left="23" + width="13" + height="13" + scale_image="false" + follows="left|top|right" + font="SansSerifBigBold" + image_selected="Search" + image_unselected="Search" + picture_style="true"/> <tab_container follows="left|top|right|bottom" height="326" layout="topleft" - left_delta="0" + left="10" name="Places Tabs" tab_position="top" top_pad="19" - width="335" /> + width="280" /> <panel class="panel_place_info" filename="panel_place_info.xml" @@ -48,7 +64,7 @@ name="panel_place_info" top="-310" visible="false" - width="355" /> + width="280" /> <button follows="bottom|left" font="SansSerifSmallBold" @@ -58,14 +74,14 @@ left_delta="10" name="teleport_btn" top_pad="5" - width="90" /> + width="80" /> <button follows="bottom|left" font="SansSerifSmallBold" height="25" label="Show on Map" layout="topleft" - left_pad="5" + left_pad="0" name="map_btn" top_delta="0" width="110" /> @@ -76,7 +92,7 @@ height="25" label="Share" layout="topleft" - left_pad="5" + left_pad="0" name="share_btn" top_delta="0" width="60" /> @@ -87,7 +103,7 @@ height="25" label="â–¼" layout="topleft" - left_pad="35" + left_pad="0" name="overflow_btn" top_delta="0" width="30" /> diff --git a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml index 2f08bb816e..624345367f 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml @@ -70,45 +70,6 @@ Beware the Trout! top_pad="10" width="200" /> - <text - type="string" - length="1" - follows="left|top" - height="12" - layout="topleft" - left="30" - name="UI Size:" - top_pad="10" - width="100"> - UI Size: - </text> - <slider - can_edit_text="true" - control_name="UIScaleFactor" - decimal_digits="2" - follows="left|top" - height="15" - increment="0.025" - initial_value="1" - layout="topleft" - left_delta="0" - max_val="1.4" - min_val="0.75" - name="ui_scale_slider" - top_pad="10" - width="180" /> - <spinner - control_name="UIScaleFactor" - height="16" - increment="0.025" - initial_value="1" - layout="topleft" - left_pad="10" - max_val="1.4" - min_val="0.75" - name="ui_scale_slider" - top_delta="0" - width="58" /> <check_box control_name="UIAutoScale" height="16" 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 6ca88a51a9..70d15c237b 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_general.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_general.xml @@ -223,15 +223,15 @@ </text> <!-- THIS IS A NEW RADIO GROUP ADDED BY LIS --> <radio_group + control_name="AvatarNameTagMode" height="30" layout="topleft" left_delta="50" - control_name="NameTags" name="Name_Tag_Preference" top_pad="10"> <radio_item height="16" - label="On" + label="Off" layout="topleft" left="0" name="radio" @@ -239,7 +239,7 @@ width="98" /> <radio_item height="16" - label="Off" + label="On" layout="topleft" left_pad="12" name="radio2" @@ -255,7 +255,8 @@ width="98" /> </radio_group> <check_box - control_name="RenderNameHideSelf" + enabled_control="AvatarNameTagMode" + control_name="RenderNameShowSelf" height="16" label="Show my name" layout="topleft" @@ -264,7 +265,8 @@ top_pad="5" width="300" /> <check_box - control_name="RenderHideGroupTitleAll" + enabled_control="AvatarNameTagMode" + control_name="RenderShowGroupTitleAll" height="16" label="Show group titles" layout="topleft" diff --git a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml index fb83ab859c..563056890a 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml @@ -36,7 +36,7 @@ layout="topleft" left_delta="30" name="windowed mode" - top_pad="5" + top_pad="4" width="100"> </check_box> <combo_box @@ -74,6 +74,46 @@ function="setControlFalse" parameter="FullScreenAutoDetectAspectRatio" /> </combo_box> + <text + type="string" + length="1" + follows="left|top" + height="12" + layout="topleft" + left="30" + name="UI Size:" + top_pad="4" + width="100"> + UI Size: + </text> + <slider + can_edit_text="true" + control_name="UIScaleFactor" + decimal_digits="2" + follows="left|top" + height="15" + increment="0.025" + initial_value="1" + layout="topleft" + left_delta="32" + max_val="1.4" + min_val="0.75" + name="ui_scale_slider" + top_pad="2" + width="180" /> + <spinner + control_name="UIScaleFactor" + height="16" + increment="0.025" + initial_value="1" + layout="topleft" + left_pad="10" + max_val="1.4" + min_val="0.75" + name="ui_scale_slider" + top_delta="0" + width="58" /> + <text type="string" length="1" @@ -82,7 +122,7 @@ layout="topleft" left="30" name="QualitySpeed" - top_pad="5" + top_pad="4" width="400"> Quality and speed: </text> @@ -90,11 +130,12 @@ type="string" length="1" follows="left|top" + halign="right" height="12" layout="topleft" - left_delta="35" + left="35" name="FasterText" - top_pad="5" + top_pad="4" width="80"> Faster </text> @@ -104,27 +145,27 @@ follows="left|top" height="12" layout="topleft" - left_delta="240" + left_delta="360" name="BetterText" top_delta="0" width="80"> Better </text> - <icon + <icon color="0.12 0.12 0.12 1" height="14" image_name="rounded_square.tga" layout="topleft" - left="140" + left="128" name="LowGraphicsDivet" - top_delta="2" + top_delta="-2" width="2" /> <icon color="0.12 0.12 0.12 1" height="14" image_name="rounded_square.tga" layout="topleft" - left_pad="42" + left_pad="83" name="MidGraphicsDivet" top_delta="0" width="2" /> @@ -133,7 +174,7 @@ height="14" image_name="rounded_square.tga" layout="topleft" - left_pad="42" + left_pad="85" name="HighGraphicsDivet" top_delta="0" width="2" /> @@ -142,7 +183,7 @@ height="14" image_name="rounded_square.tga" layout="topleft" - left_pad="42" + left_pad="83" name="UltraGraphicsDivet" top_delta="0" width="2" /> @@ -154,12 +195,12 @@ increment="1" initial_value="0" layout="topleft" - left_delta="-140" + left="120" max_val="3" name="QualityPerformanceSelection" show_text="false" - top_delta="-1" - width="150"> + top_delta="-2" + width="275"> <slider.commit_callback function="Pref.QualityPerformance"/> </slider> @@ -167,9 +208,10 @@ type="string" length="1" follows="left|top" + halign="center" height="12" layout="topleft" - left="130" + left="88" name="ShadersPrefText" top_delta="20" width="80"> @@ -179,11 +221,12 @@ type="string" length="1" follows="left|top" + halign="center" height="12" layout="topleft" - left_delta="42" + left_delta="87" name="ShadersPrefText2" - top_delta="10" + top_delta="0" width="80"> Mid </text> @@ -191,24 +234,26 @@ type="string" length="1" follows="left|top" + halign="center" height="12" layout="topleft" - left_delta="42" + left_delta="87" name="ShadersPrefText3" - top_delta="-10" - width="40"> + top_delta="0" + width="80"> High </text> <text type="string" length="1" follows="left|top" + halign="center" height="12" layout="topleft" - left_delta="42" + left_delta="85" name="ShadersPrefText4" - top_delta="10" - width="40"> + top_delta="0" + width="80"> Ultra </text> <panel @@ -220,7 +265,7 @@ layout="topleft" left="5" name="CustomGraphics Panel" - top="117" + top="124" width="485"> <text type="string" @@ -750,39 +795,55 @@ width="315" /> </radio_group> </panel> + <button + follows="left|bottom" + height="20" + label="Apply" + label_selected="Apply" + layout="topleft" + left="10" + name="Apply" + top="383" + width="115"> + <button.commit_callback + function="Pref.Apply" /> + </button> <button + follows="left|bottom" height="20" label="Reset" layout="topleft" - left="15" + left_pad="3" name="Defaults" - top="380" - width="155"> + top="383" + width="115"> <button.commit_callback function="Pref.HardwareDefaults" /> </button> <button control_name="ShowAdvancedGraphicsSettings" + follows="right|bottom" height="20" is_toggle="true" label="Advanced" layout="topleft" - left_pad="5" + left_pad="35" name="Advanced" top_delta="0" - width="155"> + width="115"> <button.commit_callback function="Pref.ChangeCustom" /> </button> <button + follows="right|bottom" height="20" label="Hardware" label_selected="Hardware" layout="topleft" - left_pad="5" + left_pad="3" name="GraphicsHardwareButton" top_delta="0" - width="155"> + width="115"> <button.commit_callback function="Pref.HardwareSettings" /> </button> diff --git a/indra/newview/skins/default/xui/en/panel_profile.xml b/indra/newview/skins/default/xui/en/panel_profile.xml index 8b5591e832..4f559394a6 100644 --- a/indra/newview/skins/default/xui/en/panel_profile.xml +++ b/indra/newview/skins/default/xui/en/panel_profile.xml @@ -9,7 +9,7 @@ mouse_opaque="false" name="panel_profile" top="10" - width="355"> + width="305"> <panel.string name="CaptionTextAcctInfo"> [ACCTTYPE] [PAYMENTINFO] [AGEVERIFICATION] @@ -67,7 +67,7 @@ None </panel.string> <scroll_container - color="0.5 0.5 0.5 1.0" + color="DkGray2" follows="left|top|right|bottom" height="570" layout="topleft" @@ -75,13 +75,13 @@ name="profile_scroll" opaque="true" reserve_scroll_corner="false" - width="340"> - <panel + width="260"> + <panel height="680" layout="topleft" left="0" top="0" - width="310"> + width="280"> <text type="string" follows="top|left|right" @@ -93,260 +93,128 @@ text_color="white" top="0" mouse_opaque="true" - width="320"> + width="250"> (Loading...) </text> - <panel - follows="left|top" - height="120" - layout="topleft" - left="9" - name="lifes_images_panel" - top_pad="15" - width="250"> - <panel + <panel follows="left|top" - height="120" + height="100" layout="topleft" - left="0" + left="10" name="second_life_image_panel" - top="0" - width="125"> - <text - type="string" - follows="left|top|right|bottom" - font="SansSerifBold" - height="20" - layout="topleft" - left="0" - name="first_life_photo_title_text" - text_color="white" - top="0" - width="125"> - Second Life photo: - </text> + top="20" + width="250"> <texture_picker allow_no_texture="true" default_image_name="None" enabled="false" follows="top|left" - height="105" + height="100" layout="topleft" left="0" name="2nd_life_pic" - top_pad="5" - width="105" /> - </panel> - <panel - follows="left|top" - height="120" - layout="topleft" - left_pad="1" - name="first_life_image_panel" - top="0" - width="125"> - <text - type="string" - follows="left|top|right|bottom" - font="SansSerifBold" - height="20" - layout="topleft" - left="0" - name="second_life_photo_title_text" - text_color="white" top="0" - width="125"> - First Life photo: - </text> - <texture_picker - allow_no_texture="true" - default_image_name="None" - enabled="false" - follows="top|left" - height="105" - layout="topleft" - left="0" - name="1st_life_pic" - top_pad="5" - width="105" /> - </panel> - </panel> - <panel - follows="left|top|right" - height="30" - layout="topleft" - left="0" - name="status_panel" - top="155" - width="320"> - <text - follows="left|top" - font="SansSerifBold" - font.style="ITALIC" - height="15" - layout="topleft" - left="9" - name="online_status" - text_color="green" - width="100" /> - <text - type="string" - follows="left|top" - font="SansSerifBold" - font.style="ITALIC" - height="15" - layout="topleft" - left="9" - name="status_message" - text_color="0.1 0.1 0.1 1" - width="300"> - <!--TBD--> - </text> - </panel> - <panel - follows="left|top|right" - height="80" - layout="topleft" - left="0" - name="status_me_panel" - top="155" - width="300"> - <text - type="string" - follows="left|top" - font="SansSerifBold" - height="15" - layout="topleft" - left="9" - name="online_me_status_text" - text_color="white" - width="100"> - Status: - </text> - <combo_box - font="SansSerifBold" - height="18" - layout="topleft" - left="10" - name="status_combo" - width="150"> - <combo_box.item - label="Online" - name="online" - value="online" /> - <combo_box.item - label="Away" - name="away" - value="away" /> - <combo_box.item - label="Busy" - name="busy" - value="busy" /> - </combo_box> - <text - type="string" - follows="left|top" - font="SansSerifBold" - height="15" - layout="topleft" - left="9" - name="status_me_message_text" - text_color="white" - width="300"> - What're you up to? - </text> - <line_editor - border_style="line" - border_thickness="1" - follows="left|top|right" - font="SansSerifBold" - font.style="ITALIC" - height="20" - layout="topleft" - left="9" - name="status_me_message_edit" - select_on_focus="true" - text_color="0.5 0.5 0.5 1" - width="300"> - Type a message about what you're doing in SL! - </line_editor> - </panel> - <text + width="100" /> + <text type="string" - follows="left|top" font="SansSerifBold" height="15" layout="topleft" - left="9" + left_pad="10" name="title_sl_descr_text" text_color="white" - top_pad="10" - width="290"> - Second Life description: + top_delta="0" + width="125"> + Second Life: </text> <text type="string" + top_pad="4" follows="left|top|right" - font="SansSerif" - height="45" + font="SansSerifSmall" + height="75" layout="topleft" - left="9" + left_delta="0" name="sl_description_edit" - text_color="0.1 0.1 0.1 1" - width="290" + text_color="LtGray" + width="125" word_wrap="true"> Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum. </text> - <text + </panel> + <panel + follows="left|top" + height="100" + layout="topleft" + left="10" + name="first_life_image_panel" + top_pad="20" + width="125"> + <texture_picker + allow_no_texture="true" + default_image_name="None" + enabled="false" + follows="top|left" + height="100" + layout="topleft" + left="0" + name="real_world_pic" + top_pad="0" + width="100" /> + <text type="string" follows="left|top" font="SansSerifBold" height="15" layout="topleft" - left="9" - name="title_fl_descr_text" + left_pad="10" + name="title_rw_descr_text" text_color="white" - top_pad="10" - width="290"> - First Life description: + top_delta="0" + width="125"> + Real World: </text> <text type="string" follows="left|top|right" - font="SansSerif" + font="SansSerifSmall" height="45" layout="topleft" - left="9" + left_delta="0" + top_pad="10" name="fl_description_edit" - text_color="0.1 0.1 0.1 1" - width="290" + text_color="LtGray" + width="125" word_wrap="true"> Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum. </text> + </panel> <text type="string" follows="left|top" font="SansSerifBold" height="15" layout="topleft" - left="9" + halign="right" + left="10" name="title_groups_text" text_color="white" - top_pad="10" - width="290"> - Second Life groups: + top_pad="20" + width="100"> + Groups: </text> <text type="string" follows="left|top|right" - font="SansSerif" + font="SansSerifSmall" height="45" layout="topleft" - left="9" + left_pad="10" + top_delta="0" name="sl_groups" - text_color="0.1 0.1 0.1 1" - width="290" + text_color="LtGray" + width="125" word_wrap="true"> Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum. </text> @@ -355,26 +223,28 @@ follows="left|top" font="SansSerifBold" height="15" + halign="right" layout="topleft" - left="9" + left="10" name="title_homepage_text" text_color="white" - top_pad="10" + top_pad="20" width="100"> Homepage: </text> <text type="string" follows="left|top|right" - font="SansSerif" + font="SansSerifSmall" font.style="UNDERLINE" font_shadow="hard" height="15" + top_delta="0" layout="topleft" - left="9" + left_pad="10" name="homepage_edit" text_color="0.2 0.2 1 1" - width="290"> + width="125"> TODO </text> <text @@ -382,24 +252,26 @@ follows="left|top" font="SansSerifBold" height="15" + halign="right" layout="topleft" - left="9" + left="10" name="title_member_text" text_color="white" - top_pad="10" + top_pad="20" width="100"> Member since: </text> <text type="string" follows="left|top|right" - font="SansSerif" + font="SansSerifSmall" height="15" layout="topleft" - left="9" + left_pad="10" + top_delta="0" name="register_date" - text_color="0.1 0.1 0.1 1" - width="290" + text_color="LtGray" + width="125" word_wrap="true"> 05/31/1976 </text> @@ -408,34 +280,90 @@ follows="left|top" font="SansSerifBold" height="15" + halign="right" layout="topleft" - left="9" + left="10" + top_pad="20" name="title_acc_status_text" text_color="white" - top_pad="10" width="100"> Account status: </text> <text type="string" follows="left|top|right" - font="SansSerif" + font="SansSerifSmall" height="30" layout="topleft" - left="9" + left_pad="10" + top_delta="0" name="acc_status_text" - text_color="0.1 0.1 0.1 1" - width="290" + text_color="LtGray" + width="125" word_wrap="true"> Resident. No payment info on file. </text> + <text + type="string" + follows="left|top" + font="SansSerifBold" + height="15" + halign="right" + layout="topleft" + name="title_partner_text" + text_color="white" + top_pad="20" + left="10" + width="100"> + Partner: + </text> <panel follows="left|top|right" height="15" layout="topleft" - left="9" + left_pad="10" + top_delta="0" + name="partner_data_panel" + width="125"> + <text + type="string" + follows="left|top|right" + font="SansSerifSmall" + height="15" + layout="topleft" + left="0" + name="partner_text" + text_color="LtGray" + top="0" + width="125" + word_wrap="true"> + [FIRST] [LAST] + </text> + <text + type="string" + follows="top|right" + font="SansSerifSmall" + font.style="UNDERLINE" + font_shadow="hard" + height="15" + layout="topleft" + left_delta="0" + name="partner_edit_link" + text_color="0.2 0.2 1 1" + top_delta="15" + width="40"> + Edit + </text> + </panel> + + <panel + follows="left|top|right" + height="15" + layout="topleft" + left="50" + top_pad="40" name="account_actions_panel" - width="300"> + width="200"> <text type="string" follows="left|top" @@ -448,7 +376,7 @@ name="payment_update_link" text_color="0.2 0.2 1 1" top="0" - width="65"> + width="100"> Update </text> <text @@ -467,57 +395,120 @@ My Account </text> </panel> - <text - type="string" - follows="left|top" - font="SansSerifBold" - height="15" + + + + <!-- + <panel + follows="left|top|right" + height="30" layout="topleft" - name="title_partner_text" - text_color="white" - top_pad="10" - width="100"> - Partner: - </text> + left="0" + name="status_panel" + top="155" + width="260"> + <text + follows="left|top" + font="SansSerifBold" + font.style="ITALIC" + height="15" + layout="topleft" + left="9" + name="online_status" + text_color="green" + width="100" /> + <text + type="string" + follows="left|top" + font="SansSerifBold" + font.style="ITALIC" + height="15" + layout="topleft" + left="9" + name="status_message" + text_color="0.1 0.1 0.1 1" + width="280"> + TBD + </text> + </panel> --> <panel follows="left|top|right" - height="15" + height="80" layout="topleft" - left="9" - name="partner_data_panel" - width="300"> + left="0" + name="status_me_panel" + top_pad="20" + width="125"> <text type="string" - follows="left|top|right" - font="SansSerif" + follows="left|top" + font="SansSerifBold" height="15" + halign="right" layout="topleft" - left="0" - name="partner_text" - text_color="0.1 0.1 0.1 1" - top="0" - width="290" - word_wrap="true"> - [FIRST] [LAST] + left="10" + name="online_me_status_text" + text_color="white" + width="100"> + Status: </text> + <combo_box + font="SansSerifBold" + height="18" + layout="topleft" + left_pad="10" + top_delta="0" + name="status_combo" + width="100"> + <combo_box.item + label="Online" + name="online" + value="online" /> + <combo_box.item + label="Away" + name="away" + value="away" /> + <combo_box.item + label="Busy" + name="busy" + value="busy" /> + </combo_box> <text type="string" - follows="top|right" - font="SansSerif" - font.style="UNDERLINE" - font_shadow="hard" - halign="right" + follows="left|top" + font="SansSerifBold" height="15" layout="topleft" - left="250" - name="partner_edit_link" - text_color="0.2 0.2 1 1" - top="0" - width="40"> - Edit + left="10" + top_pad="20" + name="status_me_message_text" + text_color="white" + width="250"> + What're you up to? </text> + <line_editor + border_style="line" + border_thickness="1" + follows="left|top|right" + font="SansSerifBold" + font.style="ITALIC" + height="20" + layout="topleft" + left="10" + top_pad="10" + name="status_me_message_edit" + select_on_focus="true" + text_color="0.5 0.5 0.5 1" + width="250"> + Type a message about what you're doing in SL! + </line_editor> </panel> - </panel> + + + + + </panel> + </scroll_container> <panel bottom="625" @@ -526,7 +517,7 @@ layout="topleft" left="8" name="profile_buttons_panel" - width="345"> + width="280"> <button follows="bottom|left" font="SansSerifSmallBold" @@ -537,14 +528,14 @@ mouse_opaque="false" name="add_friend" top="0" - width="75" /> + width="90" /> <button follows="bottom|left" font="SansSerifSmallBold" height="25" label="IM" layout="topleft" - left_pad="5" + left_pad="0" name="im" top="0" width="40" /> @@ -555,7 +546,7 @@ height="25" label="Call" layout="topleft" - left_pad="5" + left_pad="0" name="call" top="0" width="50" /> @@ -565,10 +556,10 @@ height="25" label="Teleport" layout="topleft" - left_pad="5" + left_pad="0" name="teleport" top="0" - width="65" /> + width="75" /> <button enabled="false" follows="bottom|left" @@ -576,12 +567,12 @@ height="25" label="Share" layout="topleft" - left_pad="5" + left_pad="0" name="share" top="0" - width="50" /> - </panel> - <!-- <panel + width="60" /> + </panel> + <panel bottom="625" follows="bottom|left" height="30" @@ -610,5 +601,5 @@ name="edit_appearance_btn" top="0" width="130" /> - </panel> --> + </panel> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_profile_view.xml b/indra/newview/skins/default/xui/en/panel_profile_view.xml index 9e95411929..cd46ccb0bc 100644 --- a/indra/newview/skins/default/xui/en/panel_profile_view.xml +++ b/indra/newview/skins/default/xui/en/panel_profile_view.xml @@ -1,7 +1,6 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <panel background_visible="true" - bg_alpha_color="0.3 0.3 0.3 1" follows="left|top|right|bottom" height="660" label="Me" @@ -9,7 +8,7 @@ left="0" name="panel_target_profile" top="0" - width="355"> + width="305"> <button layout="topleft" name="back" @@ -26,13 +25,13 @@ layout="topleft" top="0" left_pad="15" - width="320" + width="125" height="20" font="SansSerifHugeBold" text_color="white" follows="top|left|right" mouse_opaque="true" - name="user_name">(Loading...)</text> + name="user_name">(Loading...)</text> <tab_container follows="left|top|right|bottom" height="625" @@ -41,7 +40,7 @@ name="tabs" tab_position="top" top="35" - width="355"> + width="280"> <panel class="panel_profile" filename="panel_profile.xml" diff --git a/indra/newview/skins/default/xui/en/panel_script_ed.xml b/indra/newview/skins/default/xui/en/panel_script_ed.xml index f059f4f3c1..9fd075f79b 100644 --- a/indra/newview/skins/default/xui/en/panel_script_ed.xml +++ b/indra/newview/skins/default/xui/en/panel_script_ed.xml @@ -15,7 +15,7 @@ </panel.string> <panel.string name="can_not_view"> - You are not allowed to view this script. + You can not view or edit this script, since it has been set as "no copy". You need full permissions to view or edit a script inside an object. </panel.string> <panel.string name="public_objects_can_not_run"> diff --git a/indra/newview/skins/default/xui/en/panel_side_tray.xml b/indra/newview/skins/default/xui/en/panel_side_tray.xml index 76a92a1087..b746fcf84b 100644 --- a/indra/newview/skins/default/xui/en/panel_side_tray.xml +++ b/indra/newview/skins/default/xui/en/panel_side_tray.xml @@ -4,7 +4,7 @@ background_visible="false" bg_opaque_color="0.0 0.0 0.0 0.0" mouse_opaque="true" - width="280" + width="305" collapsed="true" > <sidetray_tab @@ -30,7 +30,7 @@ class="panel_people" name="panel_people" filename="panel_people.xml" - width="355" + width="280" height="465" label="People" border="true" @@ -80,13 +80,13 @@ title="Me" collapsable="false" min_width="200" - min_height="200" + min_height="200" header_visible="false" > <panel class="panel_me_profile" name="panel_me_profile" - filename="panel_me_profile.xml" + filename="panel_me_profile.xml" label="Me" border="true" /> diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 626c084f0c..c6ee2ce364 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -76,7 +76,7 @@ <string name="TooltipAltRight">Alt-Right arrow for next tab</string> <!-- ButtonToolTips, llfloater.cpp --> - <string name="BUTTON_CLOSE_DARWIN">Close (Cmd-W)</string> + <string name="BUTTON_CLOSE_DARWIN">Close (⌘-W)</string> <string name="BUTTON_CLOSE_WIN">Close (Ctrl-W)</string> <string name="BUTTON_RESTORE">Restore</string> <string name="BUTTON_MINIMIZE">Minimize</string> diff --git a/indra/newview/skins/default/xui/en/widgets/combo_box.xml b/indra/newview/skins/default/xui/en/widgets/combo_box.xml index 45b1e1eb9f..a042a61a26 100644 --- a/indra/newview/skins/default/xui/en/widgets/combo_box.xml +++ b/indra/newview/skins/default/xui/en/widgets/combo_box.xml @@ -22,7 +22,7 @@ image_selected="DropDown_Selected" image_disabled="DropDown_Disabled" image_disabled_selected="DropDown_Disabled_Selected" /> - <combo_box.combo_list bg_writeable_color="white" /> + <combo_box.combo_list bg_writeable_color="MenuDefaultBgColor" /> <combo_box.combo_editor name="Combo Text Entry" select_on_focus="true" font="SansSerifSmall" /> diff --git a/indra/newview/skins/default/xui/en/widgets/line_editor.xml b/indra/newview/skins/default/xui/en/widgets/line_editor.xml index 3ab9379705..168609d5d7 100644 --- a/indra/newview/skins/default/xui/en/widgets/line_editor.xml +++ b/indra/newview/skins/default/xui/en/widgets/line_editor.xml @@ -6,7 +6,7 @@ ignore_tab="true" cursor_color="TextCursorColor" text_color="TextFgColor" - text_readonly_color="TextFgReadOnlyColor" + text_readonly_color="Green" text_tentative_color="TextFgTentativeColor" bg_readonly_color="TextBgReadOnlyColor" bg_writeable_color="TextBgWriteableColor" 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 07980a9d09..efb9a89c6a 100644 --- a/indra/newview/skins/default/xui/en/widgets/location_input.xml +++ b/indra/newview/skins/default/xui/en/widgets/location_input.xml @@ -7,8 +7,9 @@ <location_input font="SansSerifSmall" - add_landmark_image_enabled="icon_event_adult.tga" - add_landmark_image_disabled="icon_event.tga" + add_landmark_image_enabled="Favorite_Star_Active" + add_landmark_image_disabled="Favorite_Star_Off" + hover_glow_amount="0.15" add_landmark_width="20" add_landmark_height="20" add_landmark_hpad="2" @@ -41,7 +42,7 @@ label="" pad_right="0" tool_tip="My Location History"/> - <combo_list bg_writeable_color="white"/> + <combo_list bg_writeable_color="MenuDefaultBgColor"/> <combo_editor name="Combo Text Entry" text_pad_left="20" select_on_focus="true" diff --git a/indra/newview/skins/default/xui/en/widgets/spinner.xml b/indra/newview/skins/default/xui/en/widgets/spinner.xml index 29bf1e8052..7d1a5118cb 100644 --- a/indra/newview/skins/default/xui/en/widgets/spinner.xml +++ b/indra/newview/skins/default/xui/en/widgets/spinner.xml @@ -1,5 +1,16 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <spinner text_enabled_color="LabelTextColor" text_disabled_color="LabelDisabledColor" - decimal_digits="3" - label_width="40"/>
\ No newline at end of file + decimal_digits="3" + label_width="40" > + <spinner.up_button name="SpinCtrl Up" + image_unselected="Stepper_Up_Off" + image_selected="Stepper_Up_Press" + tab_stop="false" + follows="left|bottom" /> + <spinner.down_button name="SpinCtrl Down" + image_unselected="Stepper_Down_Off" + image_selected="Stepper_Down_Press" + tab_stop="false" + follows="left|bottom" /> +</spinner>
\ No newline at end of file |
