livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge xui-army-8 to pick up 2+ weeks of art, colors, and dialog layout changes. 

svn merge -r128075:128364 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/xui-army-8
master
James Cook 2009-07-27 16:50:01 +00:00
parent f5ba6df4c2
commit ca51e8f33d
125 changed files with 1929 additions and 1514 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
indra/llui/lllineeditor.cpp
View File

@ -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)

18
indra/llui/llspinctrl.cpp
View File

@ -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);

4
indra/llui/llspinctrl.h
View File

@ -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:

78
indra/newview/app_settings/settings.xml
View File

@ -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>
@ -6607,6 +6640,17 @@
<string>Boolean</string>
<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>

23
indra/newview/app_settings/settings_per_account.xml
View File

@ -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>

8
indra/newview/llappviewer.cpp
View File

@ -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)

4
indra/newview/llappviewer.h
View File

@ -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.

4
indra/newview/llfirstuse.cpp
View File

@ -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()
{

2
indra/newview/llfirstuse.h
View File

@ -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();

7
indra/newview/llfloaterchat.cpp
View File

@ -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"))

8
indra/newview/llfloaterchat.h
View File

@ -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:

96
indra/newview/llfloaterpreference.cpp
View File

@ -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");

5
indra/newview/llfloaterpreference.h
View File

@ -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();

22
indra/newview/llimpanel.cpp
View File

@ -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");
}

5
indra/newview/lllocationhistory.cpp
View File

@ -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
{

1
indra/newview/lllocationhistory.h
View File

@ -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;

18
indra/newview/llnavigationbar.cpp
View File

@ -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;
}

6
indra/newview/llnavigationbar.h
View File

@ -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

7
indra/newview/llpanelgroupgeneral.cpp
View File

@ -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;
}

1
indra/newview/llpanelgroupgeneral.h
View File

@ -87,7 +87,6 @@ private:
BOOL mChanged;
BOOL mFirstUse;
std::string mIncompleteMemberDataStr;
std::string mConfirmGroupCreateStr;
LLUUID mDefaultIconID;
// Group information (include any updates in updateChanged)

84
indra/newview/llpanelpermissions.cpp
View File

@ -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;

7
indra/newview/llstartup.cpp
View File

@ -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
{

8
indra/newview/llteleporthistory.cpp
View File

@ -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()
{

3
indra/newview/llteleporthistory.h
View File

@ -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.
*

8
indra/newview/lltoolpie.cpp
View File

@ -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);
}

4
indra/newview/llviewerdisplay.cpp
View File

@ -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++;

6
indra/newview/llviewerparcelmedia.cpp
View File

@ -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

9
indra/newview/llviewerparcelmgr.cpp
View File

@ -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;

12
indra/newview/llviewertexturelist.cpp
View File

@ -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)
{

7
indra/newview/llvoavatar.cpp
View File

@ -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 )

8
indra/newview/skins/default/colors.xml
View File

@ -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" />

BIN
indra/newview/skins/default/textures/bottomtray/DownArrow.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 139 B

BIN
indra/newview/skins/default/textures/bottomtray/Unread_IM.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 297 B

BIN
indra/newview/skins/default/textures/bottomtray/VoicePTT_Lvl1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 557 B

BIN
indra/newview/skins/default/textures/bottomtray/VoicePTT_Lvl2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 663 B

BIN
indra/newview/skins/default/textures/bottomtray/VoicePTT_Lvl3.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 607 B

BIN
indra/newview/skins/default/textures/bottomtray/VoicePTT_Off.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 461 B

BIN
indra/newview/skins/default/textures/bottomtray/VoicePTT_On.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 451 B

BIN
indra/newview/skins/default/textures/containers/Accordion_ArrowOpened_Off.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 169 B

BIN
indra/newview/skins/default/textures/icons/AddItem_Off.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 184 B

BIN
indra/newview/skins/default/textures/icons/AddItem_Over.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 165 B

BIN
indra/newview/skins/default/textures/icons/AddItem_Press.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 181 B

BIN
indra/newview/skins/default/textures/icons/BackArrow_Off.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 227 B

BIN
indra/newview/skins/default/textures/icons/BackArrow_Over.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 214 B

BIN
indra/newview/skins/default/textures/icons/Info.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 351 B

BIN
indra/newview/skins/default/textures/icons/OptionsMenu_Off.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 336 B

BIN
indra/newview/skins/default/textures/icons/OptionsMenu_Over.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 277 B

BIN
indra/newview/skins/default/textures/icons/OptionsMenu_Press.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 318 B

BIN
indra/newview/skins/default/textures/icons/TrashItem_Off.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 201 B

BIN
indra/newview/skins/default/textures/icons/TrashItem_Over.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 201 B

BIN
indra/newview/skins/default/textures/icons/TrashItem_Press.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 201 B

BIN
indra/newview/skins/default/textures/icons/VoicePTT_Lvl1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 557 B

BIN
indra/newview/skins/default/textures/icons/VoicePTT_Lvl2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 663 B

BIN
indra/newview/skins/default/textures/icons/VoicePTT_Lvl3.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 607 B

BIN
indra/newview/skins/default/textures/icons/VoicePTT_Off.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 461 B

BIN
indra/newview/skins/default/textures/icons/VoicePTT_On.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 451 B

BIN
indra/newview/skins/default/textures/taskpanel/TabIcon_Close_Off.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 305 B

BIN
indra/newview/skins/default/textures/taskpanel/TabIcon_Home_Off.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 228 B

BIN
indra/newview/skins/default/textures/taskpanel/TabIcon_Home_Selected.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 291 B

BIN
indra/newview/skins/default/textures/taskpanel/TabIcon_Me_Off.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 307 B

BIN
indra/newview/skins/default/textures/taskpanel/TabIcon_Me_Selected.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 452 B

BIN
indra/newview/skins/default/textures/taskpanel/TabIcon_Open_Off.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 294 B

BIN
indra/newview/skins/default/textures/taskpanel/TabIcon_People_Off.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 361 B

BIN
indra/newview/skins/default/textures/taskpanel/TabIcon_People_Selected.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 599 B

BIN
indra/newview/skins/default/textures/taskpanel/TabIcon_Places_Off.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 350 B

BIN
indra/newview/skins/default/textures/taskpanel/TabIcon_Places_Selected.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 476 B

BIN
indra/newview/skins/default/textures/taskpanel/TabIcon_Things_Off.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 223 B

BIN
indra/newview/skins/default/textures/taskpanel/TabIcon_Things_Selected.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 297 B

108
indra/newview/skins/default/textures/textures.xml
View File

@ -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>

BIN
indra/newview/skins/default/textures/widgets/DisclosureArrow_Closed_Over.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 164 B

BIN
indra/newview/skins/default/textures/widgets/DisclosureArrow_Opened_Off.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 173 B

BIN
indra/newview/skins/default/textures/widgets/DisclosureArrow_Opened_Over.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 165 B

BIN
indra/newview/skins/default/textures/widgets/ListItem_Over.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 244 B

BIN
indra/newview/skins/default/textures/widgets/ListItem_Select.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 251 B

BIN
indra/newview/skins/default/textures/widgets/Stepper_Down_Off.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 300 B

BIN
indra/newview/skins/default/textures/widgets/Stepper_Down_Over.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 310 B

BIN
indra/newview/skins/default/textures/widgets/Stepper_Down_Press.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 343 B

BIN
indra/newview/skins/default/textures/widgets/Stepper_Up_Off.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 315 B

BIN
indra/newview/skins/default/textures/widgets/Stepper_Up_Over.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 314 B

BIN
indra/newview/skins/default/textures/widgets/Stepper_Up_Press.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 384 B

BIN
indra/newview/skins/default/textures/world/NoEntryLines.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 832 B

BIN
indra/newview/skins/default/textures/world/NoEntryPassLines.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

2
indra/newview/skins/default/xui/en/floater_about.xml
View File

@ -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"

10
indra/newview/skins/default/xui/en/floater_about_land.xml
View File

@ -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 &gt; 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&amp;apos;s land allocation."
tool_tip="A group officer can deed this land to the group, so it will be supported by the group&apos;s land allocation."
top="164"
width="116" />
<button
@ -324,7 +324,7 @@ Go to World menu &gt; 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 &gt; 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 &gt; 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&apos;s area is 128 sq.m. or smaller.
This option is disabled because this parcel&apos;s area is 128 m² or smaller.
Only large parcels can be listed in search.
</panel.string>
<panel.string

34
indra/newview/skins/default/xui/en/floater_buy_contents.xml
View File

@ -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>

22
indra/newview/skins/default/xui/en/floater_buy_land.xml
View File

@ -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"

24
indra/newview/skins/default/xui/en/floater_buy_object.xml
View File

@ -85,24 +85,24 @@
width="281">
Buy for L$[AMOUNT] from [NAME]?
</text>
<button
follows="right|bottom"
height="20"
label="Cancel"
label_selected="Cancel"
layout="topleft"
left="211"
name="cancel_btn"
top="224"
width="60" />
<button
follows="right|bottom"
height="20"
label="Buy"
label_selected="Buy"
layout="topleft"
left_delta="-64"
left="10"
name="buy_btn"
top_pad="5"
width="125" />
<button
follows="right|bottom"
height="20"
label="Cancel"
label_selected="Cancel"
layout="topleft"
left_pad="5"
name="cancel_btn"
top_delta="0"
width="60" />
width="125" />
</floater>

4
indra/newview/skins/default/xui/en/floater_gesture.xml
View File

@ -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"

2
indra/newview/skins/default/xui/en/floater_god_tools.xml
View File

@ -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"

8
indra/newview/skins/default/xui/en/floater_land_holdings.xml
View File

@ -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>

2
indra/newview/skins/default/xui/en/floater_live_lsleditor.xml
View File

@ -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 &quot;no copy&quot;. You need full permissions to view or edit a script inside an object.
</floater.string>
<floater.string
name="script_running">

211
indra/newview/skins/default/xui/en/floater_media_browser.xml
View File

@ -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>

17
indra/newview/skins/default/xui/en/floater_preferences.xml
View File

@ -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"

40
indra/newview/skins/default/xui/en/floater_preview_animation.xml
View File

@ -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>

4
indra/newview/skins/default/xui/en/floater_sell_land.xml
View File

@ -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"

64
indra/newview/skins/default/xui/en/floater_test_line_editor.xml Normal file
View File

@ -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>

31
indra/newview/skins/default/xui/en/floater_tools.xml
View File

@ -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"

4
indra/newview/skins/default/xui/en/floater_world_map.xml
View File

@ -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

2
indra/newview/skins/default/xui/en/menu_navbar.xml
View File

@ -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

44
indra/newview/skins/default/xui/en/menu_viewer.xml
View File

@ -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 &amp; Hits."
layout="topleft"
name="Bumps, Pushes &amp;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 &amp; Hits..."
layout="topleft"
name="Bumps, Pushes &amp;amp; Hits">
<menu_item_call.on_click
function="Floater.Show"
parameter="bumps" />
</menu_item_call>
<menu_item_separator
layout="topleft" />
<menu

Some files were not shown because too many files have changed in this diff Show More