Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer

Browse Source
This commit is contained in:
Siana Gearz
2012-08-12 14:52:47 +02:00
parent 73785af730 92c9311a4c
commit 89ad14b82f
209 changed files with 11669 additions and 17831 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/llmath/lloctree.h
View File

@@ -457,7 +457,7 @@ public:
mDataEnd = NULL;
}
notifyRemoval(data);
this->notifyRemoval(data);
checkAlive();
}

7
indra/llmessage/llcurl.cpp
View File

@@ -199,8 +199,9 @@ void LLCurl::Responder::completedHeader(U32 status, const std::string& reason, c
}
namespace boost
{
// DONT UNCOMMENT THIS IT BREAKS GCC47
//namespace boost
//{
void intrusive_ptr_add_ref(LLCurl::Responder* p)
{
++p->mReferenceCount;
@@ -213,7 +214,7 @@ namespace boost
delete p;
}
}
};
//};
//////////////////////////////////////////////////////////////////////////////

7
indra/llmessage/llcurl.h
View File

@@ -304,11 +304,12 @@ private:
easy_free_list_t mEasyFreeList;
};
namespace boost
{
// DONT UNCOMMENT BREAKS GCC47
//namespace boost
//{
void intrusive_ptr_add_ref(LLCurl::Responder* p);
void intrusive_ptr_release(LLCurl::Responder* p);
};
//};
class LLCurlRequest

4
indra/llrender/llpostprocess.cpp
View File

@@ -565,13 +565,13 @@ void LLPostProcess::setSelectedEffect(std::string const & effectName)
}
}
void LLPostProcess::setSelectedEffectValue(std::string const & setting, LLSD& value)
void LLPostProcess::setSelectedEffectValue(std::string const & setting, LLSD value)
{
char buf[256];
S32 elem=0;
if(sscanf(setting.c_str(),"%255[^[][%d]", buf, &elem) == 2)
{
mSelectedEffectInfo[std::string(buf)][elem] = value;
mSelectedEffectInfo[static_cast<const char*>(buf)][elem] = value;
}
else
{

2
indra/llrender/llpostprocess.h
View File

@@ -149,7 +149,7 @@ public:
inline LLSD const & getSelectedEffectInfo(void) const { return mSelectedEffectInfo; }
// Setters
void setSelectedEffect(std::string const & effectName);
void setSelectedEffectValue(std::string const & setting, LLSD& value);
void setSelectedEffectValue(std::string const & setting, LLSD value);
void resetSelectedEffect();
void saveEffectAs(std::string const & effectName);
};

1
indra/llui/llfloater.h
View File

@@ -217,6 +217,7 @@ public:
virtual BOOL canSaveAs() const { return FALSE; }
virtual void saveAs() {}
virtual void saveAsType(BOOL type=false) {}
// <edit>
virtual LLUUID getItemID() { return LLUUID::null; }

5
indra/llui/llscrolllistctrl.cpp
View File

@@ -666,6 +666,7 @@ LLScrollListCtrl::LLScrollListCtrl(const std::string& name, const LLRect& rect,
mFgUnselectedColor( LLUI::sColorsGroup->getColor("ScrollUnselectedColor") ),
mFgDisabledColor( LLUI::sColorsGroup->getColor("ScrollDisabledColor") ),
mHighlightedColor( LLUI::sColorsGroup->getColor("ScrollHighlightedColor") ),
mDefaultListTextColor( LLUI::sColorsGroup->getColor("DefaultListText") ),
mBorderThickness( 2 ),
mOnDoubleClickCallback( NULL ),
mOnMaximumSelectCallback( NULL ),
@@ -3543,6 +3544,10 @@ LLScrollListItem* LLScrollListCtrl::addElement(const LLSD& value, EAddPosition p
{
cell->setColor(color);
}
else
{
cell->setColor(mDefaultListTextColor);
}
new_item->setColumn(index, cell);
if (columnp->mHeader && !value.asString().empty())
{

1
indra/llui/llscrolllistctrl.h
View File

@@ -697,6 +697,7 @@ private:
LLColor4 mFgUnselectedColor;
LLColor4 mFgDisabledColor;
LLColor4 mHighlightedColor;
LLColor4 mDefaultListTextColor;
S32 mBorderThickness;
void (*mOnDoubleClickCallback)(void* userdata);

2
indra/newview/CMakeLists.txt
View File

@@ -217,7 +217,6 @@ set(viewer_SOURCE_FILES
llfloatergroupinvite.cpp
llfloatergroups.cpp
llfloaterhandler.cpp
llfloaterhardwaresettings.cpp
llfloaterhtmlcurrency.cpp
llfloatermediabrowser.cpp
llfloaterhtmlsimple.cpp
@@ -721,7 +720,6 @@ set(viewer_HEADER_FILES
llfloatergroupinvite.h
llfloatergroups.h
llfloaterhandler.h
llfloaterhardwaresettings.h
llfloaterhtmlcurrency.h
llfloatermediabrowser.h
llfloaterhtmlsimple.h

19
indra/newview/NACLantispam.cpp
View File

@@ -1,3 +1,18 @@
/* DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
* Version 2, December 2004
*
* Copyright (C) 2004 Sam Hocevar <sam@hocevar.net>
*
* Everyone is permitted to copy and distribute verbatim or modified
* copies of this license document, and changing it is allowed as long
* as the name is changed.
*
* DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
* TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
*
* 0. You just DO WHAT THE FUCK YOU WANT TO.
*/
#include "llviewerprecompiledheaders.h"
#include "NACLantispam.h"
#include "llviewercontrol.h"
@@ -263,7 +278,7 @@ void NACLAntiSpamRegistry::blockGlobalEntry(LLUUID& source)
}
globalEntries[source.asString()]->setBlocked();
}
bool NACLAntiSpamRegistry::checkQueue(U32 name, LLUUID& source, U32 multiplier, bool silent)
bool NACLAntiSpamRegistry::checkQueue(U32 name, LLUUID& source, U32 multiplier)
{
if(source.isNull()) return false;
if(gAgent.getID() == source) return false;
@@ -295,7 +310,7 @@ bool NACLAntiSpamRegistry::checkQueue(U32 name, LLUUID& source, U32 multiplier,
}
else
{
if(!silent)
if(gSavedSettings.getBOOL("AntiSpamNotify"))
{
LLSD args;
args["MESSAGE"] = std::string(getQueueName(name))+": Blocked object "+source.asString();

18
indra/newview/NACLantispam.h
View File

@@ -1,3 +1,18 @@
/* DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
* Version 2, December 2004
*
* Copyright (C) 2004 Sam Hocevar <sam@hocevar.net>
*
* Everyone is permitted to copy and distribute verbatim or modified
* copies of this license document, and changing it is allowed as long
* as the name is changed.
*
* DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
* TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
*
* 0. You just DO WHAT THE FUCK YOU WANT TO.
*/
#ifndef NACLANTISPAM_H
#define NACLANTISPAM_H
#include <boost/tr1/unordered_map.hpp>
@@ -48,7 +63,7 @@ public:
static void setRegisteredQueueAmount(U32 name,U32 amount);
static void setAllQueueTimes(U32 amount);
static void setAllQueueAmounts(U32 time);
static bool checkQueue(U32 name, LLUUID& source, U32 multiplier=1, bool silent=false);
static bool checkQueue(U32 name, LLUUID& source, U32 multiplier=1);
static bool handleNaclAntiSpamGlobalQueueChanged(const LLSD& newvalue);
static bool handleNaclAntiSpamTimeChanged(const LLSD& newvalue);
static bool handleNaclAntiSpamAmountChanged(const LLSD& newvalue);
@@ -86,7 +101,6 @@ private:
static void blockGlobalEntry(LLUUID& source);
};
extern const std::string COLLISION_SOUNDS[];
extern const int COLLISION_SOUNDS_SIZE;

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

@@ -894,7 +894,95 @@
<key>Value</key>
<integer>1</integer>
</map>
<key>_NACL_Antispam</key>
<key>AntiSpamAlerts</key>
<map>
<key>Comment</key>
<string>When true, dialogs from alerts will be blocked.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>AntiSpamFriendshipOffers</key>
<map>
<key>Comment</key>
<string>When true, dialogs from friendship requests will be blocked.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>AntiSpamGroupInvites</key>
<map>
<key>Comment</key>
<string>When true, dialogs from group invites will be blocked.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>AntiSpamGroupNotices</key>
<map>
<key>Comment</key>
<string>When true, dialogs from group notices will be blocked.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>AntiSpamItemOffers</key>
<map>
<key>Comment</key>
<string>When true, dialogs from inventory item offers will be blocked.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>AntiSpamNotify</key>
<map>
<key>Comment</key>
<string>When true, notifications will appear any time a spamtype is blocked.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>1</integer>
</map>
<key>AntiSpamScripts</key>
<map>
<key>Comment</key>
<string>When true, dialogs from scripts, including script-driven teleports and questions, and other interactive script stuff, will be blocked.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>AntiSpamTeleports</key>
<map>
<key>Comment</key>
<string>When true, dialogs from teleport requests from other residents will be blocked.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>_NACL_Antispam</key>
<map>
<key>Comment</key>
<string>When true, all dialogs will be blocked, resets on restart.</string>
@@ -908,7 +996,7 @@
<key>_NACL_AntiSpamGlobalQueue</key>
<map>
<key>Comment</key>
<string> </string>
<string>Collect spamtypes together, instead of individually counting them</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
@@ -919,24 +1007,24 @@
<key>_NACL_AntiSpamTime</key>
<map>
<key>Comment</key>
<string> </string>
<string>Time in seconds for spamtype to accumulate the _NACL_AntiSpamAmount and be blocked</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>U32</string>
<key>Value</key>
<integer>2</integer>
<integer>1</integer>
</map>
<key>_NACL_AntiSpamAmount</key>
<map>
<key>Comment</key>
<string> </string>
<string>Amount of spamtype to be reached before the blocking will occur.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>U32</string>
<key>Value</key>
<integer>10</integer>
<integer>30</integer>
</map>
<key>_NACL_AntiSpamSoundMulti</key>
<map>
@@ -947,7 +1035,7 @@
<key>Type</key>
<string>U32</string>
<key>Value</key>
<integer>4</integer>
<integer>20</integer>
</map>
<key>_NACL_AntiSpamNewlines</key>
<map>
@@ -958,7 +1046,7 @@
<key>Type</key>
<string>U32</string>
<key>Value</key>
<integer>30</integer>
<integer>20</integer>
</map>
<key>_NACL_AntiSpamSoundPreloadMulti</key>
<map>
@@ -969,7 +1057,7 @@
<key>Type</key>
<string>U32</string>
<key>Value</key>
<integer>4</integer>
<integer>20</integer>
</map>
<!-- Vanilla SL settings that are now optionally Account-Specific -->
<key>AgentChatColor</key>

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

@@ -461,7 +461,7 @@
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
<integer>1</integer>
</map>
<key>LogChatIM</key>
<map>
@@ -472,7 +472,7 @@
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
<integer>1</integer>
</map>
<key>LogChatTimestamp</key>
<map>
@@ -483,7 +483,7 @@
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
<integer>1</integer>
</map>
<key>LogInstantMessages</key>
<map>

53
indra/newview/ascentprefschat.cpp
View File

@@ -42,6 +42,7 @@
#include "llviewercontrol.h"
#include "NACLantispam.h"
#include "lgghunspell_wrapper.h"
#include "lltrans.h"
#include "llstartup.h"
@@ -85,16 +86,17 @@ LLPrefsAscentChat::LLPrefsAscentChat()
LLUUID itemid = (LLUUID)gSavedPerAccountSettings.getString("AscentInstantMessageResponseItemData");
LLViewerInventoryItem* item = gInventory.getItem(itemid);
if (item) childSetValue("im_give_disp_rect_txt","Currently set to: "+item->getName());
else if (itemid.isNull()) childSetValue("im_give_disp_rect_txt","Currently not set");
else childSetValue("im_give_disp_rect_txt","Currently set to an item not on this account");
if (item) childSetValue("im_give_disp_rect_txt", LLTrans::getString("CurrentlySetTo") + LLTrans::getString(":") + " " +item->getName());
else if (itemid.isNull()) childSetValue("im_give_disp_rect_txt", LLTrans::getString("CurrentlyNotSet"));
else childSetValue("im_give_disp_rect_txt", LLTrans::getString("CurrentlySetTo") + " " + LLTrans::getString("AnItemNotOnThisAccount"));
}
else childSetValue("im_give_disp_rect_txt","Not logged in");
else childSetValue("im_give_disp_rect_txt", LLTrans::getString("NotLoggedIn"));
childSetCommitCallback("im_response", onCommitAutoResponse, this);
childSetEnabled("reset_antispam", started);
childSetCommitCallback("reset_antispam", onCommitResetAS, this);
childSetCommitCallback("antispam_checkbox", onCommitDialogBlock, this);
childSetCommitCallback("KeywordsOn", onCommitKeywords, this);
childSetCommitCallback("KeywordsList", onCommitKeywords, this);
@@ -239,7 +241,7 @@ void LLPrefsAscentChat::onCommitAutoResponse(LLUICtrl* ctrl, void* user_data)
void LLPrefsAscentChat::SinguIMResponseItemDrop(LLViewerInventoryItem* item)
{
gSavedPerAccountSettings.setString("AscentInstantMessageResponseItemData", item->getUUID().asString());
sInst->childSetValue("im_give_disp_rect_txt","Currently set to: "+item->getName());
sInst->childSetValue("im_give_disp_rect_txt", LLTrans::getString("CurrentlySetTo") + LLTrans::getString(":") + " " +item->getName());
}
//static
@@ -248,6 +250,21 @@ void LLPrefsAscentChat::onCommitResetAS(LLUICtrl*, void*)
NACLAntiSpamRegistry::purgeAllQueues();
}
//static
void LLPrefsAscentChat::onCommitDialogBlock(LLUICtrl* ctrl, void* user_data)
{
LLPrefsAscentChat* self = (LLPrefsAscentChat*)user_data;
bool enabled = ctrl->getValue().asBoolean();
self->childSetEnabled("Block All Dialogs From", !enabled);
self->childSetEnabled("Alerts", !enabled);
self->childSetEnabled("Friendship Offers", !enabled);
self->childSetEnabled("Group Invites", !enabled);
self->childSetEnabled("Group Notices", !enabled);
self->childSetEnabled("Item Offers", !enabled);
self->childSetEnabled("Scripts", !enabled);
self->childSetEnabled("Teleport Offers", !enabled);
}
//static
void LLPrefsAscentChat::onCommitKeywords(LLUICtrl* ctrl, void* user_data)
{
@@ -331,6 +348,14 @@ void LLPrefsAscentChat::refreshValues()
mChatSpamCount = gSavedSettings.getU32("_NACL_AntiSpamAmount");
mChatSpamTime = gSavedSettings.getU32("_NACL_AntiSpamTime");
mBlockDialogSpam = gSavedSettings.getBOOL("_NACL_Antispam");
mBlockAlertSpam = gSavedSettings.getBOOL("AntiSpamAlerts");
mBlockFriendSpam = gSavedSettings.getBOOL("AntiSpamFriendshipOffers");
mBlockGroupInviteSpam = gSavedSettings.getBOOL("AntiSpamGroupInvites");
mBlockGroupNoticeSpam = gSavedSettings.getBOOL("AntiSpamGroupNotices");
mBlockItemOfferSpam = gSavedSettings.getBOOL("AntiSpamItemOffers");
mBlockScriptSpam = gSavedSettings.getBOOL("AntiSpamScripts");
mBlockTeleportSpam = gSavedSettings.getBOOL("AntiSpamTeleports");
mNotifyOnSpam = gSavedSettings.getBOOL("AntiSpamNotify");
mSoundMulti = gSavedSettings.getU32("_NACL_AntiSpamSoundMulti");
mNewLines = gSavedSettings.getU32("_NACL_AntiSpamNewlines");
mPreloadMulti = gSavedSettings.getU32("_NACL_AntiSpamSoundPreloadMulti");
@@ -378,6 +403,16 @@ void LLPrefsAscentChat::refresh()
LLWStringUtil::replaceChar(auto_response, '%', ' ');
childSetText("im_response", wstring_to_utf8str(auto_response));
//Antispam ------------------------------------------------------------------------
childSetEnabled("Block All Dialogs From", !mBlockDialogSpam);
childSetEnabled("Alerts", !mBlockDialogSpam);
childSetEnabled("Friendship Offers", !mBlockDialogSpam);
childSetEnabled("Group Invites", !mBlockDialogSpam);
childSetEnabled("Group Notices", !mBlockDialogSpam);
childSetEnabled("Item Offers", !mBlockDialogSpam);
childSetEnabled("Scripts", !mBlockDialogSpam);
childSetEnabled("Teleport Offers", !mBlockDialogSpam);
//Text Options ------------------------------------------------------------------------
combo = getChild<LLComboBox>("SpellBase");
@@ -518,6 +553,14 @@ void LLPrefsAscentChat::cancel()
gSavedSettings.setU32("_NACL_AntiSpamAmount", mChatSpamCount);
gSavedSettings.setU32("_NACL_AntiSpamTime", mChatSpamTime);
gSavedSettings.setBOOL("_NACL_Antispam", mBlockDialogSpam);
gSavedSettings.setBOOL("AntiSpamAlerts", mBlockAlertSpam);
gSavedSettings.setBOOL("AntiSpamFriendshipOffers", mBlockFriendSpam);
gSavedSettings.setBOOL("AntiSpamGroupNotices", mBlockGroupNoticeSpam);
gSavedSettings.setBOOL("AntiSpamGroupInvites", mBlockGroupInviteSpam);
gSavedSettings.setBOOL("AntiSpamItemOffers", mBlockItemOfferSpam);
gSavedSettings.setBOOL("AntiSpamScripts", mBlockScriptSpam);
gSavedSettings.setBOOL("AntiSpamTeleports", mBlockTeleportSpam);
gSavedSettings.setBOOL("AntiSpamNotify", mNotifyOnSpam);
gSavedSettings.setU32("_NACL_AntiSpamSoundMulti", mSoundMulti);
gSavedSettings.setU32("_NACL_AntiSpamNewlines", mNewLines);
gSavedSettings.setU32("_NACL_AntiSpamSoundPreloadMulti", mPreloadMulti);

9
indra/newview/ascentprefschat.h
View File

@@ -57,6 +57,7 @@ protected:
static void onCommitTimeDate(LLUICtrl* ctrl, void *userdata);
static void onCommitAutoResponse(LLUICtrl* ctrl, void* user_data);
static void onCommitResetAS(LLUICtrl*,void*);
static void onCommitDialogBlock(LLUICtrl*, void*);
static void onCommitKeywords(LLUICtrl* ctrl, void* user_data);
//Chat/IM -----------------------------------------------------------------------------
@@ -89,6 +90,14 @@ protected:
U32 mChatSpamCount;
U32 mChatSpamTime;
BOOL mBlockDialogSpam;
BOOL mBlockAlertSpam;
BOOL mBlockFriendSpam;
BOOL mBlockGroupNoticeSpam;
BOOL mBlockGroupInviteSpam;
BOOL mBlockItemOfferSpam;
BOOL mBlockScriptSpam;
BOOL mBlockTeleportSpam;
BOOL mNotifyOnSpam;
BOOL mSoundMulti;
U32 mNewLines;
U32 mPreloadMulti;

13
indra/newview/ascentprefssys.cpp
View File

@@ -45,6 +45,7 @@
#include "lluictrlfactory.h"
#include "llviewercontrol.h"
#include "llstartup.h"
#include "lltrans.h"
LLDropTarget* mBuildDropTarget;
LLPrefsAscentSys* LLPrefsAscentSys::sInst;
@@ -102,11 +103,11 @@ LLPrefsAscentSys::LLPrefsAscentSys()
LLUUID itemid = (LLUUID)gSavedPerAccountSettings.getString("EmeraldBuildPrefs_Item");
LLViewerInventoryItem* item = gInventory.getItem(itemid);
if (item) childSetValue("build_item_add_disp_rect_txt", "Currently set to:\n"+item->getName());
else if (itemid.isNull()) childSetValue("build_item_add_disp_rect_txt", "Currently\nnot set");
else childSetValue("build_item_add_disp_rect_txt", "Currently set to\nan item not on this account");
if (item) childSetValue("build_item_add_disp_rect_txt", LLTrans::getString("CurrentlySetTo") + LLTrans::getString(":") + "\n" +item->getName());
else if (itemid.isNull()) childSetValue("build_item_add_disp_rect_txt", LLTrans::getString("CurrentlyNotSet"));
else childSetValue("build_item_add_disp_rect_txt", LLTrans::getString("CurrentlySetTo") + "\n" + LLTrans::getString("AnItemNotOnThisAccount"));
}
else childSetValue("build_item_add_disp_rect_txt", "You are\nnot logged in");
else childSetValue("build_item_add_disp_rect_txt", LLTrans::getString("NotLoggedIn"));
refreshValues();
refresh();
@@ -165,7 +166,7 @@ void LLPrefsAscentSys::onCommitCheckBox(LLUICtrl* ctrl, void* user_data)
gAudiop->triggerSound(LLUUID("58a38e89-44c6-c52b-deb8-9f1ddc527319"), gAgent.getID(), 1.0f, LLAudioEngine::AUDIO_TYPE_UI, lpos_global);
LLChat chat;
chat.mSourceType = CHAT_SOURCE_SYSTEM;
chat.mText = llformat("You are bestowed with powers beyond mortal comprehension.\nUse your newfound abilities wisely.\nUnlocked:\n- Animation Priority up to 7 - Meant for animations that should override anything and everything at all times. DO NOT USE THIS FOR GENERAL ANIMATIONS.\n- Right click > Destroy objects - Permanently deletes an object immediately, when you don't feel like waiting for the server to respond.\n- Right Click > Explode objects - Turns an object physical, temporary, and delinks it.");
chat.mText = LLTrans::getString("PowerUser1") + "\n" + LLTrans::getString("PowerUser2") + "\n" + LLTrans::getString("Unlocked:") + "\n" + LLTrans::getString("PowerUser3") + "\n- " + LLTrans::getString("RightClick") + " > " + LLTrans::getString("PowerUser4") + "\n- " + LLTrans::getString("RightClick") + " > " + LLTrans::getString("PowerUser5");
LLFloaterChat::addChat(chat);
}
}
@@ -247,7 +248,7 @@ void LLPrefsAscentSys::onCommitTexturePicker(LLUICtrl* ctrl, void* userdata)
void LLPrefsAscentSys::SinguBuildItemDrop(LLViewerInventoryItem* item)
{
gSavedPerAccountSettings.setString("EmeraldBuildPrefs_Item", item->getUUID().asString());
sInst->childSetValue("build_item_add_disp_rect_txt","Currently set to:\n"+item->getName());
sInst->childSetValue("build_item_add_disp_rect_txt", LLTrans::getString("CurrentlySetTo") + LLTrans::getString(":") + "\n" + item->getName());
}
void LLPrefsAscentSys::refreshValues()

11
indra/newview/floaterao.cpp
View File

@@ -22,6 +22,7 @@
#include "chatbar_as_cmdline.h"
//#include "llfloaterchat.h"
#include "llfirstuse.h"
#include "lltrans.h"
#include "llinventory.h"
#include "llinventoryfunctions.h"
@@ -330,20 +331,20 @@ BOOL LLFloaterAO::postBuild()
LLViewerInventoryItem* itemimport = gInventory.getItem(itemidimport);
if(itemimport)
{
childSetValue("ao_nc_text","Currently set to: "+itemimport->getName());
childSetValue("ao_nc_text", LLTrans::getString("CurrentlySetTo") + LLTrans::getString(":") + " " +itemimport->getName());
}
else if(itemidimport.isNull())
{
childSetValue("ao_nc_text","Currently not set");
childSetValue("ao_nc_text", LLTrans::getString("CurrentlyNotSet"));
}
else
{
childSetValue("ao_nc_text","Currently set to a item not on this account");
childSetValue("ao_nc_text", LLTrans::getString("CurrentlySetTo") + " " + LLTrans::getString("AnItemNotOnThisAccount"));
}
}
else
{
childSetValue("ao_nc_text","Not logged in");
childSetValue("ao_nc_text", LLTrans::getString("NotLoggedIn"));
}
childSetAction("more_btn", onClickMore, this);
childSetAction("less_btn", onClickLess, this);
@@ -794,7 +795,7 @@ void LLFloaterAO::setCurrentStandId(const LLUUID& id)
void LLFloaterAO::AOItemDrop(LLViewerInventoryItem* item)
{
gSavedPerAccountSettings.setString("AOConfigNotecardID", item->getUUID().asString());
sInstance->childSetValue("ao_nc_text","Currently set to: "+item->getName());
sInstance->childSetValue("ao_nc_text", LLTrans::getString("CurrentlySetTo") + LLTrans::getString(":") + " " +item->getName());
}
LLUUID LLFloaterAO::GetAnimID(const LLUUID& id)

458
indra/newview/gpu_table.txt
View File

@@ -1,96 +1,100 @@
//
//
// Categorizes graphics chips into various classes by name
//
// The table contains chip names regular expressions to match
// against driver strings, a class number, and whether we claim
// to support them or not.
//
// Format:
// Fields are separated by one or more tab (not space) characters
// <chip name> <regular expression> <class> <supported>
//
// Class Numbers:
// 0 - Defaults to low graphics settings. No shaders on by default
// 1 - Defaults to mid graphics settings. Basic shaders on by default
// 2 - Defaults to high graphics settings. Atmospherics on by default.
// 0 - Defaults to low graphics settings. No shaders on by default
// 1 - Defaults to mid graphics settings. Basic shaders on by default
// 2 - Defaults to high graphics settings. Atmospherics on by default.
// 3 - Same as class 2 for now.
//
// Supported Number:
// 0 - We claim to not support this card.
// 1 - We claim to support this card.
//
// Format:
// <chip name> <regexp> <class> <supported>
//
3Dfx .*3Dfx.* 0 0
3Dlabs .*3Dlabs.* 0 0
ATI 3D-Analyze .*ATI.*3D-Analyze.* 0 0
ATI All-in-Wonder 7500 .*ATI.*All-in-Wonder 75.* 0 1
ATI All-in-Wonder 8500 .*ATI.*All-in-Wonder 85.* 0 1
ATI All-in-Wonder 9200 .*ATI.*All-in-Wonder 92.* 0 1
ATI All-in-Wonder 9xxx .*ATI.*All-in-Wonder 9.* 1 1
ATI All-in-Wonder HD .*ATI.*All-in-Wonder HD.* 1 1
ATI All-in-Wonder X600 .*ATI.*All-in-Wonder X6.* 1 1
ATI All-in-Wonder X800 .*ATI.*All-in-Wonder X8.* 2 1
ATI All-in-Wonder X1800 .*ATI.*All-in-Wonder X18.* 3 1
ATI All-in-Wonder X1900 .*ATI.*All-in-Wonder X19.* 3 1
ATI All-in-Wonder PCI-E .*ATI.*All-in-Wonder.*PCI-E.* 1 1
ATI All-in-Wonder Radeon .*ATI.*All-in-Wonder Radeon.* 0 1
3Dfx .*3Dfx.* 0 0
3Dlabs .*3Dlabs.* 0 0
ATI 3D-Analyze .*ATI.*3D-Analyze.* 0 0
ATI All-in-Wonder 7500 .*ATI.*All-in-Wonder 75.* 0 1
ATI All-in-Wonder 8500 .*ATI.*All-in-Wonder 85.* 0 1
ATI All-in-Wonder 9200 .*ATI.*All-in-Wonder 92.* 0 1
ATI All-in-Wonder 9xxx .*ATI.*All-in-Wonder 9.* 1 1
ATI All-in-Wonder HD .*ATI.*All-in-Wonder HD.* 1 1
ATI All-in-Wonder X600 .*ATI.*All-in-Wonder X6.* 1 1
ATI All-in-Wonder X800 .*ATI.*All-in-Wonder X8.* 2 1
ATI All-in-Wonder X1800 .*ATI.*All-in-Wonder X18.* 3 1
ATI All-in-Wonder X1900 .*ATI.*All-in-Wonder X19.* 3 1
ATI All-in-Wonder PCI-E .*ATI.*All-in-Wonder.*PCI-E.* 1 1
ATI All-in-Wonder Radeon .*ATI.*All-in-Wonder Radeon.* 0 1
ATI ASUS ARES .*ATI.*ASUS.*ARES.* 3 1
ATI ASUS A9xxx .*ATI.*ASUS.*A9.* 1 1
ATI ASUS AH24xx .*ATI.*ASUS.*AH24.* 1 1
ATI ASUS AH26xx .*ATI.*ASUS.*AH26.* 3 1
ATI ASUS AH34xx .*ATI.*ASUS.*AH34.* 1 1
ATI ASUS AH36xx .*ATI.*ASUS.*AH36.* 3 1
ATI ASUS AH46xx .*ATI.*ASUS.*AH46.* 3 1
ATI ASUS AX3xx .*ATI.*ASUS.*AX3.* 1 1
ATI ASUS AX5xx .*ATI.*ASUS.*AX5.* 1 1
ATI ASUS AX8xx .*ATI.*ASUS.*AX8.* 2 1
ATI ASUS EAH24xx .*ATI.*ASUS.*EAH24.* 2 1
ATI ASUS EAH26xx .*ATI.*ASUS.*EAH26.* 3 1
ATI ASUS A9xxx .*ATI.*ASUS.*A9.* 1 1
ATI ASUS AH24xx .*ATI.*ASUS.*AH24.* 1 1
ATI ASUS AH26xx .*ATI.*ASUS.*AH26.* 3 1
ATI ASUS AH34xx .*ATI.*ASUS.*AH34.* 1 1
ATI ASUS AH36xx .*ATI.*ASUS.*AH36.* 3 1
ATI ASUS AH46xx .*ATI.*ASUS.*AH46.* 3 1
ATI ASUS AX3xx .*ATI.*ASUS.*AX3.* 1 1
ATI ASUS AX5xx .*ATI.*ASUS.*AX5.* 1 1
ATI ASUS AX8xx .*ATI.*ASUS.*AX8.* 2 1
ATI ASUS EAH24xx .*ATI.*ASUS.*EAH24.* 2 1
ATI ASUS EAH26xx .*ATI.*ASUS.*EAH26.* 3 1
ATI ASUS EAH29xx .*ATI.*ASUS.*EAH29.* 3 1
ATI ASUS EAH34xx .*ATI.*ASUS.*EAH34.* 1 1
ATI ASUS EAH36xx .*ATI.*ASUS.*EAH36.* 3 1
ATI ASUS EAH38xx .*ATI.*ASUS.*EAH38.* 3 1
ATI ASUS EAH43xx .*ATI.*ASUS.*EAH43.* 1 1
ATI ASUS EAH45xx .*ATI.*ASUS.*EAH45.* 1 1
ATI ASUS EAH48xx .*ATI.*ASUS.*EAH48.* 3 1
ATI ASUS EAH34xx .*ATI.*ASUS.*EAH34.* 1 1
ATI ASUS EAH36xx .*ATI.*ASUS.*EAH36.* 3 1
ATI ASUS EAH38xx .*ATI.*ASUS.*EAH38.* 3 1
ATI ASUS EAH43xx .*ATI.*ASUS.*EAH43.* 1 1
ATI ASUS EAH45xx .*ATI.*ASUS.*EAH45.* 1 1
ATI ASUS EAH48xx .*ATI.*ASUS.*EAH48.* 3 1
ATI ASUS EAH57xx .*ATI.*ASUS.*EAH57.* 3 1
ATI ASUS EAH58xx .*ATI.*ASUS.*EAH58.* 3 1
ATI ASUS EAH6xxx .*ATI.*ASUS.*EAH6.* 3 1
ATI ASUS Radeon X1xxx .*ATI.*ASUS.*X1.* 3 1
ATI ASUS Radeon X1xxx .*ATI.*ASUS.*X1.* 3 1
ATI Radeon X7xx .*ATI.*ASUS.*X7.* 1 1
ATI Radeon X19xx .*ATI.*X19.* 3 1
ATI Radeon X18xx .*ATI.*X18.* 3 1
ATI Radeon X17xx .*ATI.*X17.* 2 1
ATI Radeon X16xx .*ATI.*X16.* 2 1
ATI Radeon X15xx .*ATI.*X15.* 2 1
ATI Radeon X13xx .*ATI.*X13.* 1 1
ATI Radeon X1xxx .*ATI.*X1.* 1 1
ATI Radeon X2xxx .*ATI.*X2.* 1 1
ATI Radeon X500 .*ATI.*X5.* 1 1
ATI Display Adapter .*ATI.*display adapter.* 0 1
ATI FireGL 5200 .*ATI.*FireGL V52.* 0 1
ATI FireGL 5xxx .*ATI.*FireGL V5.* 1 1
ATI Radeon X19xx .*ATI.*X19.* 3 1
ATI Radeon X18xx .*ATI.*X18.* 3 1
ATI Radeon X17xx .*ATI.*X17.* 2 1
ATI Radeon X16xx .*ATI.*X16.* 2 1
ATI Radeon X15xx .*ATI.*X15.* 2 1
ATI Radeon X13xx .*ATI.*X13.* 1 1
ATI Radeon X1xxx .*ATI.*X1.* 1 1
ATI Radeon X2xxx .*ATI.*X2.* 1 1
ATI Radeon X500 .*ATI.*X5.* 1 1
ATI Display Adapter .*ATI.*display adapter.* 0 1
ATI FireGL 5200 .*ATI.*FireGL V52.* 0 1
ATI FireGL 5xxx .*ATI.*FireGL V5.* 1 1
ATI FireGL .*ATI.*Fire.*GL.* 0 1
ATI FirePro M3900 .*ATI.*FirePro.*M39.* 2 1
ATI FirePro M5800 .*ATI.*FirePro.*M58.* 3 1
ATI FirePro M7740 .*ATI.*FirePro.*M77.* 3 1
ATI FirePro M7820 .*ATI.*FirePro.*M78.* 3 1
ATI FireMV .*ATI.*FireMV.* 0 1
ATI Generic .*ATI.*Generic.* 0 0
ATI Hercules 9800 .*ATI.*Hercules.*9800.* 1 1
ATI IGP 340M .*ATI.*IGP.*340M.* 0 0
ATI M52 .*ATI.*M52.* 1 1
ATI M54 .*ATI.*M54.* 1 1
ATI M56 .*ATI.*M56.* 1 1
ATI M71 .*ATI.*M71.* 1 1
ATI M72 .*ATI.*M72.* 1 1
ATI Geforce 9500 GT .*ATI.*Geforce 9500 *GT.* 2 1
ATI Geforce 9600 GT .*ATI.*Geforce 9600 *GT.* 2 1
ATI Geforce 9800 GT .*ATI.*Geforce 9800 *GT.* 2 1
ATI Generic .*ATI.*Generic.* 0 0
ATI Hercules 9800 .*ATI.*Hercules.*9800.* 1 1
ATI IGP 340M .*ATI.*IGP.*340M.* 0 0
ATI M52 .*ATI.*M52.* 1 1
ATI M54 .*ATI.*M54.* 1 1
ATI M56 .*ATI.*M56.* 1 1
ATI M71 .*ATI.*M71.* 1 1
ATI M72 .*ATI.*M72.* 1 1
ATI M76 .*ATI.*M76.* 3 1
ATI Radeon HD 64xx .*ATI.*AMD Radeon.* HD [67]4..[MG] 3 1
ATI Radeon HD 65xx .*ATI.*AMD Radeon.* HD [67]5..[MG] 3 1
ATI Radeon HD 66xx .*ATI.*AMD Radeon.* HD [67]6..[MG] 3 1
ATI Mobility Radeon 4100 .*ATI.*Mobility.*41.. 1 1
ATI Mobility Radeon 7xxx .*ATI.*Mobility.*Radeon 7.* 0 1
ATI Mobility Radeon 8xxx .*ATI.*Mobility.*Radeon 8.* 0 1
ATI Mobility Radeon 9800 .*ATI.*Mobility.*98.* 1 1
ATI Mobility Radeon 7xxx .*ATI.*Mobility.*Radeon 7.* 0 1
ATI Mobility Radeon 8xxx .*ATI.*Mobility.*Radeon 8.* 0 1
ATI Mobility Radeon 9800 .*ATI.*Mobility.*98.* 1 1
ATI Mobility Radeon 9700 .*ATI.*Mobility.*97.* 1 1
ATI Mobility Radeon 9600 .*ATI.*Mobility.*96.* 0 1
ATI Mobility Radeon HD 530v .*ATI.*Mobility.*HD *530v.* 1 1
@@ -99,8 +103,8 @@ ATI Mobility Radeon HD 545v .*ATI.*Mobility.*HD *545v.* 2 1
ATI Mobility Radeon HD 550v .*ATI.*Mobility.*HD *550v.* 2 1
ATI Mobility Radeon HD 560v .*ATI.*Mobility.*HD *560v.* 2 1
ATI Mobility Radeon HD 565v .*ATI.*Mobility.*HD *565v.* 2 1
ATI Mobility Radeon HD 2300 .*ATI.*Mobility.*HD *23.* 1 1
ATI Mobility Radeon HD 2400 .*ATI.*Mobility.*HD *24.* 1 1
ATI Mobility Radeon HD 2300 .*ATI.*Mobility.*HD *23.* 2 1
ATI Mobility Radeon HD 2400 .*ATI.*Mobility.*HD *24.* 2 1
ATI Mobility Radeon HD 2600 .*ATI.*Mobility.*HD *26.* 3 1
ATI Mobility Radeon HD 2700 .*ATI.*Mobility.*HD *27.* 3 1
ATI Mobility Radeon HD 3100 .*ATI.*Mobility.*HD *31.* 0 1
@@ -119,7 +123,7 @@ ATI Mobility Radeon HD 5400 .*ATI.*Mobility.*HD *54.* 3 1
ATI Mobility Radeon HD 5500 .*ATI.*Mobility.*HD *55.* 3 1
ATI Mobility Radeon HD 5600 .*ATI.*Mobility.*HD *56.* 3 1
ATI Mobility Radeon HD 5700 .*ATI.*Mobility.*HD *57.* 3 1
ATI Mobility Radeon HD 5800 .*ATI.*Mobility *HD *58.* 3 1
ATI Mobility Radeon HD 5800 .*ATI.*Mobility *HD *58.* 3 1
ATI Mobility Radeon HD 6200 .*ATI.*Mobility.*HD *62.* 3 1
ATI Mobility Radeon HD 6300 .*ATI.*Mobility.*HD *63.* 3 1
ATI Mobility Radeon HD 6400M .*ATI.*Mobility.*HD *64.* 3 1
@@ -134,30 +138,30 @@ ATI Mobility Radeon HD 7600M .*ATI.*Mobility.*HD *76.* 3 1
ATI Mobility Radeon HD 7700M .*ATI.*Mobility.*HD *77.* 3 1
ATI Mobility Radeon HD 7800M .*ATI.*Mobility.*HD *78.* 3 1
ATI Mobility Radeon HD 7900M .*ATI.*Mobility.*HD *79.* 3 1
ATI Mobility Radeon X1xxx .*ATI.*Mobility.*X1.* 0 1
ATI Mobility Radeon X2xxx .*ATI.*Mobility.*X2.* 0 1
ATI Mobility Radeon X3xx .*ATI.*Mobility.*X3.* 1 1
ATI Mobility Radeon X6xx .*ATI.*Mobility.*X6.* 1 1
ATI Mobility Radeon X7xx .*ATI.*Mobility.*X7.* 1 1
ATI Mobility Radeon Xxxx .*ATI.*Mobility.*X.* 0 1
ATI Mobility Radeon .*ATI.*Mobility.* 0 1
ATI Radeon HD 2300 .*ATI.*Radeon HD *23.. 0 1
ATI Radeon HD 2400 .*ATI.*Radeon HD *24.. 1 1
ATI Mobility Radeon X1xxx .*ATI.*Mobility.*X1.* 0 1
ATI Mobility Radeon X2xxx .*ATI.*Mobility.*X2.* 0 1
ATI Mobility Radeon X3xx .*ATI.*Mobility.*X3.* 1 1
ATI Mobility Radeon X6xx .*ATI.*Mobility.*X6.* 1 1
ATI Mobility Radeon X7xx .*ATI.*Mobility.*X7.* 1 1
ATI Mobility Radeon Xxxx .*ATI.*Mobility.*X.* 0 1
ATI Mobility Radeon .*ATI.*Mobility.* 0 1
ATI Radeon HD 2300 .*ATI.*Radeon HD *23.. 2 1
ATI Radeon HD 2400 .*ATI.*Radeon HD *24.. 2 1
ATI Radeon HD 2600 .*ATI.*Radeon HD *26.. 2 1
ATI Radeon HD 2900 .*ATI.*Radeon HD *29.. 3 1
ATI Radeon HD 3000 .*ATI.*Radeon HD *30.. 0 1
ATI Radeon HD 3100 .*ATI.*Radeon HD *31.. 1 1
ATI Radeon HD 3200 .*ATI.*Radeon HD *32.. 1 1
ATI Radeon HD 3300 .*ATI.*Radeon HD *33.. 1 1
ATI Radeon HD 3400 .*ATI.*Radeon HD *34.. 1 1
ATI Radeon HD 3500 .*ATI.*Radeon HD *35.. 1 1
ATI Radeon HD 3300 .*ATI.*Radeon HD *33.. 2 1
ATI Radeon HD 3400 .*ATI.*Radeon HD *34.. 2 1
ATI Radeon HD 3500 .*ATI.*Radeon HD *35.. 2 1
ATI Radeon HD 3600 .*ATI.*Radeon HD *36.. 3 1
ATI Radeon HD 3700 .*ATI.*Radeon HD *37.. 3 1
ATI Radeon HD 3800 .*ATI.*Radeon HD *38.. 3 1
ATI Radeon HD 4100 .*ATI.*Radeon HD *41.. 1 1
ATI Radeon HD 4200 .*ATI.*Radeon HD *42.. 1 1
ATI Radeon HD 4300 .*ATI.*Radeon HD *43.. 1 1
ATI Radeon HD 4400 .*ATI.*Radeon HD *44.. 1 1
ATI Radeon HD 4300 .*ATI.*Radeon HD *43.. 2 1
ATI Radeon HD 4400 .*ATI.*Radeon HD *44.. 2 1
ATI Radeon HD 4500 .*ATI.*Radeon HD *45.. 3 1
ATI Radeon HD 4600 .*ATI.*Radeon HD *46.. 3 1
ATI Radeon HD 4700 .*ATI.*Radeon HD *47.. 3 1
@@ -169,15 +173,16 @@ ATI Radeon HD 5700 .*ATI.*Radeon HD *57.. 3 1
ATI Radeon HD 5800 .*ATI.*Radeon HD *58.. 3 1
ATI Radeon HD 5900 .*ATI.*Radeon HD *59.. 3 1
ATI Radeon HD 6200 .*ATI.*Radeon HD *62.. 3 1
ATI Radeon HD 6300M .*ATI.*Radeon.*HD.*6300M.* 3 1
ATI Radeon HD 6300M .*ATI.*Radeon.*HD.*6300M.* 3 1
ATI Radeon HD 6300 .*ATI.*Radeon HD *63.. 3 1
ATI Radeon HD 6400 .*ATI.*Radeon HD *64.. 3 1
ATI Radeon HD 6500M .*ATI.*Radeon.*HD.*6500M.* 3 1
ATI Radeon HD 6500M .*ATI.*Radeon.*HD.*6500M.* 3 1
ATI Radeon HD 6500 .*ATI.*Radeon HD *65.. 3 1
ATI Radeon HD 6600 .*ATI.*Radeon HD *66.. 3 1
ATI Radeon HD 6700 .*ATI.*Radeon HD *67.. 3 1
ATI Radeon HD 6800 .*ATI.*Radeon HD *68.. 3 1
ATI Radeon HD 6900 .*ATI.*Radeon HD *69.. 3 1
ATI Radeon HD 7300 .*ATI.*Radeon HD *73.. 3 1
ATI Radeon HD 7400 .*ATI.*Radeon HD *74.. 3 1
ATI Radeon HD 7500 .*ATI.*Radeon HD *75.. 3 1
ATI Radeon HD 7600 .*ATI.*Radeon HD *76.. 3 1
@@ -198,22 +203,22 @@ ATI Radeon 9500 .*ATI.*Radeon 95.. 0 1
ATI Radeon 9600 .*ATI.*Radeon 96.. 0 1
ATI Radeon 9700 .*ATI.*Radeon 97.. 1 1
ATI Radeon 9800 .*ATI.*Radeon 98.. 1 1
ATI Radeon RV250 .*ATI.*RV250.* 0 1
ATI Radeon RV600 .*ATI.*RV6.* 1 1
ATI Radeon RX700 .*ATI.*RX70.* 1 1
ATI Radeon RX800 .*ATI.*Radeon *RX80.* 2 1
ATI Radeon RV250 .*ATI.*RV250.* 0 1
ATI Radeon RV600 .*ATI.*RV6.* 1 1
ATI Radeon RX700 .*ATI.*RX70.* 1 1
ATI Radeon RX800 .*ATI.*Radeon *RX80.* 2 1
ATI RS880M .*ATI.*RS880M 1 1
ATI Radeon RX9550 .*ATI.*RX9550.* 1 1
ATI Radeon VE .*ATI.*Radeon.*VE.* 0 0
ATI Radeon X1000 .*ATI.*Radeon *X10.* 0 1
ATI Radeon X1200 .*ATI.*Radeon *X12.* 0 1
ATI Radeon X1300 .*ATI.*Radeon *X13.* 1 1
ATI Radeon X1400 .*ATI.*Radeon ?X14.* 1 1
ATI Radeon X1500 .*ATI.*Radeon ?X15.* 1 1
ATI Radeon X1600 .*ATI.*Radeon *X16.* 1 1
ATI Radeon X1700 .*ATI.*Radeon ?X17.* 1 1
ATI Radeon X1800 .*ATI.*Radeon ?X18.* 3 1
ATI Radeon X1900 .*ATI.*Radeon ?X19.* 3 1
ATI Radeon RX9550 .*ATI.*RX9550.* 1 1
ATI Radeon VE .*ATI.*Radeon.*VE.* 0 0
ATI Radeon X1000 .*ATI.*Radeon *X10.* 0 1
ATI Radeon X1200 .*ATI.*Radeon *X12.* 0 1
ATI Radeon X1300 .*ATI.*Radeon *X13.* 1 1
ATI Radeon X1400 .*ATI.*Radeon ?X14.* 1 1
ATI Radeon X1500 .*ATI.*Radeon ?X15.* 1 1
ATI Radeon X1600 .*ATI.*Radeon *X16.* 1 1
ATI Radeon X1700 .*ATI.*Radeon ?X17.* 1 1
ATI Radeon X1800 .*ATI.*Radeon ?X18.* 3 1
ATI Radeon X1900 .*ATI.*Radeon ?X19.* 3 1
ATI Radeon X300 .*ATI.*Radeon *X3.* 0 1
ATI Radeon X400 .*ATI.*Radeon ?X4.* 0 1
ATI Radeon X500 .*ATI.*Radeon ?X5.* 0 1
@@ -297,8 +302,11 @@ Intel Brookdale .*Intel.*Brookdale.* 0 0
Intel Cantiga .*Intel.*Cantiga.* 0 1
Intel Eaglelake .*Intel.*Eaglelake.* 0 1
Intel Graphics Media HD .*Intel.*Graphics Media.*HD.* 0 1
Intel HD Graphics 2000 .*Intel.*HD Graphics 2000.* 1 1
Intel HD Graphics 3000 .*Intel.*HD Graphics 3000.* 2 1
Intel HD Graphics 4000 .*Intel.*HD Graphics 4000.* 2 1
Intel HD Graphics .*Intel.*HD Graphics.* 2 1
Intel Mobile 4 Series .*Intel.*Mobile *4 Series.* 0 1
Intel Mobile 4 Series .*Intel.*Mobile.* 4 Series.* 0 1
Intel Media Graphics HD .*Intel.*Media Graphics HD.* 0 1
Intel Montara .*Intel.*Montara.* 0 0
Intel Pineview .*Intel.*Pineview.* 0 1
@@ -314,6 +322,8 @@ NVIDIA 310 .*NVIDIA .*GeForce 310.* 3 1
NVIDIA 315M .*NVIDIA .*GeForce 315M.* 2 1
NVIDIA 315 .*NVIDIA .*GeForce 315.* 3 1
NVIDIA 320M .*NVIDIA .*GeForce 320M.* 2 1
NVIDIA 605M .*NVIDIA .*GeForce 605M.* 2 1
NVIDIA 610M .*NVIDIA .*GeForce 610M.* 2 1
NVIDIA G100M .*NVIDIA .*100M.* 0 1
NVIDIA G100 .*NVIDIA .*100.* 0 1
NVIDIA G102M .*NVIDIA .*102M.* 0 1
@@ -359,6 +369,10 @@ NVIDIA GT 530M .*NVIDIA .*GT *530(M)?.* 3 1
NVIDIA GT 540M .*NVIDIA .*GT *54.(M)?.* 3 1
NVIDIA GT 550M .*NVIDIA .*GT *550(M)?.* 3 1
NVIDIA GT 555M .*NVIDIA .*GT *555(M)?.* 3 1
NVIDIA GT 620M .*NVIDIA .*GT *620(M)?.* 3 1
NVIDIA GT 630M .*NVIDIA .*GT *630(M)?.* 3 1
NVIDIA GT 635M .*NVIDIA .*GT *635(M)?.* 3 1
NVIDIA GT 640M .*NVIDIA .*GT *640(M)?.* 3 1
NVIDIA GTS 160M .*NVIDIA .*GT(S)? *160(M)?.* 2 1
NVIDIA GTS 240 .*NVIDIA .*GTS *24.* 3 1
NVIDIA GTS 250 .*NVIDIA .*GTS *25.* 3 1
@@ -388,12 +402,20 @@ NVIDIA GTX 570 .*NVIDIA .*GTX *57.* 3 1
NVIDIA GTX 580M .*NVIDIA .*GTX *580M.* 3 1
NVIDIA GTX 580 .*NVIDIA .*GTX *58.* 3 1
NVIDIA GTX 590 .*NVIDIA .*GTX *59.* 3 1
NVIDIA GTX 650 .*NVIDIA .*GTX *65.* 3 1
NVIDIA GTX 660 .*NVIDIA .*GTX *66.* 3 1
NVIDIA GTX 670M .*NVIDIA .*GTX *670M.* 3 1
NVIDIA GTX 675M .*NVIDIA .*GTX *675M.* 3 1
NVIDIA GTX 670 .*NVIDIA .*GTX *67.* 3 1
NVIDIA GTX 680M .*NVIDIA .*GTX *680M.* 3 1
NVIDIA GTX 680 .*NVIDIA .*GTX *68.* 3 1
NVIDIA GTX 690 .*NVIDIA .*GTX *69.* 3 1
NVIDIA C51 .*NVIDIA .*C51.* 0 1
NVIDIA G72 .*NVIDIA .*G72.* 1 1
NVIDIA G73 .*NVIDIA.*G73.* 1 1
NVIDIA G73 .*NVIDIA .*G73.* 1 1
NVIDIA G84 .*NVIDIA .*G84.* 2 1
NVIDIA G86 .*NVIDIA.*G86.* 3 1
NVIDIA G92 .*NVIDIA.*G92.* 3 1
NVIDIA G86 .*NVIDIA .*G86.* 3 1
NVIDIA G92 .*NVIDIA .*G92.* 3 1
NVIDIA GeForce .*GeForce 256.* 0 0
NVIDIA GeForce 2 .*GeForce ?2 ?.* 0 1
NVIDIA GeForce 3 .*GeForce ?3 ?.* 0 1
@@ -404,80 +426,80 @@ NVIDIA GeForce 4 MX .*NVIDIA .*GeForce ?4 MX.* 0 1
NVIDIA GeForce 4 PCX .*NVIDIA .*GeForce ?4 PCX.* 0 1
NVIDIA GeForce 4 Ti .*NVIDIA .*GeForce ?4 Ti.* 0 1
NVIDIA GeForce 6100 .*NVIDIA .*GeForce 61.* 0 1
NVIDIA GeForce 6200 .*NVIDIA.*GeForce 62.* 0 1
NVIDIA GeForce 6500 .*NVIDIA.*GeForce 65.* 0 1
NVIDIA GeForce 6600 .*NVIDIA.*GeForce 66.* 1 1
NVIDIA GeForce 6700 .*NVIDIA.*GeForce 67.* 2 1
NVIDIA GeForce 6800 .*NVIDIA.*GeForce 68.* 2 1
NVIDIA GeForce 7000M .*NVIDIA.*GeForce 7000M.* 0 1
NVIDIA GeForce 7100M .*NVIDIA.*GeForce 7100M.* 0 1
NVIDIA GeForce 7000 .*NVIDIA.*GeForce 70.* 0 1
NVIDIA GeForce 7100 .*NVIDIA.*GeForce 71.* 0 1
NVIDIA GeForce 7200 .*NVIDIA.*GeForce 72.* 1 1
NVIDIA GeForce 7300 .*NVIDIA.*GeForce 73.* 1 1
NVIDIA GeForce 7500 .*NVIDIA.*GeForce 75.* 1 1
NVIDIA GeForce 7600 .*NVIDIA.*GeForce 76.* 2 1
NVIDIA GeForce 7800 .*NVIDIA.*GeForce.*78.* 2 1
NVIDIA GeForce 7900 .*NVIDIA.*GeForce.*79.* 2 1
NVIDIA GeForce 8100 .*NVIDIA.*GeForce 81.* 1 1
NVIDIA GeForce 8200M .*NVIDIA.*GeForce 8200M.* 1 1
NVIDIA GeForce 8200 .*NVIDIA.*GeForce 82.* 1 1
NVIDIA GeForce 8300 .*NVIDIA.*GeForce 83.* 1 1
NVIDIA GeForce 8400M .*NVIDIA.*GeForce 8400M.* 1 1
NVIDIA GeForce 8400 .*NVIDIA.*GeForce 84.* 1 1
NVIDIA GeForce 8500 .*GeForce 85.* 3 1
NVIDIA GeForce 8600M .*NVIDIA.*GeForce.*8600M.* 1 1
NVIDIA GeForce 8600 .*NVIDIA.*GeForce 86.* 3 1
NVIDIA GeForce 8700M .*NVIDIA.*GeForce 8700M.* 3 1
NVIDIA GeForce 8700 .*NVIDIA.*GeForce 87.* 3 1
NVIDIA GeForce 8800 .*NVIDIA.*GeForce 88.* 3 1
NVIDIA GeForce 8800M .*NVIDIA.*GeForce 8800M.* 3 1
NVIDIA GeForce 9100M .*NVIDIA.*GeForce 9100M.* 0 1
NVIDIA GeForce 9100 .*NVIDIA.*GeForce 91.* 0 1
NVIDIA GeForce 9200M .*NVIDIA.*GeForce 9200M.* 1 1
NVIDIA GeForce 9200 .*NVIDIA.*GeForce 92.* 1 1
NVIDIA GeForce 9300M .*NVIDIA.*GeForce 9300M.* 1 1
NVIDIA GeForce 9300 .*NVIDIA.*GeForce 93.* 1 1
NVIDIA GeForce 9400M .*NVIDIA.*GeForce 9400M.* 1 1
NVIDIA GeForce 9400 .*NVIDIA.*GeForce 94.* 1 1
NVIDIA GeForce 9500 .*NVIDIA.*GeForce 95.* 2 1
NVIDIA GeForce 9500M .*NVIDIA.*GeForce 9500M.* 2 1
NVIDIA GeForce 9600 .*NVIDIA.*GeForce.*96.* 2 1
NVIDIA GeForce 9600M .*NVIDIA.*GeForce 9600M.* 2 1
NVIDIA GeForce 9700M .*NVIDIA.*GeForce 9700M.* 2 1
NVIDIA GeForce 9800M .*NVIDIA.*GeForce 9800M.* 3 1
NVIDIA GeForce 9800 .*NVIDIA.*GeForce.*98.* 3 1
NVIDIA GeForce FX 5100 .*NVIDIA.*GeForce FX 51.* 0 1
NVIDIA GeForce FX 5200 .*NVIDIA.*GeForce FX 52.* 0 1
NVIDIA GeForce FX 5300 .*NVIDIA.*GeForce FX 53.* 0 1
NVIDIA GeForce FX 5500 .*NVIDIA.*GeForce FX 55.* 0 1
NVIDIA GeForce FX 5600 .*NVIDIA.*GeForce FX 56.* 0 1
NVIDIA GeForce FX 5700 .*NVIDIA.*GeForce FX 57.* 1 1
NVIDIA GeForce FX 5800 .*NVIDIA.*GeForce FX 58.* 1 1
NVIDIA GeForce FX 5900 .*NVIDIA.*GeForce FX 59.* 1 1
NVIDIA GeForce FX Go5100 .*NVIDIA.*GeForce FX Go51.* 0 1
NVIDIA GeForce FX Go5200 .*NVIDIA.*GeForce FX Go52.* 0 1
NVIDIA GeForce FX Go5300 .*NVIDIA.*GeForce FX Go53.* 0 1
NVIDIA GeForce FX Go5500 .*NVIDIA.*GeForce FX Go55.* 0 1
NVIDIA GeForce FX Go5600 .*NVIDIA.*GeForce FX Go56.* 0 1
NVIDIA GeForce FX Go5700 .*NVIDIA.*GeForce FX Go57.* 1 1
NVIDIA GeForce FX Go5800 .*NVIDIA.*GeForce FX Go58.* 1 1
NVIDIA GeForce 6200 .*NVIDIA .*GeForce 62.* 0 1
NVIDIA GeForce 6500 .*NVIDIA .*GeForce 65.* 0 1
NVIDIA GeForce 6600 .*NVIDIA .*GeForce 66.* 1 1
NVIDIA GeForce 6700 .*NVIDIA .*GeForce 67.* 2 1
NVIDIA GeForce 6800 .*NVIDIA .*GeForce 68.* 2 1
NVIDIA GeForce 7000M .*NVIDIA.*GeForce 7000M.* 0 1
NVIDIA GeForce 7000 .*NVIDIA .*GeForce 70.* 0 1
NVIDIA GeForce 7100M .*NVIDIA.*GeForce 7100M.* 0 1
NVIDIA GeForce 7100 .*NVIDIA .*GeForce 71.* 0 1
NVIDIA GeForce 7200 .*NVIDIA .*GeForce 72.* 1 1
NVIDIA GeForce 7300 .*NVIDIA .*GeForce 73.* 1 1
NVIDIA GeForce 7500 .*NVIDIA .*GeForce 75.* 1 1
NVIDIA GeForce 7600 .*NVIDIA .*GeForce 76.* 2 1
NVIDIA GeForce 7800 .*NVIDIA .*GeForce 78.* 2 1
NVIDIA GeForce 7900 .*NVIDIA .*GeForce 79.* 2 1
NVIDIA GeForce 8100 .*NVIDIA .*GeForce 81.* 1 1
NVIDIA GeForce 8200M .*NVIDIA .*GeForce 8200M.* 1 1
NVIDIA GeForce 8200 .*NVIDIA .*GeForce 82.* 1 1
NVIDIA GeForce 8300 .*NVIDIA .*GeForce 83.* 2 1
NVIDIA GeForce 8400M .*NVIDIA .*GeForce 8400M.* 2 1
NVIDIA GeForce 8400 .*NVIDIA .*GeForce 84.* 2 1
NVIDIA GeForce 8500 .*NVIDIA .*GeForce 85.* 3 1
NVIDIA GeForce 8600M .*NVIDIA .*GeForce 8600M.* 2 1
NVIDIA GeForce 8600 .*NVIDIA .*GeForce 86.* 3 1
NVIDIA GeForce 8700M .*NVIDIA .*GeForce 8700M.* 3 1
NVIDIA GeForce 8700 .*NVIDIA .*GeForce 87.* 3 1
NVIDIA GeForce 8800M .*NVIDIA .*GeForce 8800M.* 3 1
NVIDIA GeForce 8800 .*NVIDIA .*GeForce 88.* 3 1
NVIDIA GeForce 9100M .*NVIDIA .*GeForce 9100M.* 0 1
NVIDIA GeForce 9100 .*NVIDIA .*GeForce 91.* 0 1
NVIDIA GeForce 9200M .*NVIDIA .*GeForce 9200M.* 1 1
NVIDIA GeForce 9200 .*NVIDIA .*GeForce 92.* 1 1
NVIDIA GeForce 9300M .*NVIDIA .*GeForce 9300M.* 2 1
NVIDIA GeForce 9300 .*NVIDIA .*GeForce 93.* 2 1
NVIDIA GeForce 9400M .*NVIDIA .*GeForce 9400M.* 2 1
NVIDIA GeForce 9400 .*NVIDIA .*GeForce 94.* 2 1
NVIDIA GeForce 9500M .*NVIDIA .*GeForce 9500M.* 2 1
NVIDIA GeForce 9500 .*NVIDIA .*GeForce 95.* 2 1
NVIDIA GeForce 9600M .*NVIDIA .*GeForce 9600M.* 3 1
NVIDIA GeForce 9600 .*NVIDIA .*GeForce 96.* 2 1
NVIDIA GeForce 9700M .*NVIDIA .*GeForce 9700M.* 2 1
NVIDIA GeForce 9800M .*NVIDIA .*GeForce 9800M.* 3 1
NVIDIA GeForce 9800 .*NVIDIA .*GeForce 98.* 3 1
NVIDIA GeForce FX 5100 .*NVIDIA .*GeForce FX 51.* 0 1
NVIDIA GeForce FX 5200 .*NVIDIA .*GeForce FX 52.* 0 1
NVIDIA GeForce FX 5300 .*NVIDIA .*GeForce FX 53.* 0 1
NVIDIA GeForce FX 5500 .*NVIDIA .*GeForce FX 55.* 0 1
NVIDIA GeForce FX 5600 .*NVIDIA .*GeForce FX 56.* 0 1
NVIDIA GeForce FX 5700 .*NVIDIA .*GeForce FX 57.* 1 1
NVIDIA GeForce FX 5800 .*NVIDIA .*GeForce FX 58.* 1 1
NVIDIA GeForce FX 5900 .*NVIDIA .*GeForce FX 59.* 1 1
NVIDIA GeForce FX Go5100 .*NVIDIA .*GeForce FX Go51.* 0 1
NVIDIA GeForce FX Go5200 .*NVIDIA .*GeForce FX Go52.* 0 1
NVIDIA GeForce FX Go5300 .*NVIDIA .*GeForce FX Go53.* 0 1
NVIDIA GeForce FX Go5500 .*NVIDIA .*GeForce FX Go55.* 0 1
NVIDIA GeForce FX Go5600 .*NVIDIA .*GeForce FX Go56.* 0 1
NVIDIA GeForce FX Go5700 .*NVIDIA .*GeForce FX Go57.* 1 1
NVIDIA GeForce FX Go5800 .*NVIDIA .*GeForce FX Go58.* 1 1
NVIDIA GeForce FX Go5900 .*NVIDIA .*GeForce FX Go59.* 1 1
NVIDIA GeForce FX Go5xxx .*NVIDIA .*GeForce FX Go.* 0 1
NVIDIA GeForce Go 6100 .*NVIDIA.*GeForce Go 61.* 0 1
NVIDIA GeForce Go 6200 .*NVIDIA.*GeForce Go 62.* 0 1
NVIDIA GeForce Go 6400 .*NVIDIA.*GeForce Go 64.* 1 1
NVIDIA GeForce Go 6500 .*NVIDIA.*GeForce Go 65.* 1 1
NVIDIA GeForce Go 6600 .*NVIDIA.*GeForce Go 66.* 1 1
NVIDIA GeForce Go 6700 .*NVIDIA.*GeForce Go 67.* 1 1
NVIDIA GeForce Go 6800 .*NVIDIA.*GeForce Go 68.* 1 1
NVIDIA GeForce Go 6100 .*NVIDIA .*GeForce Go 61.* 0 1
NVIDIA GeForce Go 6200 .*NVIDIA .*GeForce Go 62.* 0 1
NVIDIA GeForce Go 6400 .*NVIDIA .*GeForce Go 64.* 1 1
NVIDIA GeForce Go 6500 .*NVIDIA .*GeForce Go 65.* 1 1
NVIDIA GeForce Go 6600 .*NVIDIA .*GeForce Go 66.* 1 1
NVIDIA GeForce Go 6700 .*NVIDIA .*GeForce Go 67.* 1 1
NVIDIA GeForce Go 6800 .*NVIDIA .*GeForce Go 68.* 1 1
NVIDIA GeForce Go 7200 .*NVIDIA .*GeForce Go 72.* 1 1
NVIDIA GeForce Go 7300 LE .*NVIDIA .*GeForce Go 73.*LE.* 0 1
NVIDIA GeForce Go 7300 .*NVIDIA .*GeForce Go 73.* 1 1
NVIDIA GeForce Go 7400 .*NVIDIA .*GeForce Go 74.* 1 1
NVIDIA GeForce Go 7600 .*NVIDIA .*GeForce Go 76.* 2 1
NVIDIA GeForce Go 7700 .*NVIDIA.*GeForce Go 77.* 2 1
NVIDIA GeForce Go 7800 .*NVIDIA.*GeForce Go 78.* 2 1
NVIDIA GeForce Go 7700 .*NVIDIA .*GeForce Go 77.* 2 1
NVIDIA GeForce Go 7800 .*NVIDIA .*GeForce Go 78.* 2 1
NVIDIA GeForce Go 7900 .*NVIDIA .*GeForce Go 79.* 2 1
NVIDIA D9M .*NVIDIA .*D9M.* 1 1
NVIDIA G94 .*NVIDIA .*G94.* 3 1
@@ -520,40 +542,43 @@ NVIDIA Quadro 6000 .*Quadro.*6000.* 3 1
NVIDIA Quadro 400 .*Quadro.*400.* 2 1
NVIDIA Quadro 600 .*Quadro.*600.* 2 1
NVIDIA Quadro4 .*Quadro4.* 0 1
NVIDIA Quadro DCC .*Quadro DCC.* 0 1
NVIDIA Quadro DCC .*Quadro DCC.* 0 1
NVIDIA Quadro CX .*Quadro.*CX.* 3 1
NVIDIA Quadro FX 770 .*Quadro.*FX *770(M)?.* 2 1
NVIDIA Quadro FX 880 .*Quadro.*FX *880(M)?.* 2 1
NVIDIA Quadro FX 1400 .*Quadro.*FX.*1400(M)?.* 1 1
NVIDIA Quadro FX 1500 .*Quadro.*FX.*1500(M)?.* 1 1
NVIDIA Quadro FX 1600 .*Quadro.*FX *1600(M)?.* 2 1
NVIDIA Quadro FX 1700 .*Quadro.*FX.*1700(M)?.* 2 1
NVIDIA Quadro FX 1800 .*Quadro.*FX.*1800(M)?.* 2 1
NVIDIA Quadro FX 3400 .*Quadro.*FX.*3400(M)?.* 1 1
NVIDIA Quadro FX 3450 .*Quadro.*FX.*3450(M)?.* 1 1
NVIDIA Quadro FX 3500 .*Quadro.*FX.*3500(M)?.* 1 1
NVIDIA Quadro FX 3700 .*Quadro.*FX.*3700(M)?.* 2 1
NVIDIA Quadro FX 3800 .*Quadro.*FX.*3800(M)?.* 2 1
NVIDIA Quadro FX 370 .*Quadro.*FX.*370(M)?.* 2 1
NVIDIA Quadro FX 380 .*Quadro.*FX.*380(M)?.* 2 1
NVIDIA Quadro FX 4000 .*Quadro.*FX.*4000(M)?.* 1 1
NVIDIA Quadro FX 4500 .*Quadro.*FX.*4500(M)?.* 1 1
NVIDIA Quadro FX 4600 .*Quadro.*FX.*4600(M)?.* 2 1
NVIDIA Quadro FX 4700 .*Quadro.*FX.*4700(M)?.* 2 1
NVIDIA Quadro FX 4800 .*Quadro.*FX.*4800(M)?.* 2 1
NVIDIA Quadro FX 470 .*Quadro.*FX.*470(M)?.* 3 1
NVIDIA Quadro FX 5500 .*Quadro.*FX.*5500(M)?.* 1 1
NVIDIA Quadro FX 5600 .*Quadro.*FX.*5600(M)?.* 2 1
NVIDIA Quadro FX 5700 .*Quadro.*FX.*5700(M)?.* 2 1
NVIDIA Quadro FX 5800 .*Quadro.*FX.*5800(M)?.* 2 1
NVIDIA Quadro FX 540 .*Quadro.*FX.*540(M)?.* 3 1
NVIDIA Quadro FX 550 .*Quadro.*FX.*550(M)?.* 3 1
NVIDIA Quadro FX 560 .*Quadro.*FX.*560(M)?.* 3 1
NVIDIA Quadro FX 570 .*Quadro.*FX.*570(M)?.* 3 1
NVIDIA Quadro FX 580 .*Quadro.*FX.*580(M)?.* 3 1
NVIDIA Quadro FX .*Quadro FX.* 1 1
NVIDIA Quadro NVS 1xxM .*Quadro NVS *1.[05]M.* 0 1
NVIDIA Quadro VX 200 .*Quadro VX.*200.* 2 1
NVIDIA Quadro FX 770 .*Quadro.*FX *770(M)?.* 2 1
NVIDIA Quadro FX 1400 .*Quadro.*FX.*1400(M)?.* 1 1
NVIDIA Quadro FX 1500 .*Quadro.*FX *1500(M)?.* 1 1
NVIDIA Quadro FX 1600 .*Quadro.*FX *1600(M)?.* 2 1
NVIDIA Quadro FX 1700 .*Quadro.*FX.*1700(M)?.* 2 1
NVIDIA Quadro FX 1800 .*Quadro.*FX.*1800(M)?.* 2 1
NVIDIA Quadro FX 2500M .*Quadro.*FX *2500M.* 2 1
NVIDIA Quadro FX 2700M .*Quadro.*FX *2700M.* 3 1
NVIDIA Quadro FX 2800M .*Quadro.*FX *2800M.* 3 1
NVIDIA Quadro FX 3400 .*Quadro.*FX.*3400(M)?.* 1 1
NVIDIA Quadro FX 3450 .*Quadro.*FX.*3450(M)?.* 1 1
NVIDIA Quadro FX 3500 .*Quadro.*FX *3500.* 2 1
NVIDIA Quadro FX 3600 .*Quadro.*FX *3600.* 3 1
NVIDIA Quadro FX 3700 .*Quadro.*FX *3700.* 3 1
NVIDIA Quadro FX 3800 .*Quadro.*FX *3800.* 3 1
NVIDIA Quadro FX 370 .*Quadro.*FX.*370(M)?.* 2 1
NVIDIA Quadro FX 380 .*Quadro.*FX.*380(M)?.* 2 1
NVIDIA Quadro FX 4000 .*Quadro.*FX.*4000(M)?.* 1 1
NVIDIA Quadro FX 4500 .*Quadro.*FX *45.* 3 1
NVIDIA Quadro FX 880 .*Quadro.*FX *880(M)?.* 3 1
NVIDIA Quadro FX 4600 .*Quadro.*FX.*4600(M)?.* 2 1
NVIDIA Quadro FX 4700 .*Quadro.*FX.*4700(M)?.* 2 1
NVIDIA Quadro FX 4800 .*NVIDIA .*Quadro *FX *4800.* 3 1
NVIDIA Quadro FX 470 .*Quadro.*FX.*470(M)?.* 3 1
NVIDIA Quadro FX 5500 .*Quadro.*FX.*5500(M)?.* 1 1
NVIDIA Quadro FX 5600 .*Quadro.*FX.*5600(M)?.* 2 1
NVIDIA Quadro FX 5700 .*Quadro.*FX.*5700(M)?.* 2 1
NVIDIA Quadro FX 5800 .*Quadro.*FX.*5800(M)?.* 2 1
NVIDIA Quadro FX 540 .*Quadro.*FX.*540(M)?.* 3 1
NVIDIA Quadro FX 550 .*Quadro.*FX.*550(M)?.* 3 1
NVIDIA Quadro FX 560 .*Quadro.*FX.*560(M)?.* 3 1
NVIDIA Quadro FX 570 .*Quadro.*FX.*570(M)?.* 3 1
NVIDIA Quadro FX 580 .*Quadro.*FX.*580(M)?.* 3 1
NVIDIA Quadro FX .*Quadro FX.* 1 1
NVIDIA Quadro VX 200 .*Quadro VX.*200.* 2 1
NVIDIA Quadro NVS 1xxM .*Quadro NVS *1.[05]M.* 0 1
NVIDIA Quadro NVS 300M .*NVIDIA .*NVS *300M.* 2 1
NVIDIA Quadro NVS 320M .*NVIDIA .*NVS *320M.* 2 1
@@ -561,21 +586,22 @@ NVIDIA Quadro NVS 2100M .*NVIDIA .*NVS *2100M.* 2 1
NVIDIA Quadro NVS 3100M .*NVIDIA .*NVS *3100M.* 2 1
NVIDIA Quadro NVS 4200M .*NVIDIA .*NVS *4200M.* 2 1
NVIDIA Quadro NVS 5100M .*NVIDIA .*NVS *5100M.* 2 1
NVIDIA Quadro 2000 .*Quadro.*2000.* 2 1
NVIDIA Quadro 4000 .*Quadro.*4000.* 2 1
NVIDIA Quadro 5000 .*Quadro.*5000.* 2 1
NVIDIA Quadro 6000 .*Quadro.*6000.* 2 1
NVIDIA Quadro 600 .*Quadro.*600.* 2 1
NVIDIA Quadro NVS .*NVIDIA .*NVS 0 1
NVIDIA Quadro 2000 .*Quadro.*2000.* 2 1
NVIDIA Quadro 4000 .*Quadro.*4000.* 2 1
NVIDIA Quadro 5000 .*Quadro.*5000.* 2 1
NVIDIA Quadro 6000 .*Quadro.*6000.* 2 1
NVIDIA Quadro 600 .*Quadro.*600.* 2 1
NVIDIA Quadro NVS .*(Quadro|NVIDIA) NVS.* 0 1
NVIDIA RIVA TNT .*RIVA TNT.* 0 0
NVIDIA PCI .*NVIDIA.*/PCI/SSE2 0 0
S3 .*S3 Graphics.* 0 0
SiS SiS.* 0 0
Trident Trident.* 0 0
Tungsten Graphics Tungsten.* 0 0
XGI XGI.* 0 0
VIA VIA.* 0 0
Apple Generic Apple.*Generic.* 0 0
Apple Software Renderer Apple.*Software Renderer.* 0 0
Microsoft RemoteFX Graphics Device - WDDM Microsoft.*RemoteFX.* 0 0
NVIDIA RIVA TNT .*RIVA TNT.* 0 0
NVIDIA PCI .*NVIDIA.*/PCI/SSE2 0 0
S3 .*S3 Graphics.* 0 0
SiS SiS.* 0 0
Trident Trident.* 0 0
Tungsten Graphics Tungsten.* 0 0
XGI XGI.* 0 0
VIA VIA.* 0 0
Apple Generic Apple.*Generic.* 0 0
Apple Software Renderer Apple.*Software Renderer.* 0 0
Microsoft RemoteFX Graphics Device - WDDM Microsoft.*RemoteFX.* 0 0
Humper Humper.* 0 1

51
indra/newview/llcompilequeue.cpp
View File

@@ -61,6 +61,7 @@
#include "llfloaterchat.h"
#include "llviewerstats.h"
#include "lluictrlfactory.h"
#include "lltrans.h"
#include "llselectmgr.h"
@@ -68,16 +69,6 @@
/// Local function declarations, constants, enums, and typedefs
///----------------------------------------------------------------------------
// *TODO:Translate
const std::string COMPILE_QUEUE_TITLE("Recompilation Progress");
const std::string COMPILE_START_STRING("recompile");
const std::string RESET_QUEUE_TITLE("Reset Progress");
const std::string RESET_START_STRING("reset");
const std::string RUN_QUEUE_TITLE("Set Running Progress");
const std::string RUN_START_STRING("set running");
const std::string NOT_RUN_QUEUE_TITLE("Set Not Running Progress");
const std::string NOT_RUN_START_STRING("set not running");
struct LLScriptQueueData
{
LLUUID mQueueID;
@@ -211,8 +202,11 @@ BOOL LLFloaterScriptQueue::start()
n_objects = selectHandle->getRootObjectCount();
}
buffer = llformat("Starting %s of %d items.", mStartString.c_str(), n_objects); // *TODO: Translate
LLStringUtil::format_map_t args;
args["[START]"] = mStartString;
args["[COUNT]"] = llformat ("%d", mObjectIDs.count());
buffer = getString ("Starting", args);
LLScrollListCtrl* list = getChild<LLScrollListCtrl>("queue output");
list->addCommentText(buffer);
@@ -250,8 +244,7 @@ BOOL LLFloaterScriptQueue::nextObject()
LLScrollListCtrl* list = getChild<LLScrollListCtrl>("queue output");
mDone = TRUE;
std::string buffer = "Done."; // *TODO: Translate
list->addCommentText(buffer);
list->addCommentText(getString("Done"));
childSetEnabled("close",TRUE);
}
return successful_start;
@@ -346,7 +339,7 @@ LLFloaterCompileQueue* LLFloaterCompileQueue::create(BOOL mono)
}
LLFloaterCompileQueue::LLFloaterCompileQueue(const std::string& name, const LLRect& rect)
: LLFloaterScriptQueue(name, rect, COMPILE_QUEUE_TITLE, COMPILE_START_STRING)
: LLFloaterScriptQueue(name, rect, LLTrans::getString("CompileQueueTitle"), LLTrans::getString("CompileQueueStart"))
{ }
LLFloaterCompileQueue::~LLFloaterCompileQueue()
@@ -454,7 +447,7 @@ void LLFloaterCompileQueue::scriptArrived(LLVFS *vfs, const LLUUID& asset_id,
else
{
// It's now in the file, now compile it.
buffer = std::string("Downloaded, now compiling: ") + data->mScriptName; // *TODO: Translate
buffer = LLTrans::getString("CompileQueueDownloadedCompiling") + (": ") + data->mScriptName;
// Write script to local file for compilation.
LLFILE *fp = LLFile::fopen(filename, "wb"); /*Flawfinder: ignore*/
@@ -493,19 +486,21 @@ void LLFloaterCompileQueue::scriptArrived(LLVFS *vfs, const LLUUID& asset_id,
if( LL_ERR_ASSET_REQUEST_NOT_IN_DATABASE == status )
{
LLChat chat(std::string("Script not found on server.")); // *TODO: Translate
LLChat chat(LLTrans::getString("CompileQueueScriptNotFound"));
LLFloaterChat::addChat(chat);
buffer = std::string("Problem downloading: ") + data->mScriptName; // *TODO: Translate
buffer = LLTrans::getString("CompileQueueProblemDownloading") + LLTrans::getString(":") + " " + data->mScriptName;
}
else if (LL_ERR_INSUFFICIENT_PERMISSIONS == status)
{
LLChat chat(std::string("Insufficient permissions to download a script.")); // *TODO: Translate
LLChat chat(LLTrans::getString("CompileQueueInsufficientPermDownload"));
LLFloaterChat::addChat(chat);
buffer = std::string("Insufficient permissions for: ") + data->mScriptName; // *TODO: Translate
buffer = LLTrans::getString("CompileQueueInsufficientPermFor") + LLTrans::getString(":") + " " + data->mScriptName;
}
else
{
buffer = std::string("Unknown failure to download ") + data->mScriptName; // *TODO: Translate
buffer = LLTrans::getString("CompileQueueUnknownFailure") + (" ") + data->mScriptName;
}
llwarns << "Problem downloading script asset." << llendl;
@@ -671,7 +666,7 @@ LLFloaterResetQueue* LLFloaterResetQueue::create()
}
LLFloaterResetQueue::LLFloaterResetQueue(const std::string& name, const LLRect& rect)
: LLFloaterScriptQueue(name, rect, RESET_QUEUE_TITLE, RESET_START_STRING)
: LLFloaterScriptQueue(name, rect, LLTrans::getString("ResetQueueTitle"), LLTrans::getString("ResetQueueStart"))
{ }
LLFloaterResetQueue::~LLFloaterResetQueue()
@@ -698,7 +693,7 @@ void LLFloaterResetQueue::handleInventory(LLViewerObject* viewer_obj,
LLInventoryItem* item = (LLInventoryItem*)((LLInventoryObject*)(*it));
LLScrollListCtrl* list = getChild<LLScrollListCtrl>("queue output");
std::string buffer;
buffer = std::string("Resetting: ") + item->getName(); // *TODO: Translate
buffer = getString("Resetting") + LLTrans::getString(":") + " " + item->getName();
list->addCommentText(buffer);
LLMessageSystem* msg = gMessageSystem;
msg->newMessageFast(_PREHASH_ScriptReset);
@@ -733,7 +728,7 @@ LLFloaterRunQueue* LLFloaterRunQueue::create()
}
LLFloaterRunQueue::LLFloaterRunQueue(const std::string& name, const LLRect& rect)
: LLFloaterScriptQueue(name, rect, RUN_QUEUE_TITLE, RUN_START_STRING)
: LLFloaterScriptQueue(name, rect, LLTrans::getString("RunQueueTitle"), LLTrans::getString("RunQueueStart"))
{ }
LLFloaterRunQueue::~LLFloaterRunQueue()
@@ -741,7 +736,7 @@ LLFloaterRunQueue::~LLFloaterRunQueue()
}
void LLFloaterRunQueue::handleInventory(LLViewerObject* viewer_obj,
LLInventoryObject::object_list_t* inv)
LLInventoryObject::object_list_t* inv)
{
// find all of the lsl, leaving off duplicates. We'll remove
// all matching asset uuids on compilation success.
@@ -760,7 +755,7 @@ void LLFloaterRunQueue::handleInventory(LLViewerObject* viewer_obj,
LLInventoryItem* item = (LLInventoryItem*)((LLInventoryObject*)(*it));
LLScrollListCtrl* list = getChild<LLScrollListCtrl>("queue output");
std::string buffer;
buffer = std::string("Running: ") + item->getName(); // *TODO: Translate
buffer = getString("Running") + LLTrans::getString(":") + " " + item->getName();
list->addCommentText(buffer);
LLMessageSystem* msg = gMessageSystem;
@@ -797,7 +792,7 @@ LLFloaterNotRunQueue* LLFloaterNotRunQueue::create()
}
LLFloaterNotRunQueue::LLFloaterNotRunQueue(const std::string& name, const LLRect& rect)
: LLFloaterScriptQueue(name, rect, NOT_RUN_QUEUE_TITLE, NOT_RUN_START_STRING)
: LLFloaterScriptQueue(name, rect, LLTrans::getString("NotRunQueueTitle"), LLTrans::getString("NotRunQueueStart"))
{ }
LLFloaterNotRunQueue::~LLFloaterNotRunQueue()
@@ -824,7 +819,7 @@ void LLFloaterNotRunQueue::handleInventory(LLViewerObject* viewer_obj,
LLInventoryItem* item = (LLInventoryItem*)((LLInventoryObject*)(*it));
LLScrollListCtrl* list = getChild<LLScrollListCtrl>("queue output");
std::string buffer;
buffer = std::string("Not running: ") +item->getName(); // *TODO: Translate
buffer = getString("NotRunning") + LLTrans::getString(":") + " " + item->getName();
list->addCommentText(buffer);
LLMessageSystem* msg = gMessageSystem;

17
indra/newview/llfloateractivespeakers.cpp
View File

@@ -538,15 +538,18 @@ void LLPanelActiveSpeakers::refreshSpeakers()
LLScrollListCell* name_cell = itemp->getColumn(1);
if (name_cell)
{
//FIXME: remove hard coding of font colors
if (speakerp->mStatus == LLSpeaker::STATUS_NOT_IN_CHANNEL)
{
// draw inactive speakers in gray
name_cell->setColor(LLColor4::grey4);
// draw inactive speakers in different color
static LLCachedControl<LLColor4> sSpeakersInactive(gColors, "SpeakersInactive");
name_cell->setColor(sSpeakersInactive);
}
else
{
name_cell->setColor(LLColor4::black);
static LLCachedControl<LLColor4> sDefaultListText(gColors, "DefaultListText");
name_cell->setColor(sDefaultListText);
}
// <edit>
if(!mShowTextChatters && !(speakerp->mStatus == LLSpeaker::STATUS_NOT_IN_CHANNEL) && speakerp->mID != gAgent.getID())
@@ -567,7 +570,11 @@ void LLPanelActiveSpeakers::refreshSpeakers()
}
}
if(!found)
name_cell->setColor(LLColor4::red);
{
static LLCachedControl<LLColor4> sSpeakersGhost(gColors, "SpeakersGhost");
name_cell->setColor(sSpeakersGhost);
}
}
// </edit>

309
indra/newview/llfloateravatarlist.cpp
View File

@@ -35,6 +35,7 @@
#include "llfloaterreporter.h"
#include "llagent.h"
#include "llagentcamera.h"
#include "llfloaterregioninfo.h"
#include "llviewerregion.h"
#include "lltracker.h"
#include "llviewerstats.h"
@@ -74,43 +75,55 @@ extern U32 gFrameCount;
typedef enum e_radar_alert_type
{
ALERT_TYPE_SIM = 0,
ALERT_TYPE_DRAW = 1,
ALERT_TYPE_SHOUTRANGE = 2,
ALERT_TYPE_CHATRANGE = 3
ALERT_TYPE_SIM = 1,
ALERT_TYPE_DRAW = 2,
ALERT_TYPE_SHOUTRANGE = 4,
ALERT_TYPE_CHATRANGE = 8,
} ERadarAlertType;
void chat_avatar_status(std::string name, LLUUID key, ERadarAlertType type, bool entering)
{
if (gSavedSettings.getBOOL("RadarChatAlerts"))
static LLCachedControl<bool> radar_chat_alerts(gSavedSettings, "RadarChatAlerts");
static LLCachedControl<bool> radar_alert_sim(gSavedSettings, "RadarAlertSim");
static LLCachedControl<bool> radar_alert_draw(gSavedSettings, "RadarAlertDraw");
static LLCachedControl<bool> radar_alert_shout_range(gSavedSettings, "RadarAlertShoutRange");
static LLCachedControl<bool> radar_alert_chat_range(gSavedSettings, "RadarAlertChatRange");
static LLCachedControl<bool> radar_chat_keys(gSavedSettings, "RadarChatKeys");
if (radar_chat_alerts)
{
LLChat chat;
LLFloaterAvatarList* self = LLFloaterAvatarList::getInstance();
std::string message = name + " " + self->getString(entering ? "has_entered" : "has_left") + " ";
switch(type)
{
case ALERT_TYPE_SIM:
if (gSavedSettings.getBOOL("RadarAlertSim"))
{
chat.mText = name+" has "+(entering ? "entered" : "left")+" the sim.";
}
break;
case ALERT_TYPE_DRAW:
if (gSavedSettings.getBOOL("RadarAlertDraw"))
{
chat.mText = name+" has "+(entering ? "entered" : "left")+" draw distance.";
}
break;
case ALERT_TYPE_SHOUTRANGE:
if (gSavedSettings.getBOOL("RadarAlertShoutRange"))
{
chat.mText = name+" has "+(entering ? "entered" : "left")+" shout range.";
}
break;
case ALERT_TYPE_CHATRANGE:
if (gSavedSettings.getBOOL("RadarAlertChatRange"))
{
chat.mText = name+" has "+(entering ? "entered" : "left")+" chat range.";
}
break;
case ALERT_TYPE_SIM:
if (radar_alert_sim)
{
chat.mText = message + self->getString("the_sim") + ".";
}
break;
case ALERT_TYPE_DRAW:
if (radar_alert_draw)
{
chat.mText = message + self->getString("draw_distance") + ".";
}
break;
case ALERT_TYPE_SHOUTRANGE:
if (radar_alert_shout_range)
{
chat.mText = message + self->getString("shout_range") + ".";
}
break;
case ALERT_TYPE_CHATRANGE:
if (radar_alert_chat_range)
{
chat.mText = message + self->getString("chat_range") + ".";
}
break;
}
if (chat.mText != "")
{
@@ -307,10 +320,6 @@ BOOL LLFloaterAvatarList::postBuild()
mTracking = FALSE;
mUpdate = TRUE;
// Hide them until some other way is found
// Users may not expect to find a Ban feature on the Eject button
childSetVisible("estate_ban_btn", false);
// Set callbacks
childSetAction("profile_btn", onClickProfile, this);
childSetAction("im_btn", onClickIM, this);
@@ -331,6 +340,7 @@ BOOL LLFloaterAvatarList::postBuild()
childSetAction("ar_btn", onClickAR, this);
childSetAction("teleport_btn", onClickTeleport, this);
childSetAction("estate_eject_btn", onClickEjectFromEstate, this);
childSetAction("estate_ban_btn", onClickBanFromEstate, this);
childSetAction("send_keys_btn", onClickSendKeys, this);
@@ -471,7 +481,7 @@ void LLFloaterAvatarList::updateAvatarList()
LLAvatarName avatar_name;
if (LLAvatarNameCache::get(avatarp->getID(), &avatar_name))
{
static const LLCachedControl<S32> phoenix_name_system("PhoenixNameSystem", 0);
static LLCachedControl<S32> phoenix_name_system("PhoenixNameSystem", 0);
switch (phoenix_name_system)
{
case 0 : name = avatar_name.getLegacyName(); break;
@@ -662,7 +672,7 @@ void LLFloaterAvatarList::refreshAvatarList()
LLUUID av_id;
std::string av_name;
LLAvatarListEntry *entry = &iter->second;
LLAvatarListEntry* entry = &iter->second;
// Skip if avatar hasn't been around
if (entry->isDead())
@@ -738,9 +748,13 @@ void LLFloaterAvatarList::refreshAvatarList()
estate_owner = parent_estate->getOwner();
}
static const LLCachedControl<LLColor4> unselected_color(gColors, "ScrollUnselectedColor",LLColor4(LLColor4U(0, 0, 0, 204)) );
static const LLCachedControl<LLColor4> unselected_color(gColors, "ScrollUnselectedColor",LLColor4(0.f, 0.f, 0.f, 0.8f));
LLColor4 name_color = unselected_color;
static LLCachedControl<LLColor4> sDefaultListText(gColors, "DefaultListText");
static LLCachedControl<LLColor4> sRadarTextChatRange(gColors, "RadarTextChatRange");
static LLCachedControl<LLColor4> sRadarTextShoutRange(gColors, "RadarTextShoutRange");
static LLCachedControl<LLColor4> sRadarTextDrawDist(gColors, "RadarTextDrawDist");
LLColor4 name_color = sDefaultListText;
//Lindens are always more Linden than your friend, make that take precedence
if(LLMuteList::getInstance()->isLinden(av_name))
@@ -772,7 +786,7 @@ void LLFloaterAvatarList::refreshAvatarList()
element["columns"][LIST_AVATAR_NAME]["color"] = name_color.getValue();
char temp[32];
LLColor4 color = LLColor4::black;
LLColor4 color = sDefaultListText;
element["columns"][LIST_DISTANCE]["column"] = "distance";
element["columns"][LIST_DISTANCE]["type"] = "text";
if (UnknownAltitude)
@@ -780,28 +794,28 @@ void LLFloaterAvatarList::refreshAvatarList()
strcpy(temp, "?");
if (entry->isDrawn())
{
color = LLColor4::green2;
color = sRadarTextDrawDist;
}
}
else
{
if (distance < 100.0)
if (distance <= 96.0)
{
snprintf(temp, sizeof(temp), "%.1f", distance);
if (distance > 20.0f)
{
color = LLColor4::yellow1;
color = sRadarTextShoutRange;
}
else
{
color = LLColor4::red;
color = sRadarTextChatRange;
}
}
else
{
if (entry->isDrawn())
{
color = LLColor4::green2;
color = sRadarTextDrawDist;
}
snprintf(temp, sizeof(temp), "%d", (S32)distance);
}
@@ -893,9 +907,9 @@ void LLFloaterAvatarList::refreshAvatarList()
//element["columns"][LIST_METADATA]["column"] = "metadata";
//element["columns"][LIST_METADATA]["type"] = "text";
static const LLCachedControl<LLColor4> avatar_name_color(gColors, "AvatarNameColor",LLColor4(LLColor4U(251, 175, 93, 255)) );
static const LLCachedControl<LLColor4> avatar_name_color(gColors, "AvatarNameColor",LLColor4(0.98f, 0.69f, 0.36f, 1.f));
LLColor4 client_color(avatar_name_color);
LLVOAvatar *avatarp = gObjectList.findAvatar(av_id);
LLVOAvatar* avatarp = gObjectList.findAvatar(av_id);
if(avatarp)
{
std::string client = SHClientTagMgr::instance().getClientName(avatarp, false);
@@ -971,9 +985,9 @@ void LLFloaterAvatarList::onClickIM(void* userdata)
}
}
void LLFloaterAvatarList::onClickTeleportOffer(void *userdata)
void LLFloaterAvatarList::onClickTeleportOffer(void* userdata)
{
LLFloaterAvatarList *self = (LLFloaterAvatarList*)userdata;
LLFloaterAvatarList* self = (LLFloaterAvatarList*)userdata;
LLDynamicArray<LLUUID> ids = self->mAvatarList->getSelectedIDs();
if (ids.size() > 0)
@@ -982,11 +996,11 @@ void LLFloaterAvatarList::onClickTeleportOffer(void *userdata)
}
}
void LLFloaterAvatarList::onClickTrack(void *userdata)
void LLFloaterAvatarList::onClickTrack(void* userdata)
{
LLFloaterAvatarList *self = (LLFloaterAvatarList*)userdata;
LLFloaterAvatarList* self = (LLFloaterAvatarList*)userdata;
LLScrollListItem *item = self->mAvatarList->getFirstSelected();
LLScrollListItem* item = self->mAvatarList->getFirstSelected();
if (!item) return;
LLUUID agent_id = item->getUUID();
@@ -1054,15 +1068,15 @@ LLAvatarListEntry * LLFloaterAvatarList::getAvatarEntry(LLUUID avatar)
}
//static
void LLFloaterAvatarList::onClickMark(void *userdata)
void LLFloaterAvatarList::onClickMark(void* userdata)
{
LLFloaterAvatarList *self = (LLFloaterAvatarList*)userdata;
LLFloaterAvatarList* self = (LLFloaterAvatarList*)userdata;
LLDynamicArray<LLUUID> ids = self->mAvatarList->getSelectedIDs();
for (LLDynamicArray<LLUUID>::iterator itr = ids.begin(); itr != ids.end(); ++itr)
{
LLUUID avid = *itr;
LLAvatarListEntry *entry = self->getAvatarEntry(avid);
LLAvatarListEntry* entry = self->getAvatarEntry(avid);
if (entry != NULL)
{
entry->toggleMark();
@@ -1070,11 +1084,68 @@ void LLFloaterAvatarList::onClickMark(void *userdata)
}
}
void LLFloaterAvatarList::onClickFocus(void *userdata)
BOOL LLFloaterAvatarList::handleKeyHere(KEY key, MASK mask)
{
LLFloaterAvatarList *self = (LLFloaterAvatarList*)userdata;
LLFloaterAvatarList* self = getInstance();
LLScrollListItem* item = self->mAvatarList->getFirstSelected();
if(item)
{
LLUUID agent_id = item->getUUID();
if (( KEY_RETURN == key ) && (MASK_NONE == mask))
{
self->mFocusedAvatar = agent_id;
self->focusOnCurrent();
return TRUE;
}
else if (( KEY_RETURN == key ) && (MASK_CONTROL == mask))
{
LLAvatarListEntry* entry = self->getAvatarEntry(agent_id);
if (entry)
{
// llinfos << "Trying to teleport to " << entry->getName() << " at " << entry->getPosition() << llendl;
gAgent.teleportViaLocation(entry->getPosition());
}
return TRUE;
}
}
LLScrollListItem *item = self->mAvatarList->getFirstSelected();
if (( KEY_RETURN == key ) && (MASK_SHIFT == mask))
{
LLDynamicArray<LLUUID> ids = self->mAvatarList->getSelectedIDs();
if (ids.size() > 0)
{
if (ids.size() == 1)
{
// Single avatar
LLUUID agent_id = ids[0];
// [Ansariel: Display name support]
LLAvatarName avatar_name;
if (LLAvatarNameCache::get(agent_id, &avatar_name))
{
gIMMgr->setFloaterOpen(TRUE);
gIMMgr->addSession(LLCacheName::cleanFullName(avatar_name.getLegacyName()),IM_NOTHING_SPECIAL,agent_id);
}
// [Ansariel: Display name support]
}
else
{
// Group IM
LLUUID session_id;
session_id.generate();
gIMMgr->setFloaterOpen(TRUE);
gIMMgr->addSession("Avatars Conference", IM_SESSION_CONFERENCE_START, ids[0], ids);
}
}
}
return LLPanel::handleKeyHere(key, mask);
}
void LLFloaterAvatarList::onClickFocus(void* userdata)
{
LLFloaterAvatarList* self = (LLFloaterAvatarList*)userdata;
LLScrollListItem* item = self->mAvatarList->getFirstSelected();
if (item)
{
self->mFocusedAvatar = item->getUUID();
@@ -1088,7 +1159,7 @@ void LLFloaterAvatarList::removeFocusFromAll()
for (iter = mAvatars.begin(); iter != mAvatars.end(); iter++)
{
LLAvatarListEntry *entry = &iter->second;
LLAvatarListEntry* entry = &iter->second;
entry->setFocus(FALSE);
}
}
@@ -1096,7 +1167,7 @@ void LLFloaterAvatarList::removeFocusFromAll()
void LLFloaterAvatarList::focusOnCurrent()
{
std::map<LLUUID, LLAvatarListEntry>::iterator iter;
LLAvatarListEntry *entry;
LLAvatarListEntry* entry;
if (mAvatars.size() == 0)
{
@@ -1123,8 +1194,8 @@ void LLFloaterAvatarList::focusOnCurrent()
void LLFloaterAvatarList::focusOnPrev(BOOL marked_only)
{
std::map<LLUUID, LLAvatarListEntry>::iterator iter;
LLAvatarListEntry *prev = NULL;
LLAvatarListEntry *entry;
LLAvatarListEntry* prev = NULL;
LLAvatarListEntry* entry;
if (mAvatars.size() == 0)
{
@@ -1162,8 +1233,8 @@ void LLFloaterAvatarList::focusOnNext(BOOL marked_only)
{
std::map<LLUUID, LLAvatarListEntry>::iterator iter;
BOOL found = FALSE;
LLAvatarListEntry *next = NULL;
LLAvatarListEntry *entry;
LLAvatarListEntry* next = NULL;
LLAvatarListEntry* entry;
if (mAvatars.size() == 0)
{
@@ -1220,38 +1291,38 @@ void LLFloaterAvatarList::lookAtAvatar(LLUUID &uuid)
}
//static
void LLFloaterAvatarList::onClickPrevInList(void *userdata)
void LLFloaterAvatarList::onClickPrevInList(void* userdata)
{
LLFloaterAvatarList *self = (LLFloaterAvatarList*)userdata;
LLFloaterAvatarList* self = (LLFloaterAvatarList*)userdata;
self->focusOnPrev(FALSE);
}
//static
void LLFloaterAvatarList::onClickNextInList(void *userdata)
void LLFloaterAvatarList::onClickNextInList(void* userdata)
{
LLFloaterAvatarList *self = (LLFloaterAvatarList*)userdata;
LLFloaterAvatarList* self = (LLFloaterAvatarList*)userdata;
self->focusOnNext(FALSE);
}
//static
void LLFloaterAvatarList::onClickPrevMarked(void *userdata)
void LLFloaterAvatarList::onClickPrevMarked(void* userdata)
{
LLFloaterAvatarList *self = (LLFloaterAvatarList*)userdata;
LLFloaterAvatarList* self = (LLFloaterAvatarList*)userdata;
self->focusOnPrev(TRUE);
}
//static
void LLFloaterAvatarList::onClickNextMarked(void *userdata)
void LLFloaterAvatarList::onClickNextMarked(void* userdata)
{
LLFloaterAvatarList *self = (LLFloaterAvatarList*)userdata;
LLFloaterAvatarList* self = (LLFloaterAvatarList*)userdata;
self->focusOnNext(TRUE);
}
//static
void LLFloaterAvatarList::onClickGetKey(void *userdata)
{
LLFloaterAvatarList *self = (LLFloaterAvatarList*)userdata;
LLScrollListItem *item = self->mAvatarList->getFirstSelected();
LLFloaterAvatarList* self = (LLFloaterAvatarList*)userdata;
LLScrollListItem* item = self->mAvatarList->getFirstSelected();
if (NULL == item) return;
@@ -1337,7 +1408,7 @@ void LLFloaterAvatarList::sound_trigger_hook(LLMessageSystem* msg,void **)
msg->getUUIDFast(_PREHASH_SoundData, _PREHASH_OwnerID, owner_id);
if(owner_id == gAgent.getID() && sound_id == LLUUID("76c78607-93f9-f55a-5238-e19b1a181389"))
{
//lets ask if they want to turn it on.
//let's ask if they want to turn it on.
if(gSavedSettings.getBOOL("RadarChatKeys"))
{
LLFloaterAvatarList::getInstance()->sendKeys();
@@ -1412,13 +1483,13 @@ static void send_eject(const LLUUID& avatar_id, bool ban)
msg->nextBlock("Data");
msg->addUUID("TargetID", avatar_id);
msg->addU32("Flags", flags);
msg->sendReliable( avatarp->getRegion()->getHost());
msg->sendReliable(avatarp->getRegion()->getHost());
}
}
static void send_estate_message(
const char* request,
const LLUUID &target)
const LLUUID& target)
{
LLMessageSystem* msg = gMessageSystem;
@@ -1449,21 +1520,22 @@ static void send_estate_message(
msg->sendReliable(gAgent.getRegion()->getHost());
}
static void cmd_freeze(const LLUUID& avatar, const std::string &name) { send_freeze(avatar, true); }
static void cmd_unfreeze(const LLUUID& avatar, const std::string &name) { send_freeze(avatar, false); }
static void cmd_eject(const LLUUID& avatar, const std::string &name) { send_eject(avatar, false); }
static void cmd_ban(const LLUUID& avatar, const std::string &name) { send_eject(avatar, true); }
static void cmd_profile(const LLUUID& avatar, const std::string &name) { LLFloaterAvatarInfo::showFromDirectory(avatar); }
static void cmd_estate_eject(const LLUUID &avatar, const std::string &name){ send_estate_message("teleporthomeuser", avatar); }
static void cmd_freeze(const LLUUID& avatar, const std::string& name) { send_freeze(avatar, true); }
static void cmd_unfreeze(const LLUUID& avatar, const std::string& name) { send_freeze(avatar, false); }
static void cmd_eject(const LLUUID& avatar, const std::string& name) { send_eject(avatar, false); }
static void cmd_ban(const LLUUID& avatar, const std::string& name) { send_eject(avatar, true); }
static void cmd_profile(const LLUUID& avatar, const std::string& name) { LLFloaterAvatarInfo::showFromDirectory(avatar); }
static void cmd_estate_eject(const LLUUID& avatar, const std::string& name){ send_estate_message("teleporthomeuser", avatar); }
static void cmd_estate_ban(const LLUUID &avatar, const std::string &name) { LLPanelEstateInfo::sendEstateAccessDelta(ESTATE_ACCESS_BANNED_AGENT_ADD | ESTATE_ACCESS_ALLOWED_AGENT_REMOVE | ESTATE_ACCESS_NO_REPLY, avatar); }
void LLFloaterAvatarList::doCommand(void (*func)(const LLUUID &avatar, const std::string &name))
void LLFloaterAvatarList::doCommand(void (*func)(const LLUUID& avatar, const std::string& name))
{
LLDynamicArray<LLUUID> ids = mAvatarList->getSelectedIDs();
for (LLDynamicArray<LLUUID>::iterator itr = ids.begin(); itr != ids.end(); ++itr)
{
LLUUID avid = *itr;
LLAvatarListEntry *entry = getAvatarEntry(avid);
LLAvatarListEntry* entry = getAvatarEntry(avid);
if (entry != NULL)
{
llinfos << "Executing command on " << entry->getName() << llendl;
@@ -1480,7 +1552,7 @@ std::string LLFloaterAvatarList::getSelectedNames(const std::string& separator)
for (LLDynamicArray<LLUUID>::iterator itr = ids.begin(); itr != ids.end(); ++itr)
{
LLUUID avid = *itr;
LLAvatarListEntry *entry = getAvatarEntry(avid);
LLAvatarListEntry* entry = getAvatarEntry(avid);
if (entry != NULL)
{
if (!ret.empty()) ret += separator;
@@ -1494,7 +1566,7 @@ std::string LLFloaterAvatarList::getSelectedNames(const std::string& separator)
std::string LLFloaterAvatarList::getSelectedName()
{
LLUUID id = getSelectedID();
LLAvatarListEntry *entry = getAvatarEntry(id);
LLAvatarListEntry* entry = getAvatarEntry(id);
if (entry)
{
return entry->getName();
@@ -1504,7 +1576,7 @@ std::string LLFloaterAvatarList::getSelectedName()
LLUUID LLFloaterAvatarList::getSelectedID()
{
LLScrollListItem *item = mAvatarList->getFirstSelected();
LLScrollListItem* item = mAvatarList->getFirstSelected();
if (item) return item->getUUID();
return LLUUID::null;
}
@@ -1516,11 +1588,11 @@ void LLFloaterAvatarList::callbackFreeze(const LLSD& notification, const LLSD& r
if (option == 0)
{
getInstance()->doCommand( cmd_freeze );
getInstance()->doCommand(cmd_freeze);
}
else if (option == 1)
{
getInstance()->doCommand( cmd_unfreeze );
getInstance()->doCommand(cmd_unfreeze);
}
}
@@ -1531,11 +1603,11 @@ void LLFloaterAvatarList::callbackEject(const LLSD& notification, const LLSD& re
if (option == 0)
{
getInstance()->doCommand( cmd_eject );
getInstance()->doCommand(cmd_eject);
}
else if (option == 1)
{
getInstance()->doCommand( cmd_ban );
getInstance()->doCommand(cmd_ban);
}
}
@@ -1546,16 +1618,28 @@ void LLFloaterAvatarList::callbackEjectFromEstate(const LLSD& notification, cons
if (option == 0)
{
getInstance()->doCommand( cmd_estate_eject );
getInstance()->doCommand(cmd_estate_eject);
}
}
//static
void LLFloaterAvatarList::callbackIdle(void *userdata)
void LLFloaterAvatarList::callbackBanFromEstate(const LLSD& notification, const LLSD& response)
{
S32 option = LLNotification::getSelectedOption(notification, response);
if (option == 0)
{
getInstance()->doCommand(cmd_estate_eject); //Eject first, just in case.
getInstance()->doCommand(cmd_estate_ban);
}
}
//static
void LLFloaterAvatarList::callbackIdle(void* userdata)
{
if (instanceExists())
{
// Do not update at every frame: this would be insane !
// Do not update at every frame: this would be insane!
if (gFrameCount % getInstance()->mUpdateRate == 0)
{
getInstance()->updateAvatarList();
@@ -1563,7 +1647,7 @@ void LLFloaterAvatarList::callbackIdle(void *userdata)
}
}
void LLFloaterAvatarList::onClickFreeze(void *userdata)
void LLFloaterAvatarList::onClickFreeze(void* userdata)
{
LLSD args;
LLSD payload;
@@ -1572,7 +1656,7 @@ void LLFloaterAvatarList::onClickFreeze(void *userdata)
}
//static
void LLFloaterAvatarList::onClickEject(void *userdata)
void LLFloaterAvatarList::onClickEject(void* userdata)
{
LLSD args;
LLSD payload;
@@ -1581,9 +1665,9 @@ void LLFloaterAvatarList::onClickEject(void *userdata)
}
//static
void LLFloaterAvatarList::onClickMute(void *userdata)
void LLFloaterAvatarList::onClickMute(void* userdata)
{
LLFloaterAvatarList *self = (LLFloaterAvatarList*)userdata;
LLFloaterAvatarList* self = (LLFloaterAvatarList*)userdata;
LLDynamicArray<LLUUID> ids = self->mAvatarList->getSelectedIDs();
if (ids.size() > 0)
@@ -1611,7 +1695,7 @@ void LLFloaterAvatarList::onClickMute(void *userdata)
}
//static
void LLFloaterAvatarList::onClickEjectFromEstate(void *userdata)
void LLFloaterAvatarList::onClickEjectFromEstate(void* userdata)
{
LLSD args;
LLSD payload;
@@ -1620,14 +1704,23 @@ void LLFloaterAvatarList::onClickEjectFromEstate(void *userdata)
}
//static
void LLFloaterAvatarList::onClickAR(void *userdata)
void LLFloaterAvatarList::onClickBanFromEstate(void* userdata)
{
LLFloaterAvatarList *self = (LLFloaterAvatarList*)userdata;
LLScrollListItem *item = self->mAvatarList->getFirstSelected();
LLSD args;
LLSD payload;
args["EVIL_USER"] = ((LLFloaterAvatarList*)userdata)->getSelectedNames();
LLNotificationsUtil::add("EstateBanUser", args, payload, callbackBanFromEstate);
}
//static
void LLFloaterAvatarList::onClickAR(void* userdata)
{
LLFloaterAvatarList* self = (LLFloaterAvatarList*)userdata;
LLScrollListItem* item = self->mAvatarList->getFirstSelected();
if (item)
{
LLUUID agent_id = item->getUUID();
LLAvatarListEntry *entry = self->getAvatarEntry(agent_id);
LLAvatarListEntry* entry = self->getAvatarEntry(agent_id);
if (entry)
{
LLFloaterReporter::showFromObject(entry->getID());
@@ -1638,19 +1731,19 @@ void LLFloaterAvatarList::onClickAR(void *userdata)
// static
void LLFloaterAvatarList::onClickProfile(void* userdata)
{
LLFloaterAvatarList *self = (LLFloaterAvatarList*)userdata;
LLFloaterAvatarList* self = (LLFloaterAvatarList*)userdata;
self->doCommand(cmd_profile);
}
//static
void LLFloaterAvatarList::onClickTeleport(void* userdata)
{
LLFloaterAvatarList *self = (LLFloaterAvatarList*)userdata;
LLScrollListItem *item = self->mAvatarList->getFirstSelected();
LLFloaterAvatarList* self = (LLFloaterAvatarList*)userdata;
LLScrollListItem* item = self->mAvatarList->getFirstSelected();
if (item)
{
LLUUID agent_id = item->getUUID();
LLAvatarListEntry *entry = self->getAvatarEntry(agent_id);
LLAvatarListEntry* entry = self->getAvatarEntry(agent_id);
if (entry)
{
// llinfos << "Trying to teleport to " << entry->getName() << " at " << entry->getPosition() << llendl;
@@ -1663,11 +1756,11 @@ void LLFloaterAvatarList::onSelectName(LLUICtrl*, void* userdata)
{
LLFloaterAvatarList* self = (LLFloaterAvatarList*)userdata;
LLScrollListItem *item = self->mAvatarList->getFirstSelected();
LLScrollListItem* item = self->mAvatarList->getFirstSelected();
if (item)
{
LLUUID agent_id = item->getUUID();
LLAvatarListEntry *entry = self->getAvatarEntry(agent_id);
LLAvatarListEntry* entry = self->getAvatarEntry(agent_id);
if (entry)
{
BOOL enabled = entry->isDrawn();

4
indra/newview/llfloateravatarlist.h
View File

@@ -171,6 +171,8 @@ private:
public:
~LLFloaterAvatarList();
virtual BOOL handleKeyHere(KEY key, MASK mask);
/*virtual*/ void onClose(bool app_quitting);
/*virtual*/ void onOpen();
/*virtual*/ BOOL postBuild();
@@ -280,11 +282,13 @@ private:
static void onClickAR(void *userdata);
static void onClickTeleport(void *userdata);
static void onClickEjectFromEstate(void *userdata);
static void onClickBanFromEstate(void *userdata);
static void callbackFreeze(const LLSD& notification, const LLSD& response);
static void callbackEject(const LLSD& notification, const LLSD& response);
static void callbackAR(void *userdata);
static void callbackEjectFromEstate(const LLSD& notification, const LLSD& response);
static void callbackBanFromEstate(const LLSD& notification, const LLSD& response);
static void onSelectName(LLUICtrl*, void *userdata);

224
indra/newview/llfloaterhardwaresettings.cpp
View File

@@ -1,224 +0,0 @@
/**
* @file llfloaterhardwaresettings.cpp
* @brief Menu of all the different graphics hardware settings
*
* $LicenseInfo:firstyear=2001&license=viewergpl$
*
* Copyright (c) 2001-2009, Linden Research, Inc.
*
* Second Life Viewer Source Code
* The source code in this file ("Source Code") is provided by Linden Lab
* to you under the terms of the GNU General Public License, version 2.0
* ("GPL"), unless you have obtained a separate licensing agreement
* ("Other License"), formally executed by you and Linden Lab. Terms of
* the GPL can be found in doc/GPL-license.txt in this distribution, or
* online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
*
* There are special exceptions to the terms and conditions of the GPL as
* it is applied to this Source Code. View the full text of the exception
* in the file doc/FLOSS-exception.txt in this software distribution, or
* online at
* http://secondlifegrid.net/programs/open_source/licensing/flossexception
*
* By copying, modifying or distributing this software, you acknowledge
* that you have read and understood your obligations described above,
* and agree to abide by those obligations.
*
* ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
* WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
* COMPLETENESS OR PERFORMANCE.
* $/LicenseInfo$
*/
#include "llviewerprecompiledheaders.h"
#include "llfloaterhardwaresettings.h"
#include "llfloaterpreference.h"
#include "llviewerwindow.h"
#include "llwindow.h"
#include "llviewercontrol.h"
#include "llviewertexturelist.h"
#include "llfeaturemanager.h"
#include "llstartup.h"
#include "llradiogroup.h"
#include "lluictrlfactory.h"
#include "llimagegl.h"
#include "pipeline.h"
LLFloaterHardwareSettings* LLFloaterHardwareSettings::sHardwareSettings = NULL;
LLFloaterHardwareSettings::LLFloaterHardwareSettings() : LLFloater(std::string("Hardware Settings Floater"))
{
LLUICtrlFactory::getInstance()->buildFloater(this, "floater_hardware_settings.xml");
// load it up
initCallbacks();
}
LLFloaterHardwareSettings::~LLFloaterHardwareSettings()
{
}
void LLFloaterHardwareSettings::onClickHelp(void* data)
{
const char* xml_alert = "HardwareSettingsHelpButton";
LLNotifications::instance().add(xml_alert);
}
void LLFloaterHardwareSettings::initCallbacks(void)
{
}
// menu maintenance functions
void LLFloaterHardwareSettings::refresh()
{
LLPanel::refresh();
mUseVBO = gSavedSettings.getBOOL("RenderVBOEnable");
mUseFBO = gSavedSettings.getBOOL("RenderUseFBO");
mUseAniso = gSavedSettings.getBOOL("RenderAnisotropic");
mFSAASamples = gSavedSettings.getU32("RenderFSAASamples");
mGamma = gSavedSettings.getF32("RenderGamma");
mVideoCardMem = gSavedSettings.getS32("TextureMemory");
mFogRatio = gSavedSettings.getF32("RenderFogRatio");
mProbeHardwareOnStartup = gSavedSettings.getBOOL("ProbeHardwareOnStartup");
childSetValue("fsaa", (LLSD::Integer) mFSAASamples);
refreshEnabledState();
}
void LLFloaterHardwareSettings::refreshEnabledState()
{
S32 min_tex_mem = LLViewerTextureList::getMinVideoRamSetting();
S32 max_tex_mem = LLViewerTextureList::getMaxVideoRamSetting();
childSetMinValue("GrapicsCardTextureMemory", min_tex_mem);
childSetMaxValue("GrapicsCardTextureMemory", max_tex_mem);
mLastVBOState = LLVertexBuffer::sEnableVBOs;
if (!LLFeatureManager::getInstance()->isFeatureAvailable("RenderVBOEnable") ||
!gGLManager.mHasVertexBufferObject)
{
childSetEnabled("vbo", FALSE);
//Streaming VBOs -Shyotl
childSetEnabled("vbo_stream", FALSE);
}
else
{
childSetEnabled("vbo_stream", LLVertexBuffer::sEnableVBOs);
}
childSetEnabled("fbo",gGLManager.mHasFramebufferObject && !LLPipeline::sRenderDeferred);
// if no windlight shaders, turn off nighttime brightness, gamma, and fog distance
childSetEnabled("gamma", !gPipeline.canUseWindLightShaders());
childSetEnabled("(brightness, lower is brighter)", !gPipeline.canUseWindLightShaders());
childSetEnabled("fog", !gPipeline.canUseWindLightShaders());
}
// static instance of it
LLFloaterHardwareSettings* LLFloaterHardwareSettings::instance()
{
if (!sHardwareSettings)
{
sHardwareSettings = new LLFloaterHardwareSettings();
sHardwareSettings->close();
}
return sHardwareSettings;
}
void LLFloaterHardwareSettings::show()
{
LLFloaterHardwareSettings* hardSettings = instance();
hardSettings->refresh();
hardSettings->center();
// comment in if you want the menu to rebuild each time
//LLUICtrlFactory::getInstance()->buildFloater(hardSettings, "floater_hardware_settings.xml");
//hardSettings->initCallbacks();
hardSettings->open();
}
bool LLFloaterHardwareSettings::isOpen()
{
if (sHardwareSettings != NULL)
{
return true;
}
return false;
}
// virtual
void LLFloaterHardwareSettings::onClose(bool app_quitting)
{
if (sHardwareSettings)
{
sHardwareSettings->setVisible(FALSE);
}
}
// virtual
void LLFloaterHardwareSettings::draw()
{
if(mLastVBOState == !LLVertexBuffer::sEnableVBOs)
refreshEnabledState();
LLFloater::draw();
}
//============================================================================
BOOL LLFloaterHardwareSettings::postBuild()
{
childSetAction("OK", onBtnOK, this);
refresh();
return TRUE;
}
void LLFloaterHardwareSettings::apply()
{
//Still do a bit of voodoo here. V2 forces restart to change FSAA with FBOs off.
//Let's not do that, and instead do pre-V2 FSAA change handling for that particular case
if(!LLRenderTarget::sUseFBO && (mFSAASamples != (U32)childGetValue("fsaa").asInteger()))
{
BOOL logged_in = (LLStartUp::getStartupState() >= STATE_STARTED);
LLWindow* window = gViewerWindow->getWindow();
LLCoordScreen size;
window->getSize(&size);
gViewerWindow->changeDisplaySettings(window->getFullscreen(),
size,
gSavedSettings.getBOOL("DisableVerticalSync"),
logged_in);
}
refresh();
}
void LLFloaterHardwareSettings::cancel()
{
gSavedSettings.setBOOL("RenderVBOEnable", mUseVBO);
gSavedSettings.setBOOL("RenderUseFBO", mUseFBO);
gSavedSettings.setBOOL("RenderAnisotropic", mUseAniso);
gSavedSettings.setU32("RenderFSAASamples", mFSAASamples);
gSavedSettings.setF32("RenderGamma", mGamma);
gSavedSettings.setS32("TextureMemory", mVideoCardMem);
gSavedSettings.setF32("RenderFogRatio", mFogRatio);
gSavedSettings.setBOOL("ProbeHardwareOnStartup", mProbeHardwareOnStartup );
close();
}
// static
void LLFloaterHardwareSettings::onBtnOK( void* userdata )
{
LLFloaterHardwareSettings *fp =(LLFloaterHardwareSettings *)userdata;
fp->apply();
fp->close(false);
}

110
indra/newview/llfloaterhardwaresettings.h
View File

@@ -1,110 +0,0 @@
/**
* @file llfloaterhardwaresettings.h
* @brief Menu of all the different graphics hardware settings
*
* $LicenseInfo:firstyear=2001&license=viewergpl$
*
* Copyright (c) 2001-2009, Linden Research, Inc.
*
* Second Life Viewer Source Code
* The source code in this file ("Source Code") is provided by Linden Lab
* to you under the terms of the GNU General Public License, version 2.0
* ("GPL"), unless you have obtained a separate licensing agreement
* ("Other License"), formally executed by you and Linden Lab. Terms of
* the GPL can be found in doc/GPL-license.txt in this distribution, or
* online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
*
* There are special exceptions to the terms and conditions of the GPL as
* it is applied to this Source Code. View the full text of the exception
* in the file doc/FLOSS-exception.txt in this software distribution, or
* online at
* http://secondlifegrid.net/programs/open_source/licensing/flossexception
*
* By copying, modifying or distributing this software, you acknowledge
* that you have read and understood your obligations described above,
* and agree to abide by those obligations.
*
* ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
* WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
* COMPLETENESS OR PERFORMANCE.
* $/LicenseInfo$
*/
#ifndef LL_LLFLOATER_HARDWARE_SETTINGS_H
#define LL_LLFLOATER_HARDWARE_SETTINGS_H
#include "llfloater.h"
class LLSliderCtrl;
/// Menuing system for all of windlight's functionality
class LLFloaterHardwareSettings : public LLFloater
{
friend class LLPreferenceCore;
public:
LLFloaterHardwareSettings();
virtual ~LLFloaterHardwareSettings();
virtual BOOL postBuild();
/// initialize all the callbacks for the menu
void initCallbacks(void);
/// one and one instance only
static LLFloaterHardwareSettings* instance();
/// callback for the menus help button
static void onClickHelp(void* data);
/// OK button
static void onBtnOK( void* userdata );
//// menu management
/// show off our menu
static void show();
/// return if the menu exists or not
static bool isOpen();
/// stuff to do on exit
virtual void onClose(bool app_quitting);
/// sync up menu with parameters
void refresh();
/// Draw the panel...
void draw();
/// Apply the changed values.
void apply();
/// don't apply the changed values
void cancel();
/// refresh the enabled values
void refreshEnabledState();
protected:
LLSliderCtrl* mCtrlVideoCardMem;
//Retained values for cancel/reset
BOOL mUseVBO;
BOOL mUseFBO;
BOOL mUseAniso;
U32 mFSAASamples;
F32 mGamma;
S32 mVideoCardMem;
F32 mFogRatio;
BOOL mProbeHardwareOnStartup;
bool mLastVBOState; //track changes to LLVertexBuffer::sEnableVBOs every frame. Bleh.
private:
// one instance on the inside
static LLFloaterHardwareSettings* sHardwareSettings;
};
#endif

30
indra/newview/llfloaterland.cpp
View File

@@ -80,6 +80,7 @@
#include "llviewercontrol.h"
#include "roles_constants.h"
#include "llworld.h"
#include "lltrans.h"
#include "hippogridmanager.h"
@@ -1498,7 +1499,7 @@ void LLPanelLandObjects::onClickRefresh(void* userdata)
// ready the list for results
self->mOwnerList->deleteAllItems();
self->mOwnerList->addCommentText(std::string("Searching...")); // *TODO: Translate
self->mOwnerList->addCommentText(LLTrans::getString("Searching"));
self->mOwnerList->setEnabled(FALSE);
self->mFirstReply = TRUE;
@@ -1612,7 +1613,7 @@ void LLPanelLandObjects::processParcelObjectOwnersReply(LLMessageSystem *msg, vo
// check for no results
if (0 == self->mOwnerList->getItemCount())
{
self->mOwnerList->addCommentText(std::string("None found.")); // *TODO: Translate
self->mOwnerList->addCommentText(LLTrans::getString("None_found"));
}
else
{
@@ -2446,7 +2447,6 @@ void LLPanelLandAccess::refresh()
childSetToolTipArg("AccessList", "[LISTED]", llformat("%d",count));
childSetToolTipArg("AccessList", "[MAX]", llformat("%d",PARCEL_MAX_ACCESS_LIST));
// *TODO: Translate
for (access_map_const_iterator cit = parcel->mAccessList.begin();
cit != parcel->mAccessList.end(); ++cit)
{
@@ -2460,19 +2460,23 @@ void LLPanelLandAccess::refresh()
suffix.assign(" (");
if (seconds >= 120)
{
std::string buf = llformat("%d minutes", (seconds/60));
std::string buf = llformat("%d ", (seconds/60)) + getString("minutes");
suffix.append(buf);
}
else if (seconds >= 60)
{
suffix.append("1 minute");
suffix.append(getString("1_minute"));
}
else if (seconds == 1)
{
suffix.append(getString("1_second"));
}
else
{
std::string buf = llformat("%d seconds", seconds);
std::string buf = llformat("%d ", seconds) + getString("seconds");
suffix.append(buf);
}
suffix.append(" remaining)");
suffix.append(" " + getString("remaining") + ")");
}
if (mListAccess)
mListAccess->addNameItem(entry.mID, ADD_SORTED, TRUE, suffix);
@@ -2499,19 +2503,23 @@ void LLPanelLandAccess::refresh()
suffix.assign(" (");
if (seconds >= 120)
{
std::string buf = llformat("%d minutes", (seconds/60));
std::string buf = llformat("%d ", (seconds/60)) + getString("minutes");
suffix.append(buf);
}
else if (seconds >= 60)
{
suffix.append("1 minute");
suffix.append(getString("1_minute"));
}
else if (seconds == 1)
{
suffix.append(getString("1_second"));
}
else
{
std::string buf = llformat("%d seconds", seconds);
std::string buf = llformat("%d ", seconds) + getString("seconds");
suffix.append(buf);
}
suffix.append(" remaining)");
suffix.append(" " + getString("remaining") + ")");
}
mListBanned->addNameItem(entry.mID, ADD_SORTED, TRUE, suffix);
}

8
indra/newview/llfloaterpreference.cpp
View File

@@ -78,7 +78,6 @@
#include "llviewerwindow.h"
#include "llkeyboard.h"
#include "llscrollcontainer.h"
#include "llfloaterhardwaresettings.h"
#include "hippopanelgrids.h"
const S32 PREF_BORDER = 4;
@@ -303,9 +302,6 @@ void LLPreferenceCore::apply()
mPrefsAscentSys->apply();
mPrefsAscentVan->apply();
// hardware menu apply
LLFloaterHardwareSettings::instance()->apply();
mWebPanel->apply();
}
@@ -327,9 +323,6 @@ void LLPreferenceCore::cancel()
mPrefsAscentSys->cancel();
mPrefsAscentVan->cancel();
// cancel hardware menu
LLFloaterHardwareSettings::instance()->cancel();
mWebPanel->cancel();
}
@@ -349,7 +342,6 @@ void LLPreferenceCore::setPersonalInfo(const std::string& visibility, bool im_vi
void LLPreferenceCore::refreshEnabledGraphics()
{
LLFloaterHardwareSettings::instance()->refreshEnabledState();
mDisplayPanel->refreshEnabledState();
}

83
indra/newview/llfloaterproperties.cpp
View File

@@ -197,9 +197,12 @@ LLFloaterProperties::LLFloaterProperties(const std::string& name, const LLRect&
// owner permissions
// Permissions debug text
// group permissions
childSetCommitCallback("CheckShareWithGroup",&onCommitPermissions, this);
childSetCommitCallback("CheckGroupCopy",&onCommitPermissions, this);
childSetCommitCallback("CheckGroupMod",&onCommitPermissions, this);
childSetCommitCallback("CheckGroupMove",&onCommitPermissions, this);
// everyone permissions
childSetCommitCallback("CheckEveryoneCopy",&onCommitPermissions, this);
childSetCommitCallback("CheckEveryoneMove",&onCommitPermissions, this);
// next owner permissions
childSetCommitCallback("CheckNextOwnerModify",&onCommitPermissions, this);
childSetCommitCallback("CheckNextOwnerCopy",&onCommitPermissions, this);
@@ -261,8 +264,11 @@ void LLFloaterProperties::refresh()
"CheckOwnerModify",
"CheckOwnerCopy",
"CheckOwnerTransfer",
"CheckShareWithGroup",
"CheckGroupCopy",
"CheckGroupMod",
"CheckGroupMove",
"CheckEveryoneCopy",
"CheckEveryoneMove",
"CheckNextOwnerModify",
"CheckNextOwnerCopy",
"CheckNextOwnerTransfer",
@@ -530,13 +536,23 @@ void LLFloaterProperties::refreshFromItem(LLInventoryItem* item)
// Check for ability to change values.
if (!is_link && is_obj_modify && can_agent_manipulate)
{
childSetEnabled("CheckShareWithGroup",TRUE);
childSetEnabled("GroupLabel", true);
childSetEnabled("CheckGroupCopy",owner_mask & PERM_TRANSFER);
childSetEnabled("CheckGroupMod", owner_mask & PERM_MODIFY);
childSetEnabled("CheckGroupMove", true);
childSetEnabled("EveryoneLabel", true);
childSetEnabled("CheckEveryoneCopy",(owner_mask & PERM_COPY) && (owner_mask & PERM_TRANSFER));
childSetEnabled("CheckEveryoneMove",true);
}
else
{
childSetEnabled("CheckShareWithGroup",FALSE);
childSetEnabled("GroupLabel", false);
childSetEnabled("CheckGroupCopy", false);
childSetEnabled("CheckGroupMod", false);
childSetEnabled("CheckGroupMove", false);
childSetEnabled("EveryoneLabel", false);
childSetEnabled("CheckEveryoneCopy",FALSE);
childSetEnabled("CheckEveryoneMove",false);
}
// Set values.
@@ -544,36 +560,12 @@ void LLFloaterProperties::refreshFromItem(LLInventoryItem* item)
BOOL is_group_modify = (group_mask & PERM_MODIFY) ? TRUE : FALSE;
BOOL is_group_move = (group_mask & PERM_MOVE) ? TRUE : FALSE;
if (is_group_copy && is_group_modify && is_group_move)
{
childSetValue("CheckShareWithGroup",LLSD((BOOL)TRUE));
LLCheckBoxCtrl* ctl = getChild<LLCheckBoxCtrl>("CheckShareWithGroup");
if(ctl)
{
ctl->setTentative(FALSE);
}
}
else if (!is_group_copy && !is_group_modify && !is_group_move)
{
childSetValue("CheckShareWithGroup",LLSD((BOOL)FALSE));
LLCheckBoxCtrl* ctl = getChild<LLCheckBoxCtrl>("CheckShareWithGroup");
if(ctl)
{
ctl->setTentative(FALSE);
}
}
else
{
LLCheckBoxCtrl* ctl = getChild<LLCheckBoxCtrl>("CheckShareWithGroup");
if(ctl)
{
ctl->setTentative(TRUE);
ctl->set(TRUE);
}
}
childSetValue("CheckGroupCopy", is_group_copy);
childSetValue("CheckGroupMod", is_group_modify);
childSetValue("CheckGroupMove", is_group_move);
childSetValue("CheckEveryoneCopy",LLSD((BOOL)(everyone_mask & PERM_COPY)));
childSetValue("CheckEveryoneMove",LLSD((BOOL)(everyone_mask & PERM_MOVE)));
///////////////
// SALE INFO //
@@ -762,13 +754,30 @@ void LLFloaterProperties::onCommitPermissions(LLUICtrl* ctrl, void* data)
LLPermissions perm(item->getPermissions());
LLCheckBoxCtrl* CheckShareWithGroup = self->getChild<LLCheckBoxCtrl>("CheckShareWithGroup");
if(CheckShareWithGroup)
LLCheckBoxCtrl* CheckGroupCopy = self->getChild<LLCheckBoxCtrl>("CheckGroupCopy");
if(CheckGroupCopy)
{
perm.setGroupBits(gAgent.getID(), gAgent.getGroupID(),
CheckShareWithGroup->get(),
PERM_MODIFY | PERM_MOVE | PERM_COPY);
CheckGroupCopy->get(), PERM_COPY);
}
LLCheckBoxCtrl* CheckGroupMod = self->getChild<LLCheckBoxCtrl>("CheckGroupMod");
if(CheckGroupMod)
{
perm.setGroupBits(gAgent.getID(), gAgent.getGroupID(),
CheckGroupMod->get(), PERM_MODIFY);
}
LLCheckBoxCtrl* CheckGroupMove = self->getChild<LLCheckBoxCtrl>("CheckGroupMove");
if(CheckGroupMove)
{
perm.setGroupBits(gAgent.getID(), gAgent.getGroupID(),
CheckGroupMove->get(), PERM_MOVE);
}
LLCheckBoxCtrl* CheckEveryoneMove = self->getChild<LLCheckBoxCtrl>("CheckEveryoneMove");
if(CheckEveryoneMove)
{
perm.setEveryoneBits(gAgent.getID(), gAgent.getGroupID(),
CheckEveryoneMove->get(), PERM_MOVE);
}
LLCheckBoxCtrl* CheckEveryoneCopy = self->getChild<LLCheckBoxCtrl>("CheckEveryoneCopy");
if(CheckEveryoneCopy)

9
indra/newview/llfolderview.cpp
View File

@@ -959,11 +959,16 @@ void LLFolderView::draw()
static LLCachedControl<LLColor4> sSearchStatusColor(gColors, "InventorySearchStatusColor", LLColor4::white );
if (LLInventoryModelBackgroundFetch::instance().folderFetchActive() || mCompletedFilterGeneration < mFilter->getMinRequiredGeneration())
{
mStatusText = std::string("Searching..."); // *TODO:translate
mStatusText = LLTrans::getString("Searching");
}
else
{
mStatusText = std::string("No matching items found in inventory."); // *TODO:translate
// if(getFilter())
// {
// LLStringUtil::format_map_t args;
// args["[SEARCH_TERM]"] = LLURI::escape(getFilter()->getFilterSubStringOrig());
mStatusText = LLTrans::getString("InventoryNoMatchingItems"); //, args);
// }
}
mStatusTextBox->setWrappedText(mStatusText);
mStatusTextBox->setVisible( TRUE );

21
indra/newview/llgroupnotify.cpp
View File

@@ -48,6 +48,7 @@
#include "llfloatergroupinfo.h"
#include "llinventoryicon.h"
#include "llinventory.h"
#include "lltrans.h"
#include "llglheaders.h"
#include "llagent.h"
@@ -143,14 +144,14 @@ LLGroupNotifyBox::LLGroupNotifyBox(const std::string& subject,
};
// Title
addChild(new NoticeText(std::string("title"),LLRect(x,y,RIGHT - HPAD,y - LINE_HEIGHT),std::string("Group Notice"),LLFontGL::getFontSansSerifHuge()));
addChild(new NoticeText(std::string("title"),LLRect(x,y,RIGHT - HPAD,y - LINE_HEIGHT),LLTrans::getString("GroupNotifyGroupNotice"),LLFontGL::getFontSansSerifHuge()));
y -= llfloor(1.5f*LINE_HEIGHT);
x += HPAD + HPAD + ICON_WIDTH;
std::stringstream from;
from << "Sent by " << from_name << ", " << group_name;
from << LLTrans::getString("GroupNotifySentBy") << " " + from_name << LLTrans::getString(",") + " " << group_name;
addChild(new NoticeText(std::string("group"),LLRect(x,y,RIGHT - HPAD,y - LINE_HEIGHT),from.str(),LLFontGL::getFontSansSerif()));
@@ -216,7 +217,7 @@ LLGroupNotifyBox::LLGroupNotifyBox(const std::string& subject,
if (mHasInventory)
{
addChild(new NoticeText(std::string("subjecttitle"),LLRect(x,y,x + LABEL_WIDTH,y - LINE_HEIGHT),std::string("Attached: "),LLFontGL::getFontSansSerif()));
addChild(new NoticeText(std::string("subjecttitle"),LLRect(x,y,x + LABEL_WIDTH,y - LINE_HEIGHT),LLTrans::getString("GroupNotifyAttached"),LLFontGL::getFontSansSerif()));
LLUIImagePtr item_icon = LLInventoryIcon::getIcon(mInventoryOffer->mType,
LLInventoryType::IT_TEXTURE,
@@ -244,7 +245,7 @@ LLGroupNotifyBox::LLGroupNotifyBox(const std::string& subject,
}
LLButton* btn;
btn = new LLButton(std::string("next"),
btn = new LLButton(LLTrans::getString("next"),
LLRect(getRect().getWidth()-26, BOTTOM_PAD + 20, getRect().getWidth()-2, BOTTOM_PAD),
std::string("notify_next.png"),
std::string("notify_next.png"),
@@ -252,7 +253,7 @@ LLGroupNotifyBox::LLGroupNotifyBox(const std::string& subject,
onClickNext,
this,
LLFontGL::getFontSansSerif());
btn->setToolTip(std::string("Next")); // *TODO: Translate
btn->setToolTip(LLTrans::getString("next"));
btn->setScaleImage(TRUE);
addChild(btn);
mNextBtn = btn;
@@ -267,7 +268,7 @@ LLGroupNotifyBox::LLGroupNotifyBox(const std::string& subject,
btn_width,
BTN_HEIGHT);
btn = new LLButton(std::string("OK"), btn_rect, LLStringUtil::null, onClickOk, this);
btn = new LLButton(LLTrans::getString("ok"), btn_rect, LLStringUtil::null, onClickOk, this);
addChild(btn, -1);
setDefaultBtn(btn);
@@ -279,8 +280,8 @@ LLGroupNotifyBox::LLGroupNotifyBox(const std::string& subject,
wide_btn_width,
BTN_HEIGHT);
btn = new LLButton(std::string("Group Notices"), btn_rect, LLStringUtil::null, onClickGroupInfo, this);
btn->setToolTip(std::string("View past notices or opt-out of receiving these messages here.")); // TODO: Translate
btn = new LLButton(LLTrans::getString("GroupNotifyGroupNotices"), btn_rect, LLStringUtil::null, onClickGroupInfo, this);
btn->setToolTip(LLTrans::getString("GroupNotifyViewPastNotices"));
addChild(btn, -1);
if (mHasInventory)
@@ -295,11 +296,11 @@ LLGroupNotifyBox::LLGroupNotifyBox(const std::string& subject,
std::string btn_lbl("");
if(is_openable(mInventoryOffer->mType))
{
btn_lbl = "Open Attachment";
btn_lbl = LLTrans::getString("GroupNotifyOpenAttachment");
}
else
{
btn_lbl = "Save Attachment";
btn_lbl = LLTrans::getString("GroupNotifySaveAttachment");
}
mSaveInventoryBtn = new LLButton(btn_lbl, btn_rect, LLStringUtil::null, onClickSaveInventory, this);
mSaveInventoryBtn->setVisible(mHasInventory);

76
indra/newview/llinventoryfilter.cpp
View File

@@ -665,133 +665,156 @@ const std::string& LLInventoryFilter::getFilterText()
if (isFilterObjectTypesWith(LLInventoryType::IT_ANIMATION))
{
filtered_types += " Animations,";
//filtered_types += " Animations,";
filtered_types += LLTrans::getString("Animations");
filtered_by_type = TRUE;
num_filter_types++;
}
else
{
not_filtered_types += " Animations,";
//not_filtered_types += " Animations,";
not_filtered_types += LLTrans::getString("Animations");
filtered_by_all_types = FALSE;
}
if (isFilterObjectTypesWith(LLInventoryType::IT_CALLINGCARD))
{
filtered_types += " Calling Cards,";
//filtered_types += " Calling Cards,";
filtered_types += LLTrans::getString("Calling Cards");
filtered_by_type = TRUE;
num_filter_types++;
}
else
{
not_filtered_types += " Calling Cards,";
//not_filtered_types += " Calling Cards,";
not_filtered_types += LLTrans::getString("Calling Cards");
filtered_by_all_types = FALSE;
}
if (isFilterObjectTypesWith(LLInventoryType::IT_WEARABLE))
{
filtered_types += " Clothing,";
//filtered_types += " Clothing,";
filtered_types += LLTrans::getString("Clothing");
filtered_by_type = TRUE;
num_filter_types++;
}
else
{
not_filtered_types += " Clothing,";
//not_filtered_types += " Clothing,";
not_filtered_types += LLTrans::getString("Clothing");
filtered_by_all_types = FALSE;
}
if (isFilterObjectTypesWith(LLInventoryType::IT_GESTURE))
{
filtered_types += " Gestures,";
//filtered_types += " Gestures,";
filtered_types += LLTrans::getString("Gestures");
filtered_by_type = TRUE;
num_filter_types++;
}
else
{
not_filtered_types += " Gestures,";
//not_filtered_types += " Gestures,";
not_filtered_types += LLTrans::getString("Gestures");
filtered_by_all_types = FALSE;
}
if (isFilterObjectTypesWith(LLInventoryType::IT_LANDMARK))
{
filtered_types += " Landmarks,";
//filtered_types += " Landmarks,";
filtered_types += LLTrans::getString("Landmarks");
filtered_by_type = TRUE;
num_filter_types++;
}
else
{
not_filtered_types += " Landmarks,";
//not_filtered_types += " Landmarks,";
not_filtered_types += LLTrans::getString("Landmarks");
filtered_by_all_types = FALSE;
}
if (isFilterObjectTypesWith(LLInventoryType::IT_NOTECARD))
{
filtered_types += " Notecards,";
//filtered_types += " Notecards,";
filtered_types += LLTrans::getString("Notecards");
filtered_by_type = TRUE;
num_filter_types++;
}
else
{
not_filtered_types += " Notecards,";
//not_filtered_types += " Notecards,";
not_filtered_types += LLTrans::getString("Notecards");
filtered_by_all_types = FALSE;
}
if (isFilterObjectTypesWith(LLInventoryType::IT_OBJECT) && isFilterObjectTypesWith(LLInventoryType::IT_ATTACHMENT))
{
filtered_types += " Objects,";
//filtered_types += " Objects,";
filtered_types += LLTrans::getString("Objects");
filtered_by_type = TRUE;
num_filter_types++;
}
else
{
not_filtered_types += " Objects,";
//not_filtered_types += " Objects,";
not_filtered_types += LLTrans::getString("Objects");
filtered_by_all_types = FALSE;
}
if (isFilterObjectTypesWith(LLInventoryType::IT_LSL))
{
filtered_types += " Scripts,";
//filtered_types += " Scripts,";
filtered_types += LLTrans::getString("Scripts");
filtered_by_type = TRUE;
num_filter_types++;
}
else
{
not_filtered_types += " Scripts,";
//not_filtered_types += " Scripts,";
not_filtered_types += LLTrans::getString("Scripts");
filtered_by_all_types = FALSE;
}
if (isFilterObjectTypesWith(LLInventoryType::IT_SOUND))
{
filtered_types += " Sounds,";
//filtered_types += " Sounds,";
filtered_types += LLTrans::getString("Sounds");
filtered_by_type = TRUE;
num_filter_types++;
}
else
{
not_filtered_types += " Sounds,";
//not_filtered_types += " Sounds,";
not_filtered_types += LLTrans::getString("Sounds");
filtered_by_all_types = FALSE;
}
if (isFilterObjectTypesWith(LLInventoryType::IT_TEXTURE))
{
filtered_types += " Textures,";
//filtered_types += " Textures,";
filtered_types += LLTrans::getString("Textures");
filtered_by_type = TRUE;
num_filter_types++;
}
else
{
not_filtered_types += " Textures,";
//not_filtered_types += " Textures,";
not_filtered_types += LLTrans::getString("Textures");
filtered_by_all_types = FALSE;
}
if (isFilterObjectTypesWith(LLInventoryType::IT_SNAPSHOT))
{
filtered_types += " Snapshots,";
//filtered_types += " Snapshots,";
filtered_types += LLTrans::getString("Snapshots");
filtered_by_type = TRUE;
num_filter_types++;
}
else
{
not_filtered_types += " Snapshots,";
//not_filtered_types += " Snapshots,";
not_filtered_types += LLTrans::getString("Snapshots");
filtered_by_all_types = FALSE;
}
@@ -806,7 +829,8 @@ const std::string& LLInventoryFilter::getFilterText()
}
else
{
mFilterText += "No ";
//mFilterText += "No ";
mFilterText += LLTrans::getString("No Filters");
mFilterText += not_filtered_types;
}
// remove the ',' at the end
@@ -815,12 +839,14 @@ const std::string& LLInventoryFilter::getFilterText()
if (isSinceLogoff())
{
mFilterText += " - Since Logoff";
//mFilterText += " - Since Logoff";
mFilterText += LLTrans::getString("Since Logoff");
}
if (getFilterWorn())
{
mFilterText += " - Worn";
//mFilterText += " - Worn";
mFilterText += LLTrans::getString("Worn");
}
return mFilterText;

42
indra/newview/llmaniprotate.cpp
View File

@@ -65,6 +65,7 @@
#include "pipeline.h"
#include "lldrawable.h"
#include "llglheaders.h"
#include "lltrans.h"
const F32 RADIUS_PIXELS = 100.f; // size in screen space
const F32 SQ_RADIUS = RADIUS_PIXELS * RADIUS_PIXELS;
@@ -152,6 +153,7 @@ void LLManipRotate::render()
gGL.pushMatrix();
{
// are we in the middle of a constrained drag?
if (mManipPart >= LL_ROT_X && mManipPart <= LL_ROT_Z)
{
@@ -292,6 +294,7 @@ void LLManipRotate::render()
// First pass: centers. Second pass: sides.
for( S32 i=0; i<2; i++ )
{
gGL.pushMatrix();
{
if (mHighlightedPart == LL_ROT_Z)
@@ -350,6 +353,7 @@ void LLManipRotate::render()
{
mManipulatorScales = lerp(mManipulatorScales, LLVector4(1.f, 1.f, 1.f, SELECTED_MANIPULATOR_SCALE), LLCriticalDamp::getInterpolant(MANIPULATOR_SCALE_HALF_LIFE));
}
}
}
@@ -363,6 +367,7 @@ void LLManipRotate::render()
gGL.popMatrix();
gGL.popMatrix();
LLVector3 euler_angles;
LLQuaternion object_rot = first_object->getRotationEdit();
object_rot.getEulerAngles(&(euler_angles.mV[VX]), &(euler_angles.mV[VY]), &(euler_angles.mV[VZ]));
@@ -933,7 +938,6 @@ void LLManipRotate::renderSnapGuides()
}
gGL.end();
// *TODO: Translate
//RN: text rendering does own shadow pass, so only render once
if (pass == 1 && render_text && i % 16 == 0)
{
@@ -941,32 +945,32 @@ void LLManipRotate::renderSnapGuides()
{
if (i == 0)
{
renderTickText(text_point, mObjectSelection->isAttachment() ? std::string("Forward") : std::string("East"), LLColor4::white);
renderTickText(text_point, LLTrans::getString(mObjectSelection->isAttachment() ? "Direction_Forward" : "Direction_East"), LLColor4::white);
}
else if (i == 16)
{
if (constraint_axis.mV[VZ] > 0.f)
{
renderTickText(text_point, mObjectSelection->isAttachment() ? std::string("Left") : std::string("North"), LLColor4::white);
renderTickText(text_point, LLTrans::getString(mObjectSelection->isAttachment() ? "Direction_Left" : "Direction_North"), LLColor4::white);
}
else
{
renderTickText(text_point, mObjectSelection->isAttachment() ? std::string("Right") : std::string("South"), LLColor4::white);
renderTickText(text_point, LLTrans::getString(mObjectSelection->isAttachment() ? "Direction_Right" : "Direction_South"), LLColor4::white);
}
}
else if (i == 32)
{
renderTickText(text_point, mObjectSelection->isAttachment() ? std::string("Back") : std::string("West"), LLColor4::white);
renderTickText(text_point, LLTrans::getString(mObjectSelection->isAttachment() ? "Direction_Back" : "Direction_West"), LLColor4::white);
}
else
{
if (constraint_axis.mV[VZ] > 0.f)
{
renderTickText(text_point, mObjectSelection->isAttachment() ? std::string("Right") : std::string("South"), LLColor4::white);
renderTickText(text_point, LLTrans::getString(mObjectSelection->isAttachment() ? "Direction_Right" : "Direction_South"), LLColor4::white);
}
else
{
renderTickText(text_point, mObjectSelection->isAttachment() ? std::string("Left") : std::string("North"), LLColor4::white);
renderTickText(text_point, LLTrans::getString(mObjectSelection->isAttachment() ? "Direction_Left" : "Direction_North"), LLColor4::white);
}
}
}
@@ -974,32 +978,32 @@ void LLManipRotate::renderSnapGuides()
{
if (i == 0)
{
renderTickText(text_point, mObjectSelection->isAttachment() ? std::string("Left") : std::string("North"), LLColor4::white);
renderTickText(text_point, LLTrans::getString(mObjectSelection->isAttachment() ? "Direction_Left" : "Direction_North"), LLColor4::white);
}
else if (i == 16)
{
if (constraint_axis.mV[VX] > 0.f)
{
renderTickText(text_point, std::string("Up"), LLColor4::white);
renderTickText(text_point, LLTrans::getString("Direction_Up"), LLColor4::white);
}
else
{
renderTickText(text_point, std::string("Down"), LLColor4::white);
renderTickText(text_point, LLTrans::getString("Direction_Down"), LLColor4::white);
}
}
else if (i == 32)
{
renderTickText(text_point, mObjectSelection->isAttachment() ? std::string("Right") : std::string("South"), LLColor4::white);
renderTickText(text_point, LLTrans::getString(mObjectSelection->isAttachment() ? "Direction_Right" : "Direction_South"), LLColor4::white);
}
else
{
if (constraint_axis.mV[VX] > 0.f)
{
renderTickText(text_point, std::string("Down"), LLColor4::white);
renderTickText(text_point, LLTrans::getString("Direction_Down"), LLColor4::white);
}
else
{
renderTickText(text_point, std::string("Up"), LLColor4::white);
renderTickText(text_point, LLTrans::getString("Direction_Up"), LLColor4::white);
}
}
}
@@ -1007,32 +1011,32 @@ void LLManipRotate::renderSnapGuides()
{
if (i == 0)
{
renderTickText(text_point, std::string("Up"), LLColor4::white);
renderTickText(text_point, LLTrans::getString("Direction_Up"), LLColor4::white);
}
else if (i == 16)
{
if (constraint_axis.mV[VY] > 0.f)
{
renderTickText(text_point, mObjectSelection->isAttachment() ? std::string("Forward") : std::string("East"), LLColor4::white);
renderTickText(text_point, LLTrans::getString(mObjectSelection->isAttachment() ? "Direction_Forward" : "Direction_East"), LLColor4::white);
}
else
{
renderTickText(text_point, mObjectSelection->isAttachment() ? std::string("Back") : std::string("West"), LLColor4::white);
renderTickText(text_point, LLTrans::getString(mObjectSelection->isAttachment() ? "Direction_Back" : "Direction_West"), LLColor4::white);
}
}
else if (i == 32)
{
renderTickText(text_point, std::string("Down"), LLColor4::white);
renderTickText(text_point, LLTrans::getString("Direction_Down"), LLColor4::white);
}
else
{
if (constraint_axis.mV[VY] > 0.f)
{
renderTickText(text_point, mObjectSelection->isAttachment() ? std::string("Back") : std::string("West"), LLColor4::white);
renderTickText(text_point, LLTrans::getString(mObjectSelection->isAttachment() ? "Direction_Back" : "Direction_West"), LLColor4::white);
}
else
{
renderTickText(text_point, mObjectSelection->isAttachment() ? std::string("Forward") : std::string("East"), LLColor4::white);
renderTickText(text_point, LLTrans::getString(mObjectSelection->isAttachment() ? "Direction_Forward" : "Direction_East"), LLColor4::white);
}
}
}

2
indra/newview/llnotify.cpp
View File

@@ -327,7 +327,7 @@ LLNotifyBox::LLNotifyBox(LLNotificationPtr notification,
this,
sFont);
btn->setScaleImage(TRUE);
btn->setToolTip(std::string("Next")); // *TODO: Translate
btn->setToolTip(LLTrans::getString("next"));
addChild(btn);
mNextBtn = btn;

7
indra/newview/llpanelavatar.cpp
View File

@@ -320,7 +320,7 @@ void LLPanelAvatarSecondLife::processProperties(void* data, EAvatarProcessorType
// }
if (0 == pAvatarGroups->group_list.size())
{
group_list->addCommentText(std::string("None")); // *TODO: Translate
group_list->addCommentText(getString("None"));
}
for(LLAvatarGroups::group_list_t::const_iterator it = pAvatarGroups->group_list.begin();
@@ -571,11 +571,6 @@ BOOL LLPanelAvatarSecondLife::postBuild(void)
childSetVisible("online_yes",FALSE);
// These are cruft but may still exist in some xml files
// TODO: remove the following 2 lines once translators grab these changes
childSetVisible("online_unknown",FALSE);
childSetVisible("online_no",FALSE);
childSetAction("Find on Map", LLPanelAvatar::onClickTrack, getPanelAvatar());
childSetAction("Instant Message...", LLPanelAvatar::onClickIM, getPanelAvatar());
childSetAction("GroupInvite_Button", LLPanelAvatar::onClickGroupInvite, getPanelAvatar());

4
indra/newview/llpaneldirbrowser.cpp
View File

@@ -212,7 +212,7 @@ void LLPanelDirBrowser::updateResultCount()
// add none found response
if (list->getItemCount() == 0)
{
list->addCommentText(std::string("None found.")); // *TODO: Translate
list->addCommentText(LLTrans::getString("NoneFound"));
list->operateOnAll(LLCtrlListInterface::OP_DESELECT);
}
}
@@ -1222,7 +1222,7 @@ void LLPanelDirBrowser::setupNewSearch()
// ready the list for results
list->operateOnAll(LLCtrlListInterface::OP_DELETE);
list->addCommentText(std::string("Searching...")); // *TODO: Translate
list->addCommentText(LLTrans::getString("Searching"));
childDisable("results");
mResultsReceived = 0;

125
indra/newview/llpaneldisplay.cpp
View File

@@ -71,7 +71,6 @@
#include "lluictrlfactory.h"
#include "llfeaturemanager.h"
#include "llviewershadermgr.h"
#include "llfloaterhardwaresettings.h"
#include "llboost.h"
//RN temporary includes for resolution switching
@@ -111,9 +110,6 @@ BOOL LLPanelDisplay::postBuild()
// Help button
childSetAction("GraphicsPreferencesHelpButton", onOpenHelp, this);
// Hardware settings button
childSetAction("GraphicsHardwareButton", onOpenHardwareSettings, NULL);
//============================================================================
// Resolution
@@ -359,6 +355,9 @@ BOOL LLPanelDisplay::postBuild()
mShadowDetailText = getChild<LLTextBox>("ShadowDetailText");
mTerrainScaleText = getChild<LLTextBox>("TerrainScaleText");
// Hardware tab
childSetCommitCallback("vbo", &LLPanelDisplay::onRenderVBOEnable, this);
refresh();
return TRUE;
@@ -463,6 +462,17 @@ void LLPanelDisplay::refresh()
updateSliderText(mCtrlPostProcess, mPostProcessText);
updateSliderText(mCtrlSkyFactor, mSkyFactorText);
// Hardware tab
mUseVBO = gSavedSettings.getBOOL("RenderVBOEnable");
mUseFBO = gSavedSettings.getBOOL("RenderUseFBO");
mUseAniso = gSavedSettings.getBOOL("RenderAnisotropic");
mFSAASamples = gSavedSettings.getU32("RenderFSAASamples");
mGamma = gSavedSettings.getF32("RenderGamma");
mVideoCardMem = gSavedSettings.getS32("TextureMemory");
mFogRatio = gSavedSettings.getF32("RenderFogRatio");
childSetValue("fsaa", (LLSD::Integer) mFSAASamples);
refreshEnabledState();
}
@@ -503,10 +513,6 @@ void LLPanelDisplay::refreshEnabledState()
bool bumpshiny = gGLManager.mHasCubeMap && LLCubeMap::sUseCubeMaps && LLFeatureManager::getInstance()->isFeatureAvailable("RenderObjectBump");
mCtrlBumpShiny->setEnabled(bumpshiny ? TRUE : FALSE);
// Avatar Mode
S32 max_avatar_shader = LLViewerShaderMgr::instance()->mMaxAvatarShaderLevel;
mCtrlAvatarVP->setEnabled((max_avatar_shader > 0) ? TRUE : FALSE);
if (gSavedSettings.getBOOL("VertexShaderEnable") == FALSE ||
gSavedSettings.getBOOL("RenderAvatarVP") == FALSE)
{
@@ -517,6 +523,7 @@ void LLPanelDisplay::refreshEnabledState()
mCtrlAvatarCloth->setEnabled(true);
}
static LLCachedControl<bool> wlatmos("WindLightUseAtmosShaders",false);
//I actually recommend RenderUseFBO:FALSE for ati users when not using deferred, so RenderUseFBO shouldn't control visibility of the element.
// Instead, gGLManager.mHasFramebufferObject seems better as it is determined by hardware and not current user settings. -Shyotl
//Enabling deferred will force RenderUseFBO to TRUE.
@@ -524,13 +531,14 @@ void LLPanelDisplay::refreshEnabledState()
LLFeatureManager::getInstance()->isFeatureAvailable("RenderDeferred") && //Ensure it's enabled in the gpu feature table
LLFeatureManager::getInstance()->isFeatureAvailable("RenderAvatarVP") && //Hardware Skinning. Deferred forces RenderAvatarVP to true
LLFeatureManager::getInstance()->isFeatureAvailable("VertexShaderEnable") && gSavedSettings.getBOOL("VertexShaderEnable") && //Basic Shaders
LLFeatureManager::getInstance()->isFeatureAvailable("WindLightUseAtmosShaders") && gSavedSettings.getBOOL("WindLightUseAtmosShaders"); //Atmospheric Shaders
LLFeatureManager::getInstance()->isFeatureAvailable("WindLightUseAtmosShaders") && wlatmos; //Atmospheric Shaders
mCtrlDeferred->setEnabled(can_defer);
mCtrlShadowDetail->setEnabled(can_defer && gSavedSettings.getBOOL("RenderDeferred"));
mCtrlAmbientOcc->setEnabled(can_defer && gSavedSettings.getBOOL("RenderDeferred"));
mCtrlDeferredDoF->setEnabled(can_defer && gSavedSettings.getBOOL("RenderDeferred"));
static LLCachedControl<bool> render_deferred("RenderDeferred",false);
mCtrlShadowDetail->setEnabled(can_defer && render_deferred);
mCtrlAmbientOcc->setEnabled(can_defer && render_deferred);
mCtrlDeferredDoF->setEnabled(can_defer && render_deferred);
// Disable max non-impostors slider if avatar impostors are off
mCtrlNonImpostors->setEnabled(gSavedSettings.getBOOL("RenderUseImpostors"));
@@ -543,15 +551,15 @@ void LLPanelDisplay::refreshEnabledState()
mCtrlShaderEnable->setEnabled(fCtrlShaderEnable && (!gRlvHandler.hasBehaviour(RLV_BHVR_SETENV) || !mShaderEnable));
// [/RLVa:KB]
BOOL shaders = mCtrlShaderEnable->get();
bool shaders = mCtrlShaderEnable->get();
if (shaders)
{
mRadioTerrainDetail->setValue(1);
mRadioTerrainDetail->setEnabled(FALSE);
mRadioTerrainDetail->setEnabled(false);
}
else
{
mRadioTerrainDetail->setEnabled(TRUE);
mRadioTerrainDetail->setEnabled(true);
}
// *HACK just checks to see if we can use shaders...
@@ -563,9 +571,52 @@ void LLPanelDisplay::refreshEnabledState()
mCtrlWindLight->setEnabled(fCtrlWindLightEnable && (!gRlvHandler.hasBehaviour(RLV_BHVR_SETENV) || !mWindLight));
// [/RLVa:KB]
// turn off sky detail if atmostpherics isn't on
mCtrlSkyFactor->setEnabled(gSavedSettings.getBOOL("WindLightUseAtmosShaders"));
mSkyFactorText->setEnabled(gSavedSettings.getBOOL("WindLightUseAtmosShaders"));
// turn off sky detail if atmospherics isn't on
mCtrlSkyFactor->setEnabled(wlatmos);
mSkyFactorText->setEnabled(wlatmos);
// Avatar Mode and FBO
if (render_deferred && wlatmos && shaders)
{
childSetEnabled("fbo", false);
childSetValue("fbo", true);
mCtrlAvatarVP->setEnabled(false);
gSavedSettings.setBOOL("RenderAvatarVP", true);
}
else if (!shaders)
{
childSetEnabled("fbo", gGLManager.mHasFramebufferObject);
mCtrlAvatarVP->setEnabled(false);
gSavedSettings.setBOOL("RenderAvatarVP", false);
}
else
{
childSetEnabled("fbo", gGLManager.mHasFramebufferObject);
mCtrlAvatarVP->setEnabled(true);
}
// Hardware tab
S32 min_tex_mem = LLViewerTextureList::getMinVideoRamSetting();
S32 max_tex_mem = LLViewerTextureList::getMaxVideoRamSetting();
childSetMinValue("GrapicsCardTextureMemory", min_tex_mem);
childSetMaxValue("GrapicsCardTextureMemory", max_tex_mem);
if (!LLFeatureManager::getInstance()->isFeatureAvailable("RenderVBOEnable") ||
!gGLManager.mHasVertexBufferObject)
{
childSetEnabled("vbo", false);
//Streaming VBOs -Shyotl
childSetEnabled("vbo_stream", false);
}
else
{
childSetEnabled("vbo_stream", LLVertexBuffer::sEnableVBOs);
}
// if no windlight shaders, enable gamma, and fog distance
childSetEnabled("gamma",!wlatmos);
childSetEnabled("fog", !wlatmos);
childSetVisible("note", wlatmos);
// now turn off any features that are unavailable
disableUnavailableSettings();
@@ -812,6 +863,15 @@ void LLPanelDisplay::cancel()
gSavedSettings.setU32("WLSkyDetail", mSkyLOD);
gSavedSettings.setS32("RenderMaxPartCount", mParticleCount);
gSavedSettings.setS32("RenderGlowResolutionPow", mPostProcess);
// Hardware tab
gSavedSettings.setBOOL("RenderVBOEnable", mUseVBO);
gSavedSettings.setBOOL("RenderUseFBO", mUseFBO);
gSavedSettings.setBOOL("RenderAnisotropic", mUseAniso);
gSavedSettings.setU32("RenderFSAASamples", mFSAASamples);
gSavedSettings.setF32("RenderGamma", mGamma);
gSavedSettings.setS32("TextureMemory", mVideoCardMem);
gSavedSettings.setF32("RenderFogRatio", mFogRatio);
}
void LLPanelDisplay::apply()
@@ -823,6 +883,21 @@ void LLPanelDisplay::apply()
{
applyWindowSize();
}
// Hardware tab
//Still do a bit of voodoo here. V2 forces restart to change FSAA with FBOs off.
//Let's not do that, and instead do pre-V2 FSAA change handling for that particular case
if(!LLRenderTarget::sUseFBO && (mFSAASamples != (U32)childGetValue("fsaa").asInteger()))
{
bool logged_in = (LLStartUp::getStartupState() >= STATE_STARTED);
LLWindow* window = gViewerWindow->getWindow();
LLCoordScreen size;
window->getSize(&size);
gViewerWindow->changeDisplaySettings(window->getFullscreen(),
size,
gSavedSettings.getBOOL("DisableVerticalSync"),
logged_in);
}
}
void LLPanelDisplay::onChangeQuality(LLUICtrl *ctrl, void *data)
@@ -856,11 +931,6 @@ void LLPanelDisplay::onOpenHelp(void* user_data)
LLNotifications::instance().add(parent_floater->contextualNotification(xml_alert));
}
void LLPanelDisplay::onOpenHardwareSettings(void* user_data)
{
LLFloaterHardwareSettings::show();
}
void LLPanelDisplay::onApplyResolution(LLUICtrl* src, void* user_data)
{
((LLPanelDisplay*) src)->applyResolution();
@@ -1037,6 +1107,15 @@ void LLPanelDisplay::onVertexShaderEnable(LLUICtrl* self, void* data)
LLFloaterPreference::refreshEnabledGraphics();
}
//static
void LLPanelDisplay::onRenderVBOEnable(LLUICtrl* self, void* data)
{
LLPanelDisplay* panel = (LLPanelDisplay*)data;
bool enable = panel->childGetValue("vbo").asBoolean();
panel->childSetEnabled("vbo_stream", enable);
if(!enable) panel->childSetValue("vbo_stream", false);
}
void LLPanelDisplay::setHardwareDefaults(void* user_data)
{
LLFeatureManager::getInstance()->applyRecommendedSettings();

13
indra/newview/llpaneldisplay.h
View File

@@ -185,6 +185,15 @@ protected:
S32 mParticleCount;
S32 mPostProcess;
// Hardware tab
BOOL mUseVBO;
BOOL mUseFBO;
BOOL mUseAniso;
U32 mFSAASamples;
F32 mGamma;
S32 mVideoCardMem;
F32 mFogRatio;
static void setGraphicsSettings(LLControlGroup& group);
static void createGroup();
@@ -195,7 +204,6 @@ protected:
static void onChangeCustom(LLUICtrl *ctrl, void *data);
static void onOpenHelp(void *data);
static void onOpenHardwareSettings(void *data);
static void onCommitAutoDetectAspect(LLUICtrl *ctrl, void *data);
static void onKeystrokeAspectRatio(LLLineEditor* caller, void* user_data);
static void onSelectAspectRatio(LLUICtrl*, void*);
@@ -210,6 +218,9 @@ protected:
// callback for when client turns on shaders
static void onVertexShaderEnable(LLUICtrl*, void*);
// callbacks for hardware tab
static void onRenderVBOEnable(LLUICtrl*, void*);
// helper function
static void fractionFromDecimal(F32 decimal_val, S32& numerator, S32& denominator);
};

31
indra/newview/llpanelobjectinventory.cpp
View File

@@ -707,14 +707,13 @@ void LLTaskInvFVBridge::buildContextMenu(LLMenuGL& menu, U32 flags)
return;
}
// *TODO: Translate
if(gAgent.allowOperation(PERM_OWNER, item->getPermissions(),
GP_OBJECT_MANIPULATE)
&& item->getSaleInfo().isForSale())
{
items.push_back(std::string("Task Buy"));
std::string label("Buy");
std::string label= LLTrans::getString("Buy");
// Check the price of the item.
S32 price = getPrice();
if (-1 == price)
@@ -1072,13 +1071,12 @@ void LLTaskSoundBridge::buildContextMenu(LLMenuGL& menu, U32 flags)
std::vector<std::string> items;
std::vector<std::string> disabled_items;
// *TODO: Translate
if(item->getPermissions().getOwner() != gAgent.getID()
&& item->getSaleInfo().isForSale())
{
items.push_back(std::string("Task Buy"));
std::string label("Buy");
std::string label= LLTrans::getString("Buy");
// Check the price of the item.
S32 price = getPrice();
if (-1 == price)
@@ -1905,24 +1903,23 @@ void LLPanelObjectInventory::draw()
if(mIsInventoryEmpty)
{
// *TODO: Translate
if((LLUUID::null != mTaskUUID) && (!mHaveInventory))
{
LLFontGL::getFontSansSerif()->renderUTF8(std::string("Loading contents..."), 0,
(S32)(getRect().getWidth() * 0.5f),
10,
LLColor4( 1, 1, 1, 1 ),
LLFontGL::HCENTER,
LLFontGL::BOTTOM);
LLFontGL::getFontSansSerif()->renderUTF8(LLTrans::getString("LoadingContents"), 0,
(S32)(getRect().getWidth() * 0.5f),
10,
LLColor4( 1, 1, 1, 1 ),
LLFontGL::HCENTER,
LLFontGL::BOTTOM);
}
else if(mHaveInventory)
{
LLFontGL::getFontSansSerif()->renderUTF8(std::string("No contents"), 0,
(S32)(getRect().getWidth() * 0.5f),
10,
LLColor4( 1, 1, 1, 1 ),
LLFontGL::HCENTER,
LLFontGL::BOTTOM);
LLFontGL::getFontSansSerif()->renderUTF8(LLTrans::getString("NoContents"), 0,
(S32)(getRect().getWidth() * 0.5f),
10,
LLColor4( 1, 1, 1, 1 ),
LLFontGL::HCENTER,
LLFontGL::BOTTOM);
}
}
}

3
indra/newview/llprefsim.cpp
View File

@@ -53,8 +53,6 @@
#include "rlvhandler.h"
// [/RLVa:KB]
class AIDirPicker;
class LLPrefsIMImpl : public LLPanel
{
public:
@@ -269,6 +267,7 @@ void LLPrefsIMImpl::setPersonalInfo(const std::string& visibility, bool im_via_e
childEnable("log_chat_timestamp");
childEnable("log_chat_IM");
childEnable("log_date_timestamp");
childEnable("logfile_name_datestamp");
//RN: get wide string so replace char can work (requires fixed-width encoding)
LLWString busy_response = utf8str_to_wstring( gSavedPerAccountSettings.getString("BusyModeResponse") );

19
indra/newview/llpreviewscript.cpp
View File

@@ -1290,9 +1290,8 @@ LLPreviewLSL::LLPreviewLSL(const std::string& name, const LLRect& rect,
void LLPreviewLSL::callbackLSLCompileSucceeded()
{
llinfos << "LSL Bytecode saved" << llendl;
// *TODO: Translate
mScriptEd->mErrorList->addCommentText(std::string("Compile successful!"));
mScriptEd->mErrorList->addCommentText(std::string("Save complete."));
mScriptEd->mErrorList->addCommentText(LLTrans::getString("CompileSuccessful"));
mScriptEd->mErrorList->addCommentText(LLTrans::getString("SaveComplete"));
closeIfNeeded();
}
@@ -1890,9 +1889,8 @@ void LLLiveLSLEditor::callbackLSLCompileSucceeded(const LLUUID& task_id,
bool is_script_running)
{
lldebugs << "LSL Bytecode saved" << llendl;
// *TODO: Translate
mScriptEd->mErrorList->addCommentText(std::string("Compile successful!"));
mScriptEd->mErrorList->addCommentText(std::string("Save complete."));
mScriptEd->mErrorList->addCommentText(LLTrans::getString("CompileSuccessful"));
mScriptEd->mErrorList->addCommentText(LLTrans::getString("SaveComplete"));
closeIfNeeded();
}
@@ -2244,8 +2242,7 @@ void LLLiveLSLEditor::draw()
{
// HACK: Display this information in the title bar.
// Really ought to put in main window.
// *TODO: Translate
setTitle(std::string("Script (object out of range)"));
setTitle(LLTrans::getString("ObjectOutOfRange"));
runningCheckbox->setEnabled(FALSE);
// object may have fallen out of range.
mHaveRunningInfo = FALSE;
@@ -2468,8 +2465,7 @@ void LLLiveLSLEditor::uploadAssetLegacy(const std::string& filename,
else
{
llinfos << "Compile worked!" << llendl;
// *TODO: Translate
mScriptEd->mErrorList->addCommentText(std::string("Compile successful, saving..."));
mScriptEd->mErrorList->addCommentText(LLTrans::getString("CompileSuccessfulSaving"));
if(gAssetStorage)
{
llinfos << "LLLiveLSLEditor::saveAsset "
@@ -2543,8 +2539,7 @@ void LLLiveLSLEditor::onSaveBytecodeComplete(const LLUUID& asset_uuid, void* use
if(self)
{
// Tell the user that the compile worked.
// *TODO: Translate
self->mScriptEd->mErrorList->addCommentText(std::string("Save complete."));
self->mScriptEd->mErrorList->addCommentText(LLTrans::getString("SaveComplete"));
// close the window if this completes both uploads
self->getWindow()->decBusyCount();
self->mPendingUploads--;

23
indra/newview/llpreviewtexture.cpp
View File

@@ -39,6 +39,7 @@
#include "llcombobox.h"
#include "statemachine/aifilepicker.h"
#include "llfloaterinventory.h"
#include "llimagepng.h"
#include "llimagetga.h"
#include "llinventory.h"
#include "llnotificationsutil.h"
@@ -375,17 +376,27 @@ BOOL LLPreviewTexture::canSaveAs() const
return mIsCopyable && !mLoadingFullImage && mImage.notNull() && !mImage->isMissingAsset();
}
static bool sPng(false);
// virtual
void LLPreviewTexture::saveAs()
void LLPreviewTexture::saveAsType(BOOL png)
{
if( mLoadingFullImage )
return;
const LLViewerInventoryItem* item = getItem() ;
AIFilePicker* filepicker = AIFilePicker::create();
filepicker->open(item ? LLDir::getScrubbedFileName(item->getName()) + ".tga" : LLStringUtil::null, FFSAVE_TGA, "", "image");
filepicker->run(boost::bind(&LLPreviewTexture::saveAs_continued, this, item, filepicker));
sPng = png;
if(png)
{
filepicker->open(item ? LLDir::getScrubbedFileName(item->getName()) + ".png" : LLStringUtil::null, FFSAVE_PNG, "", "image");
filepicker->run(boost::bind(&LLPreviewTexture::saveAs_continued, this, item, filepicker));
}
else
{
filepicker->open(item ? LLDir::getScrubbedFileName(item->getName()) + ".tga" : LLStringUtil::null, FFSAVE_TGA, "", "image");
filepicker->run(boost::bind(&LLPreviewTexture::saveAs_continued, this, item, filepicker));
}
}
void LLPreviewTexture::saveAs_continued(LLViewerInventoryItem const* item, AIFilePicker* filepicker)
@@ -433,14 +444,16 @@ void LLPreviewTexture::onFileLoadedForSave(BOOL success,
if( self && final && success )
{
//FIXME: There has to be a better way
LLPointer<LLImagePNG> image_png = new LLImagePNG;
LLPointer<LLImageTGA> image_tga = new LLImageTGA;
if( !image_tga->encode( src ) )
if( sPng ? !image_png->encode( src, 0.0 ) : !image_tga->encode( src ) )
{
LLSD args;
args["FILE"] = self->mSaveFileName;
LLNotificationsUtil::add("CannotEncodeFile", args);
}
else if( !image_tga->save( self->mSaveFileName ) )
else if( sPng ? !image_png->save( self->mSaveFileName ) : !image_tga->save( self->mSaveFileName ) )
{
LLSD args;
args["FILE"] = self->mSaveFileName;

3
indra/newview/llpreviewtexture.h
View File

@@ -64,7 +64,8 @@ public:
virtual void draw();
virtual BOOL canSaveAs() const;
virtual void saveAs();
virtual void saveAs(){ saveAsType(false); }
void saveAsType(BOOL png);
void saveAs_continued(LLViewerInventoryItem const* item, AIFilePicker* filepicker);
virtual LLUUID getItemID();
virtual std::string getItemCreatorName();

5
indra/newview/llscrollingpanelparam.cpp
View File

@@ -77,9 +77,8 @@ LLScrollingPanelParam::LLScrollingPanelParam( const std::string& name,
mHintMin->setAllowsUpdates( FALSE );
mHintMax->setAllowsUpdates( FALSE );
// *TODO::translate
std::string min_name = param->getMinDisplayName();
std::string max_name = param->getMaxDisplayName();
std::string min_name = LLTrans::getString(param->getMinDisplayName());
std::string max_name = LLTrans::getString(param->getMaxDisplayName());
childSetValue("min param text", min_name);
childSetValue("max param text", max_name);
mLess = getChild<LLButton>("less");

7
indra/newview/llstatusbar.cpp
View File

@@ -122,6 +122,7 @@ static void onClickFly(void*);
static void onClickPush(void*);
static void onClickVoice(void*);
static void onClickBuild(void*);
static void onClickSeeAV(void*);
static void onClickScripts(void*);
static void onClickBuyLand(void*);
static void onClickScriptDebug(void*);
@@ -168,6 +169,7 @@ mSquareMetersCommitted(0)
childSetAction("buyland", onClickBuyLand, this );
childSetAction("buycurrency", onClickBuyCurrency, this );
childSetAction("no_build", onClickBuild, this );
childSetAction("status_SeeAV", onClickSeeAV, this );
childSetAction("no_scripts", onClickScripts, this );
childSetAction("restrictpush", onClickPush, this );
childSetAction("status_no_voice", onClickVoice, this );
@@ -831,6 +833,11 @@ static void onClickBuild(void*)
LLNotificationsUtil::add("NoBuild");
}
static void onClickSeeAV(void*)
{
LLNotificationsUtil::add("SeeAvatars");
}
static void onClickScripts(void*)
{
LLViewerRegion* region = gAgent.getRegion();

2
indra/newview/lltexturectrl.cpp
View File

@@ -1099,7 +1099,7 @@ LLTextureCtrl::LLTextureCtrl(
LLRect(
0, image_middle + line_height / 2,
getRect().getWidth(), image_middle - line_height / 2 ),
std::string("Multiple"),
LLTrans::getString("multiple_textures"),
LLFontGL::getFontSansSerifSmall() );
mTentativeLabel->setHAlign( LLFontGL::HCENTER );
mTentativeLabel->setFollowsAll();

13
indra/newview/lltoolpie.cpp
View File

@@ -40,7 +40,6 @@
#include "llagent.h"
#include "llagentcamera.h"
#include "llviewercontrol.h"
#include "llfocusmgr.h"
#include "llfirstuse.h"
#include "llfloateravatarinfo.h"
@@ -56,8 +55,10 @@
#include "lltoolgrab.h"
#include "lltoolmgr.h"
#include "lltoolselect.h"
#include "lltrans.h"
#include "llviewercamera.h"
#include "llviewerparcelmedia.h"
#include "llviewercontrol.h"
#include "llviewermenu.h"
#include "llviewerobjectlist.h"
#include "llviewerobject.h"
@@ -65,8 +66,8 @@
#include "llviewerwindow.h"
#include "llwindow.h"
#include "llviewermedia.h"
#include "llviewermediafocus.h"
#include "llvoavatarself.h"
#include "llviewermediafocus.h"
#include "llworld.h"
#include "llui.h"
#include "llweb.h"
@@ -401,12 +402,12 @@ BOOL LLToolPie::pickAndShowMenu(BOOL always_show)
std::string name = avatar->getFullname();
if (LLMuteList::getInstance()->isMuted(avatar->getID(), name))
{
gMenuHolder->childSetText("Avatar Mute", std::string("Unmute")); // *TODO:Translate
gMenuHolder->childSetText("Avatar Mute", LLTrans::getString("UnmuteAvatar"));
//gMutePieMenu->setLabel("Unmute");
}
else
{
gMenuHolder->childSetText("Avatar Mute", std::string("Mute")); // *TODO:Translate
gMenuHolder->childSetText("Avatar Mute", LLTrans::getString("MuteAvatar"));
//gMutePieMenu->setLabel("Mute");
}
@@ -451,12 +452,12 @@ BOOL LLToolPie::pickAndShowMenu(BOOL always_show)
}
if (LLMuteList::getInstance()->isMuted(object->getID(), name))
{
gMenuHolder->childSetText("Object Mute", std::string("Unmute")); // *TODO:Translate
gMenuHolder->childSetText("Object Mute", LLTrans::getString("UnmuteObject"));
//gMuteObjectPieMenu->setLabel("Unmute");
}
else
{
gMenuHolder->childSetText("Object Mute", std::string("Mute")); // *TODO:Translate
gMenuHolder->childSetText("Object Mute", LLTrans::getString("MuteObject2"));
//gMuteObjectPieMenu->setLabel("Mute");
}

4
indra/newview/llviewerdisplay.cpp
View File

@@ -440,7 +440,7 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot, boo
case LLAgent::TELEPORT_START_ARRIVAL:
// Transition to ARRIVING. Viewer has received avatar update, etc., from destination simulator
gTeleportArrivalTimer.reset();
gViewerWindow->setProgressCancelButtonVisible(FALSE, std::string("Cancel")); //TODO: Translate
gViewerWindow->setProgressCancelButtonVisible(FALSE, LLTrans::getString("Cancel"));
gViewerWindow->setProgressPercent(75.f);
gAgent.setTeleportState( LLAgent::TELEPORT_ARRIVING );
gAgent.setTeleportMessage(
@@ -459,7 +459,7 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot, boo
LLFirstUse::useTeleport();
gAgent.setTeleportState( LLAgent::TELEPORT_NONE );
}
gViewerWindow->setProgressCancelButtonVisible(FALSE, std::string("Cancel")); //TODO: Translate
gViewerWindow->setProgressCancelButtonVisible(FALSE, LLTrans::getString("Cancel"));
gViewerWindow->setProgressPercent( arrival_fraction * 25.f + 75.f);
gViewerWindow->setProgressString(message);
}

28
indra/newview/llviewermenufile.cpp
View File

@@ -46,6 +46,7 @@
#include "llsdserialize.h"
#include "llsdutil.h"
#include "llstring.h"
#include "lltrans.h"
#include "lltransactiontypes.h"
#include "lluictrlfactory.h"
#include "lluuid.h"
@@ -94,6 +95,7 @@
#include "lllocalinventory.h"
// </edit>
#include "hippogridmanager.h"
#include "importtracker.h"
using namespace LLOldEvents;
@@ -502,6 +504,19 @@ class LLFileSavePreview : public view_listener_t
}
};
class LLFileSavePreviewPNG : public view_listener_t
{
bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
{
LLFloater* top = gFloaterView->getFrontmost();
if (top)
{
top->saveAsType(true);
}
return true;
}
};
class LLFileTakeSnapshot : public view_listener_t
{
bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
@@ -855,8 +870,7 @@ void upload_new_resource(const std::string& src_filename, std::string name,
else
{
// Unknown extension
// *TODO: Translate?
error_message = llformat("Unknown file extension .%s\nExpected .wav, .tga, .bmp, .jpg, .jpeg, or .bvh", exten.c_str());
error_message = llformat(LLTrans::getString("UnknownFileExtension").c_str(), exten.c_str());
error = TRUE;;
}
@@ -1021,10 +1035,11 @@ void upload_done_callback(const LLUUID& uuid, void* user_data, S32 result, LLExt
if(!(can_afford_transaction(expected_upload_cost)))
{
LLFloaterBuyCurrency::buyCurrency(
llformat("Uploading %s costs",
data->mAssetInfo.getName().c_str()), // *TODO: Translate
expected_upload_cost);
LLStringUtil::format_map_t args;
args["[NAME]"] = data->mAssetInfo.getName();
args["[CURRENCY]"] = gHippoGridManager->getConnectedGrid()->getCurrencySymbol();
args["[AMOUNT]"] = llformat("%d", expected_upload_cost);
LLFloaterBuyCurrency::buyCurrency( LLTrans::getString("UploadingCosts", args), expected_upload_cost );
is_balance_sufficient = FALSE;
}
else if(region)
@@ -1311,6 +1326,7 @@ void init_menu_file()
(new LLFileMinimizeAllWindows())->registerListener(gMenuHolder, "File.MinimizeAllWindows");
// </edit>
(new LLFileSavePreview())->registerListener(gMenuHolder, "File.SavePreview");
(new LLFileSavePreviewPNG())->registerListener(gMenuHolder, "File.SavePreviewPNG");
(new LLFileTakeSnapshot())->registerListener(gMenuHolder, "File.TakeSnapshot");
(new LLFileTakeSnapshotToDisk())->registerListener(gMenuHolder, "File.TakeSnapshotToDisk");
(new LLFileQuit())->registerListener(gMenuHolder, "File.Quit");

279
indra/newview/llviewermessage.cpp
View File

@@ -1410,7 +1410,6 @@ bool LLOfferInfo::inventory_offer_callback(const LLSD& notification, const LLSD&
itemp = (LLViewerInventoryItem*)gInventory.getItem(mObjectID);
}
// *TODO:translate
std::string from_string; // Used in the pop-up.
std::string chatHistory_string; // Used in chat history.
if (mFromObject == TRUE)
@@ -1420,13 +1419,18 @@ bool LLOfferInfo::inventory_offer_callback(const LLSD& notification, const LLSD&
std::string group_name;
if (gCacheName->getGroupName(mFromID, group_name))
{
from_string = std::string("An object named '") + mFromName + "' owned by the group '" + group_name + "'";
chatHistory_string = mFromName + " owned by the group '" + group_name + "'";
from_string = LLTrans::getString("InvOfferAnObjectNamed") + " " + LLTrans::getString("'")
+ mFromName + LLTrans::getString("'") + " " + LLTrans::getString("InvOfferOwnedByGroup")
+ " " + LLTrans::getString("'") + group_name + LLTrans::getString("'");
chatHistory_string = mFromName + " " + LLTrans::getString("InvOfferOwnedByGroup")
+ " " + group_name + LLTrans::getString("'") + LLTrans::getString(".");
}
else
{
from_string = std::string("An object named '") + mFromName + "' owned by an unknown group";
chatHistory_string = mFromName + " owned by an unknown group";
from_string = LLTrans::getString("InvOfferAnObjectNamed") + " " + LLTrans::getString("'")
+ mFromName + LLTrans::getString("'") + " " + LLTrans::getString("InvOfferOwnedByUnknownGroup");
chatHistory_string = mFromName + " " + LLTrans::getString("InvOfferOwnedByUnknownGroup") + LLTrans::getString(".");
}
}
else
@@ -1439,16 +1443,19 @@ bool LLOfferInfo::inventory_offer_callback(const LLSD& notification, const LLSD&
{
full_name = RlvStrings::getAnonym(full_name);
}
from_string = std::string("An object named '") + mFromName + "' owned by " + full_name;
chatHistory_string = mFromName + " owned by " + full_name;
from_string = LLTrans::getString("InvOfferAnObjectNamed") + " " + LLTrans::getString("'") + mFromName
+ LLTrans::getString("'") +" " + LLTrans::getString("InvOfferOwnedBy") + full_name;
chatHistory_string = mFromName + " " + LLTrans::getString("InvOfferOwnedBy") + " " + full_name + LLTrans::getString(".");
// [/RLVa:KB]
//from_string = std::string("An object named '") + mFromName + "' owned by " + first_name + " " + last_name;
//chatHistory_string = mFromName + " owned by " + first_name + " " + last_name;
}
else
{
from_string = std::string("An object named '") + mFromName + "' owned by an unknown user";
chatHistory_string = mFromName + " owned by an unknown user";
from_string = LLTrans::getString("InvOfferAnObjectNamed") + " " + LLTrans::getString("'")
+ mFromName + LLTrans::getString("'") + " " + LLTrans::getString("InvOfferOwnedByUnknownUser");
chatHistory_string = mFromName + " " + LLTrans::getString("InvOfferOwnedByUnknownUser") + LLTrans::getString(".");
}
}
}
@@ -1504,7 +1511,7 @@ bool LLOfferInfo::inventory_offer_callback(const LLSD& notification, const LLSD&
//don't spam them if they are getting flooded
if (check_offer_throttle(mFromName, true))
{
log_message = chatHistory_string + " gave you " + mDesc + ".";
log_message = chatHistory_string + " " + LLTrans::getString("InvOfferGaveYou") + " " + mDesc + LLTrans::getString(".");
chat.mText = log_message;
LLFloaterChat::addChatHistory(chat);
}
@@ -1590,7 +1597,10 @@ bool LLOfferInfo::inventory_offer_callback(const LLSD& notification, const LLSD&
}
// [/RLVa:KB]
log_message = "You decline " + mDesc + " from " + mFromName + ".";
LLStringUtil::format_map_t log_message_args;
log_message_args["[DESC]"] = mDesc;
log_message_args["[NAME]"] = mFromName;
log_message = LLTrans::getString("InvOfferDecline", log_message_args);
chat.mText = log_message;
if( LLMuteList::getInstance()->isMuted(mFromID ) && ! LLMuteList::getInstance()->isLinden(mFromName) ) // muting for SL-42269
{
@@ -1638,7 +1648,7 @@ bool LLOfferInfo::inventory_offer_callback(const LLSD& notification, const LLSD&
void inventory_offer_handler(LLOfferInfo* info, BOOL from_task)
{
//Until throttling is implmented, busy mode should reject inventory instead of silently
//Until throttling is implemented, busy mode should reject inventory instead of silently
//accepting it. SEE SL-39554
if (gAgent.getBusy())
{
@@ -1648,7 +1658,7 @@ void inventory_offer_handler(LLOfferInfo* info, BOOL from_task)
// NaCl - Antispam Registry
static LLCachedControl<bool> antispam(gSavedSettings,"_NACL_Antispam");
if(antispam || NACLAntiSpamRegistry::checkQueue((U32)NACLAntiSpamRegistry::QUEUE_INVENTORY,info->mFromID))
if(antispam || gSavedSettings.getBOOL("AntiSpamItemOffers") || NACLAntiSpamRegistry::checkQueue((U32)NACLAntiSpamRegistry::QUEUE_INVENTORY,info->mFromID))
return;
// NaCl End
//If muted, don't even go through the messaging stuff. Just curtail the offer here.
@@ -1933,24 +1943,27 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
//msg->getData("MessageBlock", "Count", &count);
msg->getStringFast(_PREHASH_MessageBlock, _PREHASH_FromAgentName, name);
msg->getStringFast(_PREHASH_MessageBlock, _PREHASH_Message, message);
// NaCl - Newline flood protection
LLViewerObject* obj=gObjectList.findObject(from_id);
if(!from_id.isNull() //Not from nothing.
&& gAgent.getID() != from_id //Not from self.
&& !(obj && obj->permYouOwner())) //Not from own object.
{
static LLCachedControl<U32> SpamNewlines(gSavedSettings,"_NACL_AntiSpamNewlines");
boost::sregex_iterator iter(message.begin(), message.end(), NEWLINES);
if((U32)std::abs(std::distance(iter, boost::sregex_iterator())) > SpamNewlines)
{
NACLAntiSpamRegistry::blockOnQueue((U32)NACLAntiSpamRegistry::QUEUE_IM,from_id);
LLSD args;
args["MESSAGE"] = "Message: Blocked newline flood from "+from_id.asString();
LLNotificationsUtil::add("SystemMessageTip", args);
return;
}
}
// NaCl End
// NaCl - Newline flood protection
LLViewerObject* obj=gObjectList.findObject(from_id);
if(!from_id.isNull() //Not from nothing.
&& gAgent.getID() != from_id //Not from self.
&& !(obj && obj->permYouOwner())) //Not from own object.
{
static LLCachedControl<U32> SpamNewlines(gSavedSettings,"_NACL_AntiSpamNewlines");
boost::sregex_iterator iter(message.begin(), message.end(), NEWLINES);
if((U32)std::abs(std::distance(iter, boost::sregex_iterator())) > SpamNewlines)
{
NACLAntiSpamRegistry::blockOnQueue((U32)NACLAntiSpamRegistry::QUEUE_IM,from_id);
if(gSavedSettings.getBOOL("AntiSpamNotify"))
{
LLSD args;
args["MESSAGE"] = "Message: Blocked newline flood from "+from_id.asString();
LLNotificationsUtil::add("SystemMessageTip", args);
}
return;
}
}
// NaCl End
msg->getU32Fast(_PREHASH_MessageBlock, _PREHASH_ParentEstateID, parent_estate_id);
msg->getUUIDFast(_PREHASH_MessageBlock, _PREHASH_RegionID, region_id);
msg->getVector3Fast(_PREHASH_MessageBlock, _PREHASH_Position, position);
@@ -1959,10 +1972,10 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
EInstantMessage dialog = (EInstantMessage)d;
// NaCl - Antispam Registry
if((dialog != IM_TYPING_START && dialog != IM_TYPING_STOP)
&& NACLAntiSpamRegistry::checkQueue((U32)NACLAntiSpamRegistry::QUEUE_IM,from_id))
return;
// NaCl End
if((dialog != IM_TYPING_START && dialog != IM_TYPING_STOP)
&& NACLAntiSpamRegistry::checkQueue((U32)NACLAntiSpamRegistry::QUEUE_IM,from_id))
return;
// NaCl End
// make sure that we don't have an empty or all-whitespace name
LLStringUtil::trim(name);
@@ -2032,7 +2045,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
computed_session_id,
from_id,
name,
llformat("%s has begun an IM session with you.",name.c_str()),
llformat("%s ",name.c_str()) + LLTrans::getString("IM_announce_incoming"),
name,
IM_NOTHING_SPECIAL,
parent_estate_id,
@@ -2057,8 +2070,8 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
LLAvatarTracker::instance().getBuddyInfo(from_id) == NULL )
do_auto_response = true;
if( is_muted && !gSavedPerAccountSettings.getBOOL("AscentInstantMessageResponseMuted") )
do_auto_response = false;
if( is_muted )
do_auto_response = gSavedPerAccountSettings.getBOOL("AscentInstantMessageResponseMuted");
if( offline != IM_ONLINE )
do_auto_response = false;
@@ -2096,7 +2109,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
computed_session_id,
from_id,
SYSTEM_FROM,
llformat("Autoresponse sent to %s.",name.c_str()),
LLTrans::getString("IM_autoresponded_to") + llformat(" %s.",name.c_str()),
LLStringUtil::null,
IM_NOTHING_SPECIAL,
parent_estate_id,
@@ -2214,7 +2227,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
computed_session_id,
from_id,
SYSTEM_FROM,
llformat("Sent %s auto-response item \"%s\"",name.c_str(),item->getName().c_str()),
llformat("%s %s \"%s\"",name.c_str(), LLTrans::getString("IM_autoresponse_sent_item").c_str(), item->getName().c_str()),
LLStringUtil::null,
IM_NOTHING_SPECIAL,
parent_estate_id,
@@ -2365,7 +2378,9 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
std::string saved;
if(offline == IM_OFFLINE)
{
saved = llformat("(Saved %s) ", formatted_time(timestamp).c_str());
LLStringUtil::format_map_t args;
args["[LONG_TIMESTAMP]"] = formatted_time(timestamp);
saved = LLTrans::getString("Saved_message", args);
}
buffer = separator_string + saved + message.substr(message_offset);
@@ -2427,7 +2442,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
case IM_GROUP_NOTICE_REQUESTED:
{
// NaCl - Antispam
if(antispam)
if(antispam || gSavedSettings.getBOOL("AntiSpamGroupNotices"))
return;
// NaCl End
LL_INFOS("Messaging") << "Received IM_GROUP_NOTICE message." << LL_ENDL;
@@ -2526,7 +2541,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
case IM_GROUP_INVITATION:
{
// NaCl - Antispam
if(antispam)
if(antispam || gSavedSettings.getBOOL("AntiSpamGroupInvites"))
return;
// NaCl End
//if (!is_linden && (is_busy || is_muted))
@@ -2574,7 +2589,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
// Someone has offered us some inventory.
{
// NaCl - Antispam
if(antispam)
if(antispam || gSavedSettings.getBOOL("AntiSpamItemOffers"))
return;
// NaCl End
LLOfferInfo* info = new LLOfferInfo;
@@ -2829,10 +2844,10 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
}
break;
case IM_FROM_TASK_AS_ALERT:
// NaCl - Antispam
if(antispam)
return;
// NaCl End
// NaCl - Antispam
if(antispam || (!is_owned_by_me && gSavedSettings.getBOOL("AntiSpamAlerts")))
return;
// NaCl End
if (is_busy && !is_owned_by_me)
{
return;
@@ -2870,7 +2885,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
case IM_LURE_USER:
{
if(antispam) return; //NaCl Antispam
if(antispam || gSavedSettings.getBOOL("AntiSpamTeleports")) return; //NaCl Antispam
// [RLVa:KB] - Checked: 2010-12-11 (RLVa-1.2.2c) | Added: RLVa-1.2.2c
// If the lure sender is a specific @accepttp exception they will override muted and busy status
bool fRlvSummon = (rlv_handler_t::isEnabled()) && (gRlvHandler.isException(RLV_BHVR_ACCEPTTP, from_id));
@@ -3011,10 +3026,6 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
case IM_GOTO_URL:
{
// NaCl - Antispam
if(antispam)
return;
// NaCl End
LLSD args;
// n.b. this is for URLs sent by the system, not for
// URLs sent by scripts (i.e. llLoadURL)
@@ -3040,7 +3051,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
case IM_FRIENDSHIP_OFFERED:
{
// NaCl - Antispam
if(antispam)
if(antispam || gSavedSettings.getBOOL("AntiSpamFriendshipOffers"))
return;
// NaCl End
LLSD payload;
@@ -3179,7 +3190,7 @@ void process_offer_callingcard(LLMessageSystem* msg, void**)
{
// NaCl - Antispam
static LLCachedControl<bool> antispam(gSavedSettings,"_NACL_Antispam");
if(antispam)
if(antispam || gSavedSettings.getBOOL("AntiSpamFriendshipOffers"))
return;
// NaCl End
// someone has offered to form a friendship
@@ -3189,9 +3200,9 @@ void process_offer_callingcard(LLMessageSystem* msg, void**)
msg->getUUIDFast(_PREHASH_AgentData, _PREHASH_AgentID, source_id);
// NaCl - Antispam Registry
if(NACLAntiSpamRegistry::checkQueue((U32)NACLAntiSpamRegistry::QUEUE_CALLING_CARD,source_id))
return;
// NaCl End
if(NACLAntiSpamRegistry::checkQueue((U32)NACLAntiSpamRegistry::QUEUE_CALLING_CARD,source_id))
return;
// NaCl End
LLUUID tid;
msg->getUUIDFast(_PREHASH_AgentBlock, _PREHASH_TransactionID, tid);
@@ -3379,13 +3390,12 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
msg->getU8("ChatData", "ChatType", type_temp);
chat.mChatType = (EChatType)type_temp;
// NaCL - Antispam Registry
if((chat.mChatType != CHAT_TYPE_START && chat.mChatType != CHAT_TYPE_STOP) //Chat type isn't typing
&&((owner_id.isNull() && NACLAntiSpamRegistry::checkQueue((U32)NACLAntiSpamRegistry::QUEUE_CHAT,from_id)) //Spam from an object?
||(NACLAntiSpamRegistry::checkQueue((U32)NACLAntiSpamRegistry::QUEUE_CHAT,owner_id)))) //Spam from a resident?
return;
// NaCl End
// NaCL - Antispam Registry
if((chat.mChatType != CHAT_TYPE_START && chat.mChatType != CHAT_TYPE_STOP) //Chat type isn't typing
&&((owner_id.isNull() && NACLAntiSpamRegistry::checkQueue((U32)NACLAntiSpamRegistry::QUEUE_CHAT,from_id)) //Spam from an object?
||(NACLAntiSpamRegistry::checkQueue((U32)NACLAntiSpamRegistry::QUEUE_CHAT,owner_id)))) //Spam from a resident?
return;
// NaCl End
msg->getU8Fast(_PREHASH_ChatData, _PREHASH_Audible, audible_temp);
chat.mAudible = (EChatAudible)audible_temp;
@@ -3507,23 +3517,26 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
msg->getStringFast(_PREHASH_ChatData, _PREHASH_Message, mesg);
// NaCl - Newline flood protection
LLViewerObject* obj=gObjectList.findObject(from_id);
if(!(from_id.isNull()) //Not from nothing.
|| !(gAgent.getID() != from_id) //Not from self.
|| !(obj && obj->permYouOwner())) //Not from own object.
{
static LLCachedControl<U32> SpamNewlines(gSavedSettings,"_NACL_AntiSpamNewlines");
boost::sregex_iterator iter(mesg.begin(), mesg.end(), NEWLINES);
if((U32)std::abs(std::distance(iter, boost::sregex_iterator())) > SpamNewlines)
{
NACLAntiSpamRegistry::blockOnQueue((U32)NACLAntiSpamRegistry::QUEUE_CHAT,owner_id);
LLSD args;
args["MESSAGE"] = "Chat: Blocked newline flood from "+owner_id.asString();
LLNotificationsUtil::add("SystemMessageTip", args);
return;
}
}
// NaCl End
LLViewerObject* obj=gObjectList.findObject(from_id);
if(!(from_id.isNull()) //Not from nothing.
|| !(gAgent.getID() != from_id) //Not from self.
|| !(obj && obj->permYouOwner())) //Not from own object.
{
static LLCachedControl<U32> SpamNewlines(gSavedSettings,"_NACL_AntiSpamNewlines");
boost::sregex_iterator iter(mesg.begin(), mesg.end(), NEWLINES);
if((U32)std::abs(std::distance(iter, boost::sregex_iterator())) > SpamNewlines)
{
NACLAntiSpamRegistry::blockOnQueue((U32)NACLAntiSpamRegistry::QUEUE_CHAT,owner_id);
if(gSavedSettings.getBOOL("AntiSpamNotify"))
{
LLSD args;
args["MESSAGE"] = "Chat: Blocked newline flood from "+owner_id.asString();
LLNotificationsUtil::add("SystemMessageTip", args);
}
return;
}
}
// NaCl End
static std::map<LLUUID, bool> sChatObjectAuth;
@@ -3893,7 +3906,7 @@ void process_teleport_start(LLMessageSystem *msg, void**)
}
else
{
gViewerWindow->setProgressCancelButtonVisible(TRUE, std::string("Cancel")); // *TODO: Translate
gViewerWindow->setProgressCancelButtonVisible(TRUE, LLTrans::getString("Cancel"));
}
// Freeze the UI and show progress bar
@@ -3932,7 +3945,7 @@ void process_teleport_progress(LLMessageSystem* msg, void**)
}
else
{
gViewerWindow->setProgressCancelButtonVisible(TRUE, std::string("Cancel")); //TODO: Translate
gViewerWindow->setProgressCancelButtonVisible(TRUE, LLTrans::getString("Cancel"));
}
std::string buffer;
msg->getString("Info", "Message", buffer);
@@ -4842,19 +4855,18 @@ void process_sound_trigger(LLMessageSystem *msg, void **)
msg->getUUIDFast(_PREHASH_SoundData, _PREHASH_ObjectID, object_id);
// NaCl - Antispam Registry
/*if(owner_id.isNull())
{*/
bool bDoSpamCheck=1;
std::string sSound=sound_id.asString();
static LLCachedControl<U32> _NACL_AntiSpamSoundMulti(gSavedSettings,"_NACL_AntiSpamSoundMulti");
for(int i=0;i< COLLISION_SOUNDS_SIZE;i++)
if(COLLISION_SOUNDS[i] == sSound)
bDoSpamCheck=0;
static LLCachedControl<U32> _NACL_AntiSpamSoundMulti(gSavedSettings,"_NACL_AntiSpamSoundMulti");
if(owner_id.isNull())
{
bool bDoSpamCheck=1;
std::string sSound=sound_id.asString();
for(int i=0;i< COLLISION_SOUNDS_SIZE;i++)
if(COLLISION_SOUNDS[i] == sSound)
bDoSpamCheck=0;
if(bDoSpamCheck)
if(NACLAntiSpamRegistry::checkQueue((U32)NACLAntiSpamRegistry::QUEUE_SOUND,object_id, _NACL_AntiSpamSoundMulti,true)) return;
/*}
else
if(NACLAntiSpamRegistry::checkQueue("Soundspam",owner_id)) return;*/
if(NACLAntiSpamRegistry::checkQueue((U32)NACLAntiSpamRegistry::QUEUE_SOUND,object_id, _NACL_AntiSpamSoundMulti)) return;
}
else if(NACLAntiSpamRegistry::checkQueue((U32)NACLAntiSpamRegistry::QUEUE_SOUND,owner_id, _NACL_AntiSpamSoundMulti)) return;
// NaCl End
msg->getUUIDFast(_PREHASH_SoundData, _PREHASH_ParentID, parent_id);
@@ -4920,13 +4932,13 @@ void process_preload_sound(LLMessageSystem *msg, void **user_data)
msg->getUUIDFast(_PREHASH_DataBlock, _PREHASH_ObjectID, object_id);
msg->getUUIDFast(_PREHASH_DataBlock, _PREHASH_OwnerID, owner_id);
// NaCl - Antispam Registry
static LLCachedControl<U32> _NACL_AntiSpamSoundPreloadMulti(gSavedSettings,"_NACL_AntiSpamSoundPreloadMulti");
if((owner_id.isNull()
&& NACLAntiSpamRegistry::checkQueue((U32)NACLAntiSpamRegistry::QUEUE_SOUND_PRELOAD,object_id,_NACL_AntiSpamSoundPreloadMulti))
|| NACLAntiSpamRegistry::checkQueue((U32)NACLAntiSpamRegistry::QUEUE_SOUND_PRELOAD,owner_id,_NACL_AntiSpamSoundPreloadMulti))
return;
// NaCl End
// NaCl - Antispam Registry
static LLCachedControl<U32> _NACL_AntiSpamSoundPreloadMulti(gSavedSettings,"_NACL_AntiSpamSoundPreloadMulti");
if((owner_id.isNull()
&& NACLAntiSpamRegistry::checkQueue((U32)NACLAntiSpamRegistry::QUEUE_SOUND_PRELOAD,object_id,_NACL_AntiSpamSoundPreloadMulti))
|| NACLAntiSpamRegistry::checkQueue((U32)NACLAntiSpamRegistry::QUEUE_SOUND_PRELOAD,owner_id,_NACL_AntiSpamSoundPreloadMulti))
return;
// NaCl End
LLViewerObject *objectp = gObjectList.findObject(object_id);
if (!objectp) return;
@@ -4964,12 +4976,12 @@ void process_attached_sound(LLMessageSystem *msg, void **user_data)
msg->getUUIDFast(_PREHASH_DataBlock, _PREHASH_ObjectID, object_id);
msg->getUUIDFast(_PREHASH_DataBlock, _PREHASH_OwnerID, owner_id);
// NaCl - Antispam Registry
if(/*owner_id.isNull()
&&*/ NACLAntiSpamRegistry::checkQueue((U32)NACLAntiSpamRegistry::QUEUE_SOUND,object_id))
/*|| (NACLAntiSpamRegistry::checkQueue("Soundspam",owner_id))*/
return;
// NaCl End
// NaCl - Antispam Registry
if((owner_id.isNull()
&& NACLAntiSpamRegistry::checkQueue((U32)NACLAntiSpamRegistry::QUEUE_SOUND,object_id))
|| NACLAntiSpamRegistry::checkQueue((U32)NACLAntiSpamRegistry::QUEUE_SOUND,owner_id))
return;
// NaCl End
msg->getF32Fast(_PREHASH_DataBlock, _PREHASH_Gain, gain);
msg->getU8Fast(_PREHASH_DataBlock, _PREHASH_Flags, flags);
@@ -6235,7 +6247,7 @@ void process_script_question(LLMessageSystem *msg, void **user_data)
{
// NaCl - Antispam
static LLCachedControl<bool> antispam(gSavedSettings,"_NACL_Antispam");
if(antispam)
if(antispam || gSavedSettings.getBOOL("AntiSpamScripts"))
return;
// NaCl End
// *TODO: Translate owner name -> [FIRST] [LAST]
@@ -6253,12 +6265,12 @@ void process_script_question(LLMessageSystem *msg, void **user_data)
// itemid -> script asset key of script requesting permissions
msg->getUUIDFast(_PREHASH_Data, _PREHASH_ItemID, itemid );
// NaCl - Antispam Registry
if((taskid.isNull()
&& NACLAntiSpamRegistry::checkQueue((U32)NACLAntiSpamRegistry::QUEUE_SCRIPT_DIALOG,itemid))
|| NACLAntiSpamRegistry::checkQueue((U32)NACLAntiSpamRegistry::QUEUE_SCRIPT_DIALOG,taskid))
return;
// NaCl End
// NaCl - Antispam Registry
if((taskid.isNull()
&& NACLAntiSpamRegistry::checkQueue((U32)NACLAntiSpamRegistry::QUEUE_SCRIPT_DIALOG,itemid))
|| NACLAntiSpamRegistry::checkQueue((U32)NACLAntiSpamRegistry::QUEUE_SCRIPT_DIALOG,taskid))
return;
// NaCl End
msg->getStringFast(_PREHASH_Data, _PREHASH_ObjectName, object_name);
msg->getStringFast(_PREHASH_Data, _PREHASH_ObjectOwner, owner_name);
@@ -6397,7 +6409,7 @@ void container_inventory_arrived(LLViewerObject* object,
LLUUID cat_id;
cat_id = gInventory.createNewCategory(gInventory.getRootFolderID(),
LLFolderType::FT_NONE,
std::string("Acquired Items")); //TODO: Translate
LLTrans::getString("AcquiredItems"));
LLInventoryObject::object_list_t::const_iterator it = inventory->begin();
LLInventoryObject::object_list_t::const_iterator end = inventory->end();
@@ -6920,7 +6932,7 @@ void process_script_dialog(LLMessageSystem* msg, void**)
{
// NaCl - Antispam
static LLCachedControl<bool> antispam(gSavedSettings,"_NACL_Antispam");
if(antispam)
if(antispam || gSavedSettings.getBOOL("AntiSpamScripts"))
return;
// NaCl End
S32 i;
@@ -6930,9 +6942,9 @@ void process_script_dialog(LLMessageSystem* msg, void**)
msg->getUUID("Data", "ObjectID", object_id);
// NaCl - Antispam Registry
if(NACLAntiSpamRegistry::checkQueue((U32)NACLAntiSpamRegistry::QUEUE_SCRIPT_DIALOG,object_id))
return;
// NaCl End
if(NACLAntiSpamRegistry::checkQueue((U32)NACLAntiSpamRegistry::QUEUE_SCRIPT_DIALOG,object_id))
return;
// NaCl End
// For compability with OS grids first check for presence of extended packet before fetching data.
LLUUID owner_id;
@@ -6940,11 +6952,10 @@ void process_script_dialog(LLMessageSystem* msg, void**)
{
msg->getUUID("OwnerData", "OwnerID", owner_id);
// NaCl - Antispam Registry
if(NACLAntiSpamRegistry::checkQueue((U32)NACLAntiSpamRegistry::QUEUE_SCRIPT_DIALOG,owner_id))
return;
// NaCl End
// NaCl - Antispam Registry
if(NACLAntiSpamRegistry::checkQueue((U32)NACLAntiSpamRegistry::QUEUE_SCRIPT_DIALOG,owner_id))
return;
// NaCl End
}
if (LLMuteList::getInstance()->isMuted(object_id) || LLMuteList::getInstance()->isMuted(owner_id))
@@ -7102,7 +7113,7 @@ void process_load_url(LLMessageSystem* msg, void**)
{
// NaCl - Antispam
static LLCachedControl<bool> antispam(gSavedSettings,"_NACL_Antispam");
if(antispam)
if(antispam || gSavedSettings.getBOOL("AntiSpamScripts"))
return;
// NaCl End
LLUUID object_id;
@@ -7116,12 +7127,12 @@ void process_load_url(LLMessageSystem* msg, void**)
msg->getUUID( "Data", "ObjectID", object_id);
msg->getUUID( "Data", "OwnerID", owner_id);
// NaCl - Antispam Registry
if((owner_id.isNull()
&& NACLAntiSpamRegistry::checkQueue((U32)NACLAntiSpamRegistry::QUEUE_SCRIPT_DIALOG,object_id))
|| NACLAntiSpamRegistry::checkQueue((U32)NACLAntiSpamRegistry::QUEUE_SCRIPT_DIALOG,owner_id))
return;
// NaCl End
// NaCl - Antispam Registry
if((owner_id.isNull()
&& NACLAntiSpamRegistry::checkQueue((U32)NACLAntiSpamRegistry::QUEUE_SCRIPT_DIALOG,object_id))
|| NACLAntiSpamRegistry::checkQueue((U32)NACLAntiSpamRegistry::QUEUE_SCRIPT_DIALOG,owner_id))
return;
// NaCl End
msg->getBOOL( "Data", "OwnerIsGroup", owner_is_group);
msg->getString("Data", "Message", 256, message);
@@ -7197,7 +7208,7 @@ void process_script_teleport_request(LLMessageSystem* msg, void**)
{
// NaCl - Antispam
static LLCachedControl<bool> antispam(gSavedSettings,"_NACL_Antispam");
if(antispam)
if(antispam || gSavedSettings.getBOOL("AntiSpamScripts"))
return;
// NaCl End
if (!gSavedSettings.getBOOL("ScriptsCanShowUI")) return;

27
indra/newview/llvoavatarself.cpp
View File

@@ -256,24 +256,23 @@ BOOL LLVOAvatarSelf::buildMenus()
//-------------------------------------------------------------------------
if(gNoRender)
return TRUE;
// *TODO: Translate
gAttachBodyPartPieMenus[0] = NULL;
gAttachBodyPartPieMenus[1] = new LLPieMenu(std::string("Right Arm >"));
gAttachBodyPartPieMenus[2] = new LLPieMenu(std::string("Head >"));
gAttachBodyPartPieMenus[3] = new LLPieMenu(std::string("Left Arm >"));
gAttachBodyPartPieMenus[1] = new LLPieMenu(LLTrans::getString("BodyPartsRightArm") + " >");
gAttachBodyPartPieMenus[2] = new LLPieMenu(LLTrans::getString("BodyPartsHead") + " >");
gAttachBodyPartPieMenus[3] = new LLPieMenu(LLTrans::getString("BodyPartsLeftArm") + " >");
gAttachBodyPartPieMenus[4] = NULL;
gAttachBodyPartPieMenus[5] = new LLPieMenu(std::string("Left Leg >"));
gAttachBodyPartPieMenus[6] = new LLPieMenu(std::string("Torso >"));
gAttachBodyPartPieMenus[7] = new LLPieMenu(std::string("Right Leg >"));
gAttachBodyPartPieMenus[5] = new LLPieMenu(LLTrans::getString("BodyPartsLeftLeg") + " >");
gAttachBodyPartPieMenus[6] = new LLPieMenu(LLTrans::getString("BodyPartsTorso") + " >");
gAttachBodyPartPieMenus[7] = new LLPieMenu(LLTrans::getString("BodyPartsRightLeg") + " >");
gDetachBodyPartPieMenus[0] = NULL;
gDetachBodyPartPieMenus[1] = new LLPieMenu(std::string("Right Arm >"));
gDetachBodyPartPieMenus[2] = new LLPieMenu(std::string("Head >"));
gDetachBodyPartPieMenus[3] = new LLPieMenu(std::string("Left Arm >"));
gDetachBodyPartPieMenus[1] = new LLPieMenu(LLTrans::getString("BodyPartsRightArm") + " >");
gDetachBodyPartPieMenus[2] = new LLPieMenu(LLTrans::getString("BodyPartsHead") + " >");
gDetachBodyPartPieMenus[3] = new LLPieMenu(LLTrans::getString("BodyPartsLeftArm") + " >");
gDetachBodyPartPieMenus[4] = NULL;
gDetachBodyPartPieMenus[5] = new LLPieMenu(std::string("Left Leg >"));
gDetachBodyPartPieMenus[6] = new LLPieMenu(std::string("Torso >"));
gDetachBodyPartPieMenus[7] = new LLPieMenu(std::string("Right Leg >"));
gDetachBodyPartPieMenus[5] = new LLPieMenu(LLTrans::getString("BodyPartsLeftLeg") + " >");
gDetachBodyPartPieMenus[6] = new LLPieMenu(LLTrans::getString("BodyPartsTorso") + " >");
gDetachBodyPartPieMenus[7] = new LLPieMenu(LLTrans::getString("BodyPartsRightLeg") + " >");
for (S32 i = 0; i < 8; i++)
{
@@ -2744,4 +2743,4 @@ void LLVOAvatarSelf::setInvisible(bool invisible)
requestLayerSetUploads();
gAgent.sendAgentSetAppearance();
}
}
}

1
indra/newview/skins/darkgred/colors.xml
View File

@@ -70,6 +70,7 @@
<ScrollHighlightedColor value="145, 90, 0, 28" /> <!-- Hover color -->
<ScrollbarThumbColor value="200, 0, 0, 255" />
<ScrollbarTrackColor value="70, 0, 0, 255" />
<DefaultListText value="255, 255, 255, 255"/> <!-- We are replacing all the hardcoded black text with this color so we can make skins with white text on dark background -->
<!-- MENUS -->
<MenuBarBgColor value="0, 0, 0, 130" />

1
indra/newview/skins/darkorange/colors.xml
View File

@@ -72,6 +72,7 @@
<ScrollHighlightedColor value="183, 184, 188, 128" /> <!-- Hover color -->
<ScrollbarThumbColor value="255, 187, 55, 255" /> <!-- Scroll bar-->
<ScrollbarTrackColor value="167, 156, 139, 255" /> <!-- Scroll bar background-->
<DefaultListText value="255, 255, 255, 255"/> <!-- We are replacing all the hardcoded black text with this color so we can make skins with white text on dark background -->
<!-- MENUS -->
<MenuBarBgColor value="62, 62, 62, 255" />

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

@@ -73,6 +73,7 @@
<ScrollHighlightedColor value="183, 184, 188, 128" /> <!-- Hover color -->
<ScrollbarThumbColor value="60, 76, 124, 255" /> <!-- Scroll bar-->
<ScrollbarTrackColor value="153, 154, 158, 255" /> <!-- Scroll bar background-->
<DefaultListText value="0, 0, 0, 255"/> <!-- We are replacing all the hardcoded black text with this color so we can make skins with white text on dark background -->
<!-- MENUS -->
<MenuBarBgColor value="62, 62, 62, 255" />
@@ -149,6 +150,13 @@
<RadarLinden value="0, 0, 128, 255" />
<RadarEstateOwner value="204, 102, 10, 255" />
<RadarMuted value="128, 128, 128, 255" />
<RadarTextChatRange value="255, 0, 0, 255"/>
<RadarTextShoutRange value="255, 255, 0, 128"/>
<RadarTextDrawDist value="0, 153, 0, 255"/>
<!-- SPEAKERS -->
<SpeakersInactive value="76, 76, 76, 255"/>
<SpeakersGhost value="255, 0, 0, 255"/>
<!-- MINI-MAP -->
<NetMapBackgroundColor value="0, 0, 0, 77" />

5
indra/newview/skins/default/xui/en-us/floater_about_land.xml
View File

@@ -1345,6 +1345,11 @@ Select the thumbnail to choose a different texture.
<string name="estate_override">
One or more of these options is set at the estate level
</string>
<string name="minutes">minutes</string>
<string name="1_minute">1 minute</string>
<string name="1_second">1 second</string>
<string name="seconds">seconds</string>
<string name="remaining">remaining</string>
<check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall"
height="16" initial_value="false" label="Allow Group Access: [GROUP]"
left="8" mouse_opaque="true" name="GroupCheck" radio_style="false"

32
indra/newview/skins/default/xui/en-us/floater_hardware_settings.xml
View File

@@ -1,32 +0,0 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater bottom="-400" height="244" left="50" name="Hardware Settings Floater" title="Hardware Settings" width="500">
<text bottom="-42" height="12" left="10" name="Filtering:">Filtering:</text>
<check_box bottom="-46" control_name="RenderAnisotropic" height="16" initial_value="false" label="Anisotropic Filtering (slower when enabled)" left="148" name="ani" width="256"/>
<text bottom="-61" height="12" left="10" name="Antialiasing:" width="128">Antialiasing:</text>
<combo_box bottom="-65" control_name="RenderFSAASamples" height="16" initial_value="false" label="Antialiasing" left="148" name="fsaa" width="64">
<combo_item name="FSAADisabled" value="0">Disabled</combo_item>
<combo_item name="2x" value="2">2x</combo_item>
<combo_item name="4x" value="4">4x</combo_item>
<combo_item name="8x" value="8">8x</combo_item>
<combo_item name="16x" value="16">16x</combo_item>
</combo_box>
<spinner bottom_delta="-21" control_name="RenderGamma" decimal_digits="2" height="16" increment="0.01" initial_val="1" label="Gamma:" label_width="138" left="10" max_val="2" min_val="0.0" name="gamma" width="202"/>
<text bottom_delta="2" height="12" left="222" name="(brightness, lower is brighter)">(brightness, lower is brighter, 0=use default)</text>
<text bottom_delta="-20" height="12" left="10" name="Enable VBO:">Enable VBO:</text>
<check_box bottom_delta="-5" control_name="RenderVBOEnable" height="16" initial_value="true" label="Enable OpenGL Vertex Buffer Objects" left="148" name="vbo"
tool_tip="Enabling this on modern hardware gives a performance gain. However, older hardware often has poor implementations of VBOs and you may get crashes when this is enabled."/>
<check_box bottom_delta="-18" control_name="ShyotlRenderUseStreamVBO" height="16" initial_value="false" label="Enable Streamed VBOs" left="157" name="vbo_stream"
tool_tip="Disabling this may improve performance when VBOs are enabled. Disabling produced observable improvement on various AMD GPUs."/>
<text bottom_delta="-20" height="12" left="10" name="Enable FBO:">Enable Framebuffer Objects:</text>
<check_box bottom_delta="-5" control_name="RenderUseFBO" enabled="false" height="16" initial_value="true" label="Enable OpenGL Frame Buffer Objects" left="148" name="fbo"
tool_tip="Enabling this on modern hardware can provide a performance gain. However, enabling this when combined with antialiasing on AMD GPUs may cause edge artifacts. This setting is required for deferred rendering."/>
<slider bottom_delta="-21" control_name="TextureMemory" decimal_digits="0" height="16" increment="16" initial_val="32" label="Texture Memory (MB):" label_width="135" left="10" max_val="4096" min_val="0" name="GrapicsCardTextureMemory"
tool_tip="Amount of memory to allocate for textures. Defaults to Video Card Memory. Reducing this may improve performance but may also make textures blurry."
width="300"/>
<spinner bottom_delta="-24" control_name="RenderFogRatio" decimal_digits="1" height="16" increment="0.1" initial_val="4" label="Fog Distance Ratio:" label_width="138" left="10" max_val="10" min_val="0.5" name="fog" width="202"/>
<text bottom_delta="-50" height="40" left="10" name="note">
Note: the Gamma and Fog Distance Ratio settings are unavailable
(since useless) when the Atmospheric Shaders are enabled.
</text>
<button bottom="10" height="20" label="OK" label_selected="OK" left="-110" name="OK" scale_image="true" width="90"/>
</floater>

41
indra/newview/skins/default/xui/en-us/floater_inventory_item_properties.xml
View File

@@ -113,16 +113,35 @@
mouse_opaque="true" name="NextMaskDebug" v_pad="0" width="90">
N:
</text>
<check_box bottom="-187" follows="left|top" font="SansSerifSmall" height="16"
initial_value="false" label="Share with group" left="10"
mouse_opaque="true" name="CheckShareWithGroup" radio_style="false"
width="106" />
<check_box bottom_delta="-32" follows="left|top" font="SansSerifSmall" height="16"
initial_value="false" label="Allow anyone to copy" left="10"
mouse_opaque="true" name="CheckEveryoneCopy" radio_style="false"
width="130" />
<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom_delta="-26" drop_shadow_visible="true" follows="left|top"
bottom_delta="-20" drop_shadow_visible="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
mouse_opaque="true" name="GroupLabel" v_pad="0" width="198">
Group members can:
</text>
<check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16"
initial_value="false" label="Modify" left="10" mouse_opaque="true"
name="CheckGroupMod" radio_style="false" width="78" />
<check_box bottom_delta="0" follows="left|top" font="SansSerifSmall" height="16"
initial_value="false" label="Copy" left_delta="78" mouse_opaque="true"
name="CheckGroupCopy" radio_style="false" width="88" />
<check_box bottom_delta="0" follows="left|top" font="SansSerifSmall" height="16"
initial_value="false" label="Move" left_delta="88" mouse_opaque="true"
name="CheckGroupMove" radio_style="false" width="106" />
<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom_delta="-17" drop_shadow_visible="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
mouse_opaque="true" name="EveryoneLabel" v_pad="0" width="88">
Anyone can:
</text>
<check_box bottom_delta="-8" follows="left|top" font="SansSerifSmall" height="16"
initial_value="false" label="Copy" left="88" mouse_opaque="true"
name="CheckEveryoneCopy" radio_style="false" width="88" />
<check_box bottom_delta="0" follows="left|top" font="SansSerifSmall" height="16"
initial_value="false" label="Move" left_delta="88" mouse_opaque="true"
name="CheckEveryoneMove" radio_style="false" width="88" />
<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom_delta="-13" drop_shadow_visible="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
mouse_opaque="true" name="NextOwnerLabel" v_pad="0" width="88">
Next owner can:
@@ -130,10 +149,10 @@
<check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16"
initial_value="false" label="Modify" left="10" mouse_opaque="true"
name="CheckNextOwnerModify" radio_style="false" width="78" />
<check_box bottom="-265" follows="left|top" font="SansSerifSmall" height="16"
<check_box bottom_delta="0" follows="left|top" font="SansSerifSmall" height="16"
initial_value="false" label="Copy" left_delta="78" mouse_opaque="true"
name="CheckNextOwnerCopy" radio_style="false" width="88" />
<check_box bottom="-265" follows="left|top" font="SansSerifSmall" height="16"
<check_box bottom_delta="0" follows="left|top" font="SansSerifSmall" height="16"
initial_value="false" label="Resell/Give away" left_delta="88"
mouse_opaque="true" name="CheckNextOwnerTransfer" radio_style="false"
width="106" />

348
indra/newview/skins/default/xui/en-us/floater_post_process.xml
View File

@@ -1,230 +1,230 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater bottom="-350" can_close="true" can_drag_on_left="false" can_minimize="true"
can_resize="false" height="400" left="50" min_height="400"
min_width="300" mouse_opaque="true" name="Post-Process Floater"
title="Post-Process Settings" width="400">
can_resize="false" height="400" left="50" min_height="400"
min_width="300" mouse_opaque="true" name="Post-Process Floater"
title="Post-Process Settings" width="400">
<tab_container bottom="-400" follows="left|top" height="400" left="0"
mouse_opaque="false" name="Post-Process Tabs" tab_position="top"
width="400">
mouse_opaque="false" name="Post-Process Tabs" tab_position="bottom"
width="400">
<panel border="true" bottom="-400" follows="left|top|right|bottom" height="400"
label="Color Filter" left="1" mouse_opaque="false"
name="ColorFilterPanel" width="398">
<check_box bottom="-20" follows="left|top"
font="SansSerifSmall" height="16" initial_value="false" label="Enable"
left="14" mouse_opaque="true" name="enable_color_filter" width="200" />
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom_delta="-20" drop_shadow_visible="true" follows="left|top|right"
font="SansSerif" h_pad="0" halign="left" height="16"
left="10" mouse_opaque="true" name="ColorFilterGammaText" v_pad="0"
width="355">
Gamma
</text>
<slider bottom_delta="-30" can_edit_text="true" decimal_digits="2" follows="left"
height="18" increment="0.01" initial_val="1.0" label="" left="14"
max_val="10" min_val="-.25" mouse_opaque="true" name="gamma"
show_text="true" value="1.0" width="200" />
label="Color Filter" left="1" mouse_opaque="false"
name="ColorFilterPanel" width="398">
<check_box bottom="-40" follows="left|top"
font="SansSerifSmall" height="16" initial_value="false" label="Enable"
left="4" mouse_opaque="true" name="enable_color_filter" width="200" />
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom_delta="-20" drop_shadow_visible="true" follows="left|top|right"
font="SansSerif" h_pad="0" halign="left" height="16"
left="10" mouse_opaque="true" name="ColorFilterBrightnessText" v_pad="0"
width="355">
bottom_delta="-20" drop_shadow_visible="true" follows="left|top|right"
font="SansSerif" h_pad="0" halign="left" height="16"
left="10" mouse_opaque="true" name="ColorFilterGammaText" v_pad="0"
width="355">
Gamma
</text>
<slider bottom_delta="-30" can_edit_text="true" decimal_digits="2" follows="left"
height="18" increment="0.01" initial_val="1.0" label="" left="14" val_width="35"
max_val="10" min_val="-.25" mouse_opaque="true" name="gamma"
show_text="true" value="1.0" width="200" />
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom_delta="-20" drop_shadow_visible="true" follows="left|top|right"
font="SansSerif" h_pad="0" halign="left" height="16"
left="10" mouse_opaque="true" name="ColorFilterBrightnessText" v_pad="0"
width="355">
Brightness
</text>
<slider bottom_delta="-30" can_edit_text="true" decimal_digits="2" follows="left"
height="18" increment="0.01" initial_val="1.0" label="" left="14"
max_val="4" min_val="0" mouse_opaque="true" name="brightness"
show_text="true" value="1.0" width="200" />
height="18" increment="0.01" initial_val="1.0" label="" left="14" val_width="35"
max_val="4" min_val="0" mouse_opaque="true" name="brightness"
show_text="true" value="1.0" width="200" />
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom_delta="-20" drop_shadow_visible="true" follows="left|top|right"
font="SansSerif" h_pad="0" halign="left" height="16"
left="10" mouse_opaque="true" name="ColorFilterSaturationText" v_pad="0"
width="355">
bottom_delta="-20" drop_shadow_visible="true" follows="left|top|right"
font="SansSerif" h_pad="0" halign="left" height="16"
left="10" mouse_opaque="true" name="ColorFilterSaturationText" v_pad="0"
width="355">
Saturation
</text>
<slider bottom_delta="-30" can_edit_text="true" decimal_digits="2" follows="left"
height="18" increment="0.01" initial_val="1.0" label="" left="14"
max_val="2" min_val="-1" mouse_opaque="true"
name="saturation" show_text="true" value="1.0" width="200" />
height="18" increment="0.01" initial_val="1.0" label="" left="14" val_width="35"
max_val="2" min_val="-2" mouse_opaque="true"
name="saturation" show_text="true" value="1.0" width="200" />
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom_delta="-20" drop_shadow_visible="true" follows="left|top|right"
font="SansSerif" h_pad="0" halign="left" height="16"
left="10" mouse_opaque="true" name="ColorFilterContrastText" v_pad="0"
width="355">
bottom_delta="-20" drop_shadow_visible="true" follows="left|top|right"
font="SansSerif" h_pad="0" halign="left" height="16"
left="10" mouse_opaque="true" name="ColorFilterContrastText" v_pad="0"
width="355">
Contrast
</text>
<slider bottom_delta="-30" can_edit_text="true"
decimal_digits="2" follows="left" height="18" increment="0.01"
initial_val="1.0" label="" left="14" max_val="4" min_val="0"
mouse_opaque="true" name="contrast" show_text="true"
value="1.0" width="200" />
decimal_digits="2" follows="left" height="18" increment="0.01" val_width="35"
initial_val="1.0" label="" left="14" max_val="4" min_val="0"
mouse_opaque="true" name="contrast" show_text="true"
value="1.0" width="200" />
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom_delta="-20" drop_shadow_visible="true" follows="left|top|right"
font="SansSerif" h_pad="0" halign="left" height="16"
left="10" mouse_opaque="true" name="ColorFilterBaseText" v_pad="0"
width="355">
Contrast Base Colora
bottom_delta="-20" drop_shadow_visible="true" follows="left|top|right"
font="SansSerif" h_pad="0" halign="left" height="16"
left="10" mouse_opaque="true" name="ColorFilterBaseText" v_pad="0"
width="355">
Contrast Base Colors
</text>
<slider bottom_delta="-30" can_edit_text="true"
decimal_digits="3" follows="left" height="18" increment="0.01"
initial_val="1.0" label="R" left="14" max_val="1" min_val="0"
mouse_opaque="true" name="contrast_base[0]" show_text="true" value="1.0"
width="200" />
decimal_digits="3" follows="left" height="18" increment="0.01"
initial_val="1.0" label="R" label_width="7" left="14" max_val="1" min_val="0"
mouse_opaque="true" name="contrast_base[0]" show_text="true" value="1.0"
width="200" />
<slider bottom_delta="-20" can_edit_text="true"
decimal_digits="3" follows="left" height="18" increment="0.01"
initial_val="1.0" label="G" left="14" max_val="1" min_val="0"
mouse_opaque="true" name="contrast_base[1]" show_text="true" value="1.0"
width="200" />
decimal_digits="3" follows="left" height="18" increment="0.01"
initial_val="1.0" label="G" label_width="7" left="14" max_val="1" min_val="0"
mouse_opaque="true" name="contrast_base[1]" show_text="true" value="1.0"
width="200" />
<slider bottom_delta="-20" can_edit_text="true"
decimal_digits="3" follows="left" height="18" increment="0.01"
initial_val="1.0" label="B" left="14" max_val="1" min_val="0"
mouse_opaque="true" name="contrast_base[2]" show_text="true" value="1.0"
width="200" />
decimal_digits="3" follows="left" height="18" increment="0.01"
initial_val="1.0" label="B" label_width="7" left="14" max_val="1" min_val="0"
mouse_opaque="true" name="contrast_base[2]" show_text="true" value="1.0"
width="200" />
<slider bottom_delta="-20" can_edit_text="true"
decimal_digits="3" follows="left" height="18" increment="0.01"
initial_val="0.5" label="I" left="14" max_val="1" min_val="0"
mouse_opaque="true" name="contrast_base[3]" show_text="true" value="1.0"
width="200" />
decimal_digits="3" follows="left" height="18" increment="0.01"
initial_val="0.5" label="I" label_width="7" left="14" max_val="1" min_val="0"
mouse_opaque="true" name="contrast_base[3]" show_text="true" value="1.0"
width="200" />
</panel>
<panel border="true" bottom="-180" follows="left|top|right|bottom" height="400"
label="Gauss Blur" left="1" mouse_opaque="false"
name="GaussBlurPanel" width="398">
<check_box bottom="-20" follows="left|top"
font="SansSerifSmall" height="16" initial_value="false" label="Enable"
left="14" mouse_opaque="true" name="enable_gauss_blur" width="200" />
label="Gauss Blur" left="1" mouse_opaque="false"
name="GaussBlurPanel" width="398">
<check_box bottom="-40" follows="left|top"
font="SansSerifSmall" height="16" initial_value="false" label="Enable"
left="4" mouse_opaque="true" name="enable_gauss_blur" width="200" />
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom_delta="-21" drop_shadow_visible="true" follows="left|top|right"
font="SansSerif" h_pad="0" halign="left" height="16"
left="10" mouse_opaque="true" name="GaussBlurPassesText" v_pad="0"
width="355">
bottom_delta="-21" drop_shadow_visible="true" follows="left|top|right"
font="SansSerif" h_pad="0" halign="left" height="16"
left="10" mouse_opaque="true" name="GaussBlurPassesText" v_pad="0"
width="355">
Passes to apply
</text>
<slider bottom_delta="-30" can_edit_text="true"
decimal_digits="0" follows="left"
height="18" increment="1" initial_val="9" label="" left="14"
max_val="25" min_val="1" mouse_opaque="true"
name="gauss_blur_passes" show_text="true" value="0.7" width="200" />
decimal_digits="0" follows="left"
height="18" increment="1" initial_val="9" label="" left="14"
max_val="25" min_val="1" mouse_opaque="true"
name="gauss_blur_passes" show_text="true" value="0.7" width="200" />
</panel>
<panel border="true" bottom="-180" follows="left|top|right|bottom" height="400"
label="Night Vision" left="1" mouse_opaque="false"
name="NightVisionPanel" width="398">
<check_box bottom="-20" follows="left|top"
font="SansSerifSmall" height="16" initial_value="false" label="Enable"
left="14" mouse_opaque="true" name="enable_night_vision" width="200" />
label="Night Vision" left="1" mouse_opaque="false"
name="NightVisionPanel" width="398">
<check_box bottom="-40" follows="left|top"
font="SansSerifSmall" height="16" initial_value="false" label="Enable"
left="4" mouse_opaque="true" name="enable_night_vision" width="200" />
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom_delta="-21" drop_shadow_visible="true" follows="left|top|right"
font="SansSerif" h_pad="0" halign="left" height="16"
left="10" mouse_opaque="true" name="NightVisionBrightMultText" v_pad="0"
width="355">
bottom_delta="-21" drop_shadow_visible="true" follows="left|top|right"
font="SansSerif" h_pad="0" halign="left" height="16"
left="10" mouse_opaque="true" name="NightVisionBrightMultText" v_pad="0"
width="355">
Light Amplification Multiple
</text>
<slider bottom_delta="-30" can_edit_text="true"
decimal_digits="3" follows="left"
height="18" increment="0.01" initial_val="3.0" label="" left="14"
max_val="10" min_val="1" mouse_opaque="true"
name="brightness_multiplier" show_text="true" value="0.7" width="200" />
<slider bottom_delta="-30" can_edit_text="true" val_width="50"
decimal_digits="3" follows="left"
height="18" increment="0.01" initial_val="3.0" label="" left="14"
max_val="10" min_val="1" mouse_opaque="true"
name="brightness_multiplier" show_text="true" value="0.7" width="220" />
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom_delta="-20" drop_shadow_visible="true" follows="left|top|right"
font="SansSerif" h_pad="0" halign="left" height="16"
left="10" mouse_opaque="true" name="NightVisionNoiseSizeText" v_pad="0"
width="355">
bottom_delta="-20" drop_shadow_visible="true" follows="left|top|right"
font="SansSerif" h_pad="0" halign="left" height="16"
left="10" mouse_opaque="true" name="NightVisionNoiseSizeText" v_pad="0"
width="355">
Noise Size
</text>
<slider bottom_delta="-30" can_edit_text="true"
decimal_digits="3" follows="left" height="18" increment="0.1"
initial_val="1" label="" left="14" max_val="100" min_val="1"
mouse_opaque="true" name="noise_size" show_text="true"
value="1.0" width="200" />
<slider bottom_delta="-30" can_edit_text="true" val_width="50"
decimal_digits="3" follows="left" height="18" increment="0.1"
initial_val="1" label="" left="14" max_val="100" min_val="1"
mouse_opaque="true" name="noise_size" show_text="true"
value="1.0" width="220" />
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom_delta="-20" drop_shadow_visible="true" follows="left|top|right"
font="SansSerif" h_pad="0" halign="left" height="16"
left="10" mouse_opaque="true" name="NightVisionNoiseStrengthText"
v_pad="0" width="355">
bottom_delta="-20" drop_shadow_visible="true" follows="left|top|right"
font="SansSerif" h_pad="0" halign="left" height="16"
left="10" mouse_opaque="true" name="NightVisionNoiseStrengthText"
v_pad="0" width="355">
Noise Strength
</text>
<slider bottom_delta="-30" can_edit_text="true" decimal_digits="3"
follows="left" height="18" increment="0.01" initial_val="0.3" label=""
left="14" max_val="1" min_val="0" mouse_opaque="true"
name="noise_strength" show_text="true" value="1.0" width="200" />
<slider bottom_delta="-30" can_edit_text="true" decimal_digits="3" val_width="50"
follows="left" height="18" increment="0.01" initial_val="0.3" label=""
left="14" max_val="1" min_val="0" mouse_opaque="true"
name="noise_strength" show_text="true" value="1.0" width="220" />
</panel>
<panel border="true" bottom="-180" follows="left|top|right|bottom" height="400"
label="Posterize" left="1" mouse_opaque="false"
name="PosterizePanel" width="398">
<check_box bottom="-20" follows="left|top"
font="SansSerifSmall" height="16" initial_value="false" label="Enable"
left="14" mouse_opaque="true" name="enable_posterize" width="200" />
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom_delta="-21" drop_shadow_visible="true" follows="left|top|right"
font="SansSerif" h_pad="0" halign="left" height="16"
left="10" mouse_opaque="true" name="PosterLayersText" v_pad="0"
width="355">
Layer Count
</text>
<slider bottom_delta="-30" can_edit_text="true"
decimal_digits="3" follows="left"
height="18" increment="1" initial_val="10" label="" left="14"
max_val="20" min_val="1" mouse_opaque="true"
name="posterize_layers" show_text="true" value="10" width="200" />
</panel>
<!--<panel border="true" bottom="-180" follows="left|top|right|bottom" height="400"
label="Bloom" left="1" mouse_opaque="true"
name="BloomPanel" width="398">
<check_box bottom="-20" control_name="BloomToggle" follows="left|top"
font="SansSerifSmall" height="16" initial_value="false" label="Enable"
left="14" mouse_opaque="true" name="BloomToggle" width="200" />
<panel border="true" bottom="-180" follows="left|top|right|bottom" height="400"
label="Posterize" left="1" mouse_opaque="false"
name="PosterizePanel" width="398">
<check_box bottom="-40" follows="left|top"
font="SansSerifSmall" height="16" initial_value="false" label="Enable"
left="4" mouse_opaque="true" name="enable_posterize" width="200" />
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom_delta="-21" drop_shadow_visible="true" follows="left|top|right"
font="SansSerif" h_pad="0" halign="left" height="16"
left="10" mouse_opaque="true" name="BloomExtractText" v_pad="0"
width="355">
bottom_delta="-21" drop_shadow_visible="true" follows="left|top|right"
font="SansSerif" h_pad="0" halign="left" height="16"
left="10" mouse_opaque="true" name="PosterLayersText" v_pad="0"
width="355">
Layer Count
</text>
<slider bottom_delta="-30" can_edit_text="true"
decimal_digits="3" follows="left"
height="18" increment="1" initial_val="10" label="" left="14"
max_val="20" min_val="1" mouse_opaque="true"
name="posterize_layers" show_text="true" value="10" width="200" />
</panel>
<!--<panel border="true" bottom="-180" follows="left|top|right|bottom" height="400"
label="Bloom" left="1" mouse_opaque="true"
name="BloomPanel" width="398">
<check_box bottom="-40" control_name="BloomToggle" follows="left|top"
font="SansSerifSmall" height="16" initial_value="false" label="Enable"
left="4" mouse_opaque="true" name="BloomToggle" width="200" />
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom_delta="-21" drop_shadow_visible="true" follows="left|top|right"
font="SansSerif" h_pad="0" halign="left" height="16"
left="10" mouse_opaque="true" name="BloomExtractText" v_pad="0"
width="355">
Luminosity Extraction
</text>
<slider bottom_delta="-30" can_edit_text="true" control_name="BloomExtract"
decimal_digits="3" follows="left" height="18" increment="0.01"
initial_val="0.9" label="" left="14" max_val="1" min_val="0"
mouse_opaque="true" name="BloomExtract" show_text="true" value="0.7"
width="200" />
decimal_digits="3" follows="left" height="18" increment="0.01"
initial_val="0.9" label="" left="14" max_val="1" min_val="0" val_width="41"
mouse_opaque="true" name="BloomExtract" show_text="true" value="0.7"
width="200" />
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom_delta="-20" drop_shadow_visible="true" follows="left|top|right"
font="SansSerif" h_pad="0" halign="left" height="16"
left="10" mouse_opaque="true" name="BloomSizeText" v_pad="0" width="355">
bottom_delta="-20" drop_shadow_visible="true" follows="left|top|right"
font="SansSerif" h_pad="0" halign="left" height="16"
left="10" mouse_opaque="true" name="BloomSizeText" v_pad="0" width="355">
Bloom Size
</text>
<slider bottom_delta="-30" can_edit_text="true" control_name="BloomSize"
decimal_digits="3" follows="left" height="18" increment="0.01"
initial_val="3.0" label="" left="14" max_val="20" min_val="0"
mouse_opaque="true" name="BloomSize" show_text="true" value="1.0"
width="200" />
decimal_digits="3" follows="left" height="18" increment="0.01"
initial_val="3.0" label="" left="14" max_val="20" min_val="0" val_width="41"
mouse_opaque="true" name="BloomSize" show_text="true" value="1.0"
width="200" />
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom_delta="-20" drop_shadow_visible="true" follows="left|top|right"
font="SansSerif" h_pad="0" halign="left" height="16"
left="10" mouse_opaque="true" name="BloomStrengthText" v_pad="0"
width="355">
bottom_delta="-20" drop_shadow_visible="true" follows="left|top|right"
font="SansSerif" h_pad="0" halign="left" height="16"
left="10" mouse_opaque="true" name="BloomStrengthText" v_pad="0"
width="355">
Bloom Strength
</text>
<slider bottom_delta="-30" can_edit_text="true" control_name="BloomStrength"
decimal_digits="3" follows="left" height="18" increment="0.01"
initial_val="1.2" label="" left="14" max_val="10" min_val="0"
mouse_opaque="true" name="BloomStrength" show_text="true" value="1.0"
width="200" />
</panel>-->
decimal_digits="3" follows="left" height="18" increment="0.01"
initial_val="1.2" label="" left="14" max_val="10" min_val="0" val_width="41"
mouse_opaque="true" name="BloomStrength" show_text="true" value="1.0"
width="200" />
</panel>-->
<panel border="true" bottom="-180" follows="left|top|right|bottom" height="400"
label="Extras" left="1" mouse_opaque="false" name="Extras"
width="398">
<button bottom="-33" enabled="true" font="SansSerif" halign="center" height="20"
label="LoadEffect" label_selected="LoadEffect" left="15"
mouse_opaque="true" name="PPLoadEffect" scale_image="true" width="100" />
<button bottom="-60" enabled="true" font="SansSerif" halign="center" height="20"
label="SaveEffect" label_selected="SaveEffect" left="15"
mouse_opaque="true" name="PPSaveEffect" scale_image="true" width="100" />
<combo_box allow_text_entry="false" bottom="-33" follows="left|top" height="18"
left_delta="120" max_chars="20" mouse_opaque="true" name="PPEffectsCombo"
width="150" />
<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-75"
enabled="true" follows="left|right|bottom" font="SansSerif"
handle_edit_keys_directly="false" height="20"
label="Effect Name" left="135" max_length="40" mouse_opaque="true"
name="PPEffectNameEditor" select_all_on_focus_received="false"
select_on_focus="false" tab_group="1" width="150" />
label="Extras" left="1" mouse_opaque="false" name="Extras"
width="398">
<combo_box allow_text_entry="false" bottom="-43" follows="left|top" height="18"
left="15" max_chars="20" mouse_opaque="true" name="PPEffectsCombo"
width="150" />
<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-86"
enabled="true" follows="left|right|bottom" font="SansSerif"
handle_edit_keys_directly="false" height="20"
label="Effect Name" left="15" max_length="40" mouse_opaque="true"
name="PPEffectNameEditor" select_all_on_focus_received="false"
select_on_focus="false" tab_group="1" width="150" />
<button bottom="-44" enabled="true" font="SansSerif" halign="center" height="20"
label="Load Effect" label_selected="Load Effect" left_delta="170"
mouse_opaque="true" name="PPLoadEffect" scale_image="true" width="100" />
<button bottom="-70" enabled="true" font="SansSerif" halign="center" height="20"
label="Save Effect" label_selected="Save Effect"
mouse_opaque="true" name="PPSaveEffect" scale_image="true" width="100" />
</panel>
</tab_container>
</floater>

24
indra/newview/skins/default/xui/en-us/floater_radar.xml
View File

@@ -60,7 +60,7 @@
<button
name="im_btn"
label="IM"
tool_tip="Open Instant Message session"
tool_tip="Open Instant Message session (Shift-Enter)"
left="10"
bottom_delta="-22"
width="80"
@@ -82,7 +82,7 @@
<button
name="teleport_btn"
label="TP to"
tool_tip="Teleport to avatar's position"
tool_tip="Teleport to avatar's position (Ctrl-Enter)"
left_delta="90"
bottom_delta="0"
width="80"
@@ -128,7 +128,7 @@
<button
name="focus_btn"
label="Focus"
tool_tip="Focus camera on this avatar in the list"
tool_tip="Focus camera on this avatar in the list (Enter)"
left="10"
bottom_delta="-22"
width="80"
@@ -267,6 +267,18 @@
font="SansSerifSmall"
follows="bottom|left"
/>
<!-- Lowest row -->
<button
name="estate_ban_btn"
label="Eject And Ban From Estate"
tool_tip="Eject and Ban this avatar from the estate"
left="10"
bottom_delta="-24"
width="260"
height="20"
font="SansSerifSmall"
follows="bottom|left"
/>
</panel>
<panel border="true" bottom_delta="-150" follows="left|top|right|bottom" height="255"
@@ -326,4 +338,10 @@
/>
</panel>
</tab_container>
<string name="has_entered">has entered</string>
<string name="has_left">has left</string>
<string name="the_sim">the sim</string>
<string name="draw_distance">draw distance</string>
<string name="shout_range">shout range</string>
<string name="chat_range">chat range</string>
</floater>

5
indra/newview/skins/default/xui/en-us/floater_script_queue.xml
View File

@@ -3,6 +3,11 @@
can_resize="true" enabled="true" height="400" left="408" min_height="100"
min_width="100" mouse_opaque="true" name="queue" title="Reset Progress"
width="300" border_bevel="none" border_thickness="0">
<string name="Starting">Starting [START] of [COUNT] items.</string>
<string name="Done">Done.</string>
<string name="Resetting">Resetting</string>
<string name="Running">Running</string>
<string name="NotRunning">Not Running</string>
<button bottom="-392" enabled="true" follows="right|bottom" font="SansSerif"
halign="center" height="24" label="Close" label_selected="Close" left="220"
mouse_opaque="true" name="close" width="64" />

7
indra/newview/skins/default/xui/en-us/menu_viewer.xml
View File

@@ -52,11 +52,16 @@
</menu_item_call>
<menu_item_separator bottom="-121" enabled="true" height="8" label="-----------" left="0"
mouse_opaque="true" name="separator2" width="243" />
<menu_item_call bottom="-140" enabled="true" height="19" label="Save Preview As..." left="0"
<menu_item_call bottom="-140" enabled="true" height="19" label="Save Preview As (TGA)..." left="0"
mouse_opaque="true" name="Save Preview As..." width="243">
<on_click function="File.SavePreview" userdata="" />
<on_enable function="File.EnableSaveAs" />
</menu_item_call>
<menu_item_call bottom="-140" enabled="true" height="19" label="Save Preview As (PNG)..." left="0"
mouse_opaque="true" name="Save Preview AsPNG..." width="243">
<on_click function="File.SavePreviewPNG" userdata="" />
<on_enable function="File.EnableSaveAs" />
</menu_item_call>
<menu_item_separator bottom="-148" enabled="true" height="8" label="-----------" left="0"
mouse_opaque="true" name="separator3" width="243" />
<menu_item_call bottom="-167" enabled="true" height="19" label="Take Snapshot" left="0"

76
indra/newview/skins/default/xui/en-us/notifications.xml
View File

@@ -1,5 +1,4 @@
<?xml version="1.0" ?><notifications>
<global name="skipnexttime">
Don&apos;t show me this again
@@ -195,7 +194,7 @@ The media filters have been cleared
name="MissingAlert"
label="Unknown Alert Message"
type="alertmodal">
Your version of [APP_NAME] does not know how to display the alert message it just received.
Your version of [APP_NAME] does not know how to display the alert message it just received. Please verify that you have the latest [APP_NAME] installed.
Error details: The alert called &apos;[_NAME]&apos; was not found in notifications.xml.
<usetemplate
@@ -269,7 +268,7 @@ An error occurred while updating [APP_NAME]. Please download the latest version
icon="alertmodal.tga"
name="LoginFailedNoNetwork"
type="alertmodal">
Could not connect to the [SECOND_LIFE_GRID].
Could not connect to the [SECOND_LIFE_GRID].
&apos;[DIAGNOSTIC]&apos;
Make sure your Internet connection is working properly.
<usetemplate
@@ -430,7 +429,7 @@ Save all changes to clothing/body parts?
icon="alertmodal.tga"
name="GrantModifyRights"
type="alertmodal">
Granting modify rights to another resident allows them to change, delete or take ANY objects you may have in-world. Be VERY careful when handing out this permission.
Granting modify rights to another Resident allows them to change, delete or take ANY objects you may have in-world. Be VERY careful when handing out this permission.
Do you want to grant modify rights for [NAME]?
<usetemplate
name="okcancelbuttons"
@@ -442,7 +441,7 @@ Do you want to grant modify rights for [NAME]?
icon="alertmodal.tga"
name="GrantModifyRightsMultiple"
type="alertmodal">
Granting modify rights to another resident allows them to change ANY objects you may have in-world. Be VERY careful when handing out this permission.
Granting modify rights to another Resident allows them to change ANY objects you may have in-world. Be VERY careful when handing out this permission.
Do you want to grant modify rights for the selected Residents?
<usetemplate
name="okcancelbuttons"
@@ -1641,7 +1640,7 @@ Could not find &apos;data&apos; chunk in WAV header:
Wrong chunk size in WAV file:
[FILE]
</notification>
<notification
icon="alertmodal.tga"
name="SoundFileInvalidTooLong"
@@ -1716,11 +1715,11 @@ Unable to upload [FILE] due to the following reason: [REASON]
Please try again later.
</notification>
<notification
icon="alertmodal.tga"
name="UploadCostConfirmation"
type="alertmodal">
This upload will cost L$[PRICE], do you wish to continue with the upload?
<notification
icon="alertmodal.tga"
name="UploadCostConfirmation"
type="alertmodal">
This upload will cost [CURRENCY][PRICE], do you wish to continue with the upload?
<usetemplate
name="okcancelbuttons"
notext="Cancel"
@@ -1853,7 +1852,7 @@ Sorry, but system was unable to locate landmark destination.
<notification
icon="alertmodal.tga"
name="timeout_tport"
type="alertmodal">
type="notifytip">
Sorry, but system was unable to complete the teleport connection. Try again in a moment.
</notification>
<notification
@@ -1877,7 +1876,7 @@ The asset queue in this region is currently clogged so your teleport request wil
<notification
icon="alertmodal.tga"
name="expired_tport"
type="alertmodal">
type="notifytip">
Sorry, but the system was unable to complete your teleport request in a timely fashion. Please try again in a few minutes.
</notification>
<notification
@@ -1918,7 +1917,9 @@ Unable to force land ownership because selection spans multiple regions. Please
icon="alertmodal.tga"
name="ForceOwnerAuctionWarning"
type="alertmodal">
This parcel is up for auction. Forcing ownership will cancel the auction and potentially make some residents unhappy if bidding has begun. Force ownership?
This parcel is up for auction. Forcing ownership will cancel the auction and potentially make some Residents unhappy if bidding has begun.
Force ownership?
<tag>confirm</tag>
<usetemplate
name="okcancelbuttons"
notext="Cancel"
@@ -2656,7 +2657,7 @@ You have been moved into a nearby region.
<notification
icon="alertmodal.tga"
name="ClothingLoading"
type="alertmodal">
type="notifytip">
Your clothing is still downloading.
You can use [SECOND_LIFE] normally and other people will see you correctly.
<form name="form">
@@ -2882,7 +2883,7 @@ Can&apos;t add estate owner to estate &apos;Banned Resident&apos; list.
<notification
icon="alertmodal.tga"
name="CanNotChangeAppearanceUntilLoaded"
type="alertmodal">
type="notifytip">
Can&apos;t change appearance until clothing and shape are loaded.
</notification>
@@ -3083,6 +3084,7 @@ Visit the [SECOND_LIFE] Public Issue Tracker, where you can report bugs and othe
name="WebLaunchSinguIssue"
type="alertmodal">
Visit the Singularity Issue Tracker, to report bugs and issues with Singularity Viewer.
Please be sure that your report won't be a duplicate of an existing one.
<usetemplate
ignoretext="When launching web browser to view Singularity Issue Tracker"
name="okcancelignore"
@@ -3118,7 +3120,7 @@ Go to the Official [GRID_OWNER] Blog, for the latest news and information.
icon="alertmodal.tga"
name="WebLaunchLSLGuide"
type="alertmodal">
Go to the Scripting Guide for scripting help?
Do you want to open the Scripting Guide for help with scripting?
<usetemplate
ignoretext="When launching web browser to view the Scripting Guide"
name="okcancelignore"
@@ -3130,7 +3132,7 @@ Go to the Scripting Guide for scripting help?
icon="alertmodal.tga"
name="WebLaunchLSLWiki"
type="alertmodal">
Go to the LSL Portal for scripting help?
Do you want to visit the LSL Portal for help with scripting?
<usetemplate
ignoretext="When launching web browser to view the LSL Portal"
name="okcancelignore"
@@ -3565,6 +3567,18 @@ Kick [EVIL_USER] from this estate?
yestext="OK"/>
</notification>
<notification
icon="alert.tga"
label="Confirm Kick and Ban"
name="EstateBanUser"
type="alert">
Kick and Ban [EVIL_USER] from this estate?
<usetemplate
name="okcancelbuttons"
notext="Cancel"
yestext="OK"/>
</notification>
<notification
icon="alertmodal.tga"
name="EstateChangeCovenant"
@@ -3737,7 +3751,7 @@ You can click &apos;Change Preference&apos; to raise your maturity Rating prefer
icon="alertmodal.tga"
name="TooManyPrimsSelected"
type="alertmodal">
"There are too many prims selected. Please select [MAX_PRIM_COUNT] or fewer prims and try again"
There are too many prims selected. Please select [MAX_PRIM_COUNT] or fewer prims and try again
<usetemplate
name="okbutton"
yestext="OK"/>
@@ -4253,7 +4267,7 @@ Default: off
label="Voice Version Mismatch"
name="VoiceVersionMismatch"
type="alertmodal">
This version of [APP_NAME] is not compatible with the Voice Chat feature in this region. Please upgrate to the latest version.
This version of [APP_NAME] is not compatible with the Voice Chat feature in this region. In order for Voice Chat to function correctly you will need to update [APP_NAME].
</notification>
<notification
@@ -5542,7 +5556,7 @@ Terrain.raw downloaded
icon="notifytip.tga"
name="GestureMissing"
type="notifytip">
Gesture [NAME] is missing from database.
Gesture [NAME] is missing from the database.
</notification>
<notification
@@ -5901,7 +5915,7 @@ The objects on the selected parcel of land that is owned by [NAME] have been ret
icon="notify.tga"
name="OtherObjectsReturned2"
type="notify">
The objects on the selected parcel of land owned by the resident &apos;[NAME]&apos; have been returned to their owner.
The objects on the selected parcel of land owned by the Resident &apos;[NAME]&apos; have been returned to their owner.
</notification>
<notification
@@ -5934,7 +5948,7 @@ You can be hurt here. If you die, you will be teleported to your home location.
name="NoFly"
type="notify">
This land has flying disabled (&apos;no fly&apos;).
You cannot fly here.
You cannot fly here, without Always allow fly enabled from System preferences.
<unique/>
</notification>
@@ -6011,6 +6025,14 @@ You cannot create objects here.
yestext="OK"
/>
</notification>
<notification
icon="notify.tga"
name="SeeAvatars"
type="notify">
<unique/>
This parcel hides avatars and text chat from another parcel. You can&apos;t see other residents outside the parcel, and those outside are not able to see you. Regular text chat on channel 0 is also blocked.
</notification>
<notification
icon="notify.tga"
name="ScriptsStopped"
@@ -6030,14 +6052,14 @@ This region is not running any scripts.
name="NoOutsideScripts"
type="notify">
This land has outside scripts disabled (&apos;no outside scripts&apos;).
No scripts will run except those belonging to the land owner.
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&apos;re in.
You can only claim public land in the Region you&apos;re in.
</notification>
<notification
@@ -6294,6 +6316,7 @@ An object named [OBJECTFROMNAME] owned by (an unknown user) has given you a [OBJ
name="GodMessage"
type="notify">
[NAME]
[MESSAGE]
</notification>
@@ -6322,7 +6345,7 @@ An object named [OBJECTFROMNAME] owned by (an unknown user) has given you a [OBJ
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">
@@ -7381,4 +7404,3 @@ Your shape, skin, hair or eyes might be defect.
</notifications>

1
indra/newview/skins/default/xui/en-us/panel_avatar.xml
View File

@@ -146,6 +146,7 @@
<scroll_list background_visible="true" bottom="-282" column_padding="5" draw_border="true"
follows="left|top" height="90" left="79" mouse_opaque="false"
multi_select="false" name="groups" width="321" />
<string name="None">None</string>
<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="-304" drop_shadow_visible="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="right" height="16" left="4"

25
indra/newview/skins/default/xui/en-us/panel_preferences_ascent_chat.xml
View File

@@ -16,7 +16,7 @@
<view_border bevel_style="none" border_thickness="1" bottom_delta="0" follows="top|left" height="75"
left="235" name="CmdDivisor" width="0"/>
-->
<text bottom="-15" left="250" name="objects_link_text_box2" width="300">Chat:</text>
<text bottom="-15" left="250" name="objects_link_text_box2" width="300">Chat:</text>
<check_box bottom_delta="-25" left_delta="-5" follows="left|top" control_name="PlayTypingSound" initial_value="true"
label="Play the typing sound for local chat" tool_tip="Silences the chatting type sound, making it quieter for things like performances." name="play_typing_sound_check"/>
<check_box bottom_delta="-20" follows="left|top" control_name="HideNotificationsInChat" initial_value="false"
@@ -25,7 +25,7 @@
label="Allow MU pose method." tool_tip="Allows the use of both /me and : to perform emotes." name="allow_mu_pose_check"/>
<check_box bottom_delta="-20" follows="left|top" control_name="AscentAutoCloseOOC"
label="Auto-close OOC comments." tool_tip="Will automatically append '))' to any message starting with '((', or visa versa." name="close_ooc_check"/>
<text bottom_delta="-15" follows="left|top" name="objects_link_text_box3">Show links on chatting object names in chat history for:</text>
<text bottom_delta="-15" follows="left|top" name="objects_link_text_box3">Show links on chatting object names in chat history for:</text>
<radio_group bottom_delta="-26" control_name="LinksForChattingObjects" tool_tip="Enables a link to show you the owner of the speaking object."
follows="top" height="20" left="20" name="objects_link" width="350">
<radio_item bottom_delta="0" left_delta="5" name="no_object" width="48">No object</radio_item>
@@ -70,12 +70,21 @@
<panel border="true" left="1" bottom="-408" height="408" width="500" label="Spam" name="Spam">
<check_box control_name="_NACL_AntiSpamGlobalQueue" label="No messagetype-specific spam queues" name="spammsg_checkbox" width="256" left="6"/>
<button height="23" label="Reset antispam queues" label_selected="Reset antispam queues" name="reset_antispam" width="230" bottom_delta="0" left="260"/>
<spinner control_name="_NACL_AntiSpamTime" decimal_digits="0" increment="1" min_val="1" max_val="60" label="Antispam time(seconds):" label_width="330" name="antispamtime" width="390" left="10"/>
<spinner control_name="_NACL_AntiSpamAmount" decimal_digits="0" increment="1" min_val="5" max_val="100" label="Antispam amount:" label_width="330" name="antispamamount" width="390"/>
<spinner control_name="_NACL_AntiSpamSoundMulti" decimal_digits="0" increment="1" min_val="1" max_val="100" label="Amount multiplicatior for sound antispam:" label_width="330" left="10" name="antispamsoundmulti" width="390"/>
<spinner control_name="_NACL_AntiSpamSoundPreloadMulti" decimal_digits="0" increment="1" min_val="1" max_val="99999" label="Amount multiplicatior for sound preload antispam:" label_width="330" name="antispamsoundpreloadmulti" width="390"/>
<spinner control_name="_NACL_AntiSpamNewlines" decimal_digits="0" increment="1" min_val="5" max_val="99999" label="Amount of newlines to instablock message:" label_width="330" name="antispamnewlines" width="390"/>
<check_box control_name="_NACL_Antispam" height="16" label="Disable -all- dialogs (resets on login)" name="antispam_checkbox" left="6"/>
<spinner control_name="_NACL_AntiSpamTime" decimal_digits="0" increment="1" min_val="0" max_val="60" label="Antispam time(seconds):" label_width="330" tool_tip="Lower is less sensitive, 0 will turn off Antispam, but not Dialog Blocking." name="antispamtime" width="390" left="10"/>
<spinner control_name="_NACL_AntiSpamAmount" decimal_digits="0" increment="1" min_val="5" max_val="99999" label="Antispam amount:" label_width="330" tool_tip="Higher is less sensitive" name="antispamamount" width="390"/>
<spinner control_name="_NACL_AntiSpamSoundMulti" decimal_digits="0" increment="1" min_val="1" max_val="99999" label="Amount multiplicatior for sound antispam:" label_width="330" tool_tip="Higher is less sensitive" left="10" name="antispamsoundmulti" width="390"/>
<spinner control_name="_NACL_AntiSpamSoundPreloadMulti" decimal_digits="0" increment="1" min_val="1" max_val="99999" label="Amount multiplicatior for sound preload antispam:" label_width="330" tool_tip="Higher is less sensitive" name="antispamsoundpreloadmulti" width="390"/>
<spinner control_name="_NACL_AntiSpamNewlines" decimal_digits="0" increment="1" min_val="5" max_val="99999" label="Amount of newlines to instablock message:" label_width="330" tool_tip="Higher is less sensitive" name="antispamnewlines" width="390"/>
<check_box control_name="_NACL_Antispam" height="16" label="Disable -all- dialogs (resets on login)" name="antispam_checkbox" left="6"/>
<text name="Block All Dialogs From" left="10">Block All Dialogs From</text>
<check_box control_name="AntiSpamAlerts" height="16" label="Alerts" name="Alerts" left="14"/>
<check_box control_name="AntiSpamFriendshipOffers" height="16" label="Friendship Offers" name="Friendship Offers" bottom_delta="0" left_delta="120"/>
<check_box control_name="AntiSpamGroupInvites" height="16" label="Group Invites" name="Group Invites" bottom_delta="0" left_delta="120"/>
<check_box control_name="AntiSpamGroupNotices" height="16" label="Group Notices" name="Group Notices" bottom_delta="0" left_delta="120"/>
<check_box control_name="AntiSpamItemOffers" height="16" label="Item Offers" name="Item Offers" left="14"/>
<check_box control_name="AntiSpamScripts" height="16" label="Scripts" name="Scripts" bottom_delta="0" left_delta="120"/>
<check_box control_name="AntiSpamTeleports" height="16" label="Teleport Offers" name="Teleport Offers" bottom_delta="0" left_delta="120"/>
<check_box control_name="AntiSpamNotify" height="16" label="Notify when spam is blocked" name="Notify On Spam" tool_tip="When enabled, the bottom right corner may become a source of pseudo-spam whenever real spam is blocked." left="6"/>
</panel>
<panel border="true" bottom="-580" height="525" label="Text Options" left="1" name="TextOptions" width="418">

2
indra/newview/skins/default/xui/en-us/panel_preferences_ascent_system.xml
View File

@@ -120,7 +120,7 @@
<spinner bottom_delta="60" decimal_digits="0" follows="top" height="16" increment="1" label="Alpha" label_width="45" left_delta="70" max_val="100" min_val="0" name="alpha" width="97" control_name="EmeraldBuildPrefs_Alpha"/>
<spinner bottom_delta="-20" decimal_digits="2" follows="top" height="16" increment="0.05" label="Glow" label_width="45" max_val="1" min_val="0" name="glow" width="97" control_name="EmeraldBuildPrefs_Glow"/>
<check_box follows="top" height="16" label="Full Bright" name="EmFBToggle" control_name="EmeraldBuildPrefs_FullBright"/>
<text follows="top">Shine</text>
<text name="shine" follows="top">Shine</text>
<combo_box bottom_delta="-5" follows="top" left_delta="33" height="18" name="combobox shininess" tool_tip="Set the amount of shine for the object" width="64" control_name="EmeraldBuildPrefs_Shiny">
<combo_item name="None" value="None">None</combo_item>
<combo_item name="Low" value="Low">Low</combo_item>

123
indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml
View File

@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel border="true" bottom="-439" height="438" label="Graphics" left="102" name="Display panel" width="517">
<button bottom="-22" height="18" label="?" left="470" name="GraphicsPreferencesHelpButton" width="22"/>
<panel bottom="-449" height="438" label="Graphics" name="Display panel" width="517">
<check_box bottom="-23" height="16" initial_value="false" label="Run viewer in a window" left="10" name="windowed mode" width="120" tool_tip="If unchecked, viewer will display full-screen when logged in."/>
<text bottom="-62" height="12" name="WindowSizeLabel">Window Size:</text>
<combo_box bottom="-67" height="18" left="165" name="windowsize combo" width="150">
@@ -21,25 +20,29 @@
<combo_item name="8:5(Widescreen)" value="1.6">16:10 (Widescreen PC)</combo_item>
<combo_item name="16:9(Widescreen)" value="1.7777777">16:9 (Widescreen TV)</combo_item>
</combo_box>
<check_box bottom="-44" control_name="FullScreenAutoDetectAspectRatio" height="16" initial_value="false" label="Auto-detect ratio" left="358" name="aspect_auto_detect" width="256"/>
<text bottom="-91" height="12" left="10" name="QualityText">Quality &amp; Performance:</text>
<text bottom="-91" height="12" left="135" name="FasterText">Faster</text>
<text bottom="-107" height="12" left_delta="23" name="ShadersPrefText">Low</text>
<text bottom="-107" height="12" left_delta="47" name="ShadersPrefText2">Mid</text>
<text bottom="-107" height="12" left_delta="47" name="ShadersPrefText3">High</text>
<text bottom="-107" height="12" left_delta="47" name="ShadersPrefText4">Ultra</text>
<text bottom="-91" height="12" left_delta="14" name="QualityText2">Higher Quality</text>
<button bottom_delta="-20" height="20" label="Default" tool_tip="Reset to recommended graphics settings" left="355" name="Defaults" scale_image="true" width="100"/>
<check_box bottom="-44" control_name="FullScreenAutoDetectAspectRatio" height="16" initial_value="false" label="Auto-detect ratio" left="350" name="aspect_auto_detect" width="256"/>
<tab_container follows="all" bottom="0" border="false" left="0" height="360" width="518" name="graphics_tab" tab_position="bottom">
<panel border="true" bottom="-439" height="438" label="Main" left="102" name="Main" width="517">
<button bottom="327" height="18" label="?" left="470" name="GraphicsPreferencesHelpButton" width="22"/>
<text bottom="330" height="12" left="10" name="QualityText">Quality &amp; Performance:</text>
<text bottom_delta="0" height="12" left="135" name="FasterText">Faster</text>
<text bottom_delta="-16" height="12" left_delta="23" name="ShadersPrefText">Low</text>
<text bottom_delta="0" height="12" left_delta="47" name="ShadersPrefText2">Mid</text>
<text bottom_delta="0" height="12" left_delta="47" name="ShadersPrefText3">High</text>
<text bottom_delta="0" height="12" left_delta="47" name="ShadersPrefText4">Ultra</text>
<text bottom_delta="16" height="12" left_delta="23" name="QualityText2">Higher Quality</text>
<!-- Are these icons really necessary?
<icon bottom="-89" height="14" image_name="rounded_square.tga" left="173" name="LowDivet" width="2"/>
<icon bottom="-89" height="14" image_name="rounded_square.tga" left_delta="44" name="MidDivet" width="2"/>
<icon bottom="-89" height="14" image_name="rounded_square.tga" left_delta="44" name="HighDivet" width="2"/>
<icon bottom="-89" height="14" image_name="rounded_square.tga" left_delta="44" name="UltraDivet" width="2"/>
-->
<slider bottom="-91" control_name="RenderQualityPerformance" increment="1" initial_val="0" left="165" max_val="3" min_val="0" name="QualityPerformanceSelection" show_text="false" width="150" />
<check_box bottom="-96" control_name="RenderCustomSettings" label="Custom" left="395" initial_value="true" name="CustomSettings"/>
<slider bottom_delta="0" control_name="RenderQualityPerformance" increment="1" initial_val="0" left="165" max_val="3" min_val="0" name="QualityPerformanceSelection" show_text="false" width="150" />
<check_box bottom_delta="-5" control_name="RenderCustomSettings" label="Custom" left="395" initial_value="true" name="CustomSettings"/>
<!--view_border bevel_style="none" bottom="-395" height="280" left="5" name="GraphicsBorder" width="485"/-->
<text bottom="-130" height="12" left="10" name="ShadersText">Shaders:</text>
<check_box bottom_delta="-23" control_name="RenderTransparentWater" height="16" initial_value="true" label="Transparent water" left="10" name="TransparentWater"/>
<text bottom="300" height="12" left="10" name="ShadersText">Shaders:</text>
<check_box bottom_delta="-23" control_name="RenderTransparentWater" height="16" initial_value="true" label="Transparent water" left="10" name="TransparentWater"/>
<check_box bottom_delta="-17" control_name="RenderObjectBump" height="16" initial_value="true" label="Bump mapping and shiny" left="10" name="BumpShiny"/>
<check_box bottom_delta="-17" control_name="RenderLocalLights" height="16" label="Local Lights" name="LightingDetailRadio"/>
<check_box bottom_delta="-17" control_name="VertexShaderEnable" height="16" initial_value="true" label="Basic shaders" left_delta="0" name="BasicShaders" tool_tip="Disabling this option may prevent some graphics card drivers from crashing."/>
@@ -69,40 +72,64 @@
<combo_item name="4" value="4">Everything</combo_item>
</combo_box>
<slider bottom_delta="-20" left="5" control_name="RenderAvatarPhysicsLODFactor" increment="0.1" label=" Avatar Physics:" label_width="79" max_val="1" min_val="0" name="AvatarPhysicsDetail" show_text="false" width="160"/>
<text bottom_delta="-2" left="170" height="12" name="AvatarPhysicsDetailText">Off</text>
<!--text bottom="-131" height="12" left="464" name="DrawDistanceMeterText1">m</text-->
<text bottom="-131" height="12" left="470" name="DrawDistanceMeterText2">m</text>
<slider bottom="-135" control_name="RenderFarClip" decimal_digits="0" height="16" increment="8" initial_val="160" label="Draw Distance:" label_width="101" left="215" max_val="1024" min_val="64" name="DrawDistance" width="262"/>
<slider bottom_delta="-15" control_name="RenderMaxPartCount" decimal_digits="0" height="16" increment="256" initial_val="4096" label="Max. Particle Count:" label_width="101" max_val="8192" min_val="0" name="MaxParticleCount" width="262"/>
<slider bottom_delta="-15" control_name="RenderAvatarMaxVisible" decimal_digits="0" increment="1" initial_val="35" label="Max non-impostors" label_width="101" max_val="50" min_val="1" name="AvatarMaxVisible" width="250"/>
<slider bottom_delta="-25" control_name="RenderGlowResolutionPow" decimal_digits="0" height="16" increment="1" initial_val="8" label="Post Process Quality:" label_width="101" max_val="9" min_val="8" name="RenderPostProcess" show_text="false" width="226"/>
<text bottom_delta="-20" height="12" left="215" name="MeshDetailText">Level of Detail:</text>
<slider bottom_delta="-20" control_name="RenderVolumeLODFactor" increment="0.09375" label=" Objects:" label_width="79" max_val="2" min_val="0.5" name="ObjectMeshDetail" show_text="false" width="223"/>
<slider bottom_delta="-20" control_name="RenderFlexTimeFactor" increment="0.1" label=" Flexiprims:" label_width="79" max_val="1" min_val="0" name="FlexibleMeshDetail" show_text="false" width="223"/>
<slider bottom_delta="-20" control_name="RenderTreeLODFactor" increment="0.125" label=" Trees:" label_width="79" max_val="1" min_val="0" name="TreeMeshDetail" show_text="false" width="223"/>
<slider bottom_delta="-20" control_name="RenderAvatarLODFactor" increment="0.125" label=" Avatars:" label_width="79" max_val="1" min_val="0" name="AvatarMeshDetail" show_text="false" width="223"/>
<slider bottom_delta="-20" control_name="RenderTerrainLODFactor" increment="0.125" label=" Terrain:" label_width="79" max_val="2" min_val="1" name="TerrainMeshDetail" show_text="false" width="223"/>
<slider bottom_delta="-20" control_name="WLSkyDetail" decimal_digits="0" increment="8" label=" Sky:" label_width="79" max_val="128" min_val="16" name="SkyMeshDetail" show_text="false" width="223"/>
<text bottom="-192" height="12" left="444" name="PostProcessText">Low</text>
<text bottom_delta="-38" height="12" name="ObjectMeshDetailText">Low</text>
<text bottom_delta="-20" height="12" name="FlexibleMeshDetailText">Low</text>
<text bottom_delta="-20" height="12" name="TreeMeshDetailText">Low</text>
<text bottom_delta="-20" height="12" name="AvatarMeshDetailText">Low</text>
<text bottom_delta="-20" height="12" name="TerrainMeshDetailText">Low</text>
<text bottom_delta="-20" height="12" name="SkyMeshDetailText">Low</text>
<text bottom="-360" height="12" left="230" name="AvatarRenderingText">Avatar Rendering:</text>
<check_box bottom_delta="-16" control_name="RenderUseImpostors" initial_value="true" label="Avatar impostors" name="AvatarImpostors"/>
<check_box bottom_delta="-16" control_name="RenderAvatarVP" initial_value="true" label="Hardware skinning" name="AvatarVertexProgram"/>
<check_box bottom_delta="-16" control_name="RenderAvatarCloth" initial_value="true" label="Avatar cloth" name="AvatarCloth"/>
<text bottom="-360" height="12" left="395" name="TerrainDetailText">Terrain detail:</text>
<radio_group bottom_delta="-40" control_name="RenderTerrainDetail" draw_border="false" height="38" name="TerrainDetailRadio" width="321">
<slider bottom_delta="-20" left="5" control_name="RenderAvatarPhysicsLODFactor" increment="0.1" label=" Avatar Physics:" label_width="79" max_val="1" min_val="0" name="AvatarPhysicsDetail" show_text="false" width="160"/>
<text bottom_delta="-2" left="170" height="12" name="AvatarPhysicsDetailText">Off</text>
<text bottom="299" left="470" height="12" name="DrawDistanceMeterText1">m</text>
<text bottom="299" left="470" height="12" name="DrawDistanceMeterText2">m</text>
<slider bottom="295" left="215" control_name="RenderFarClip" decimal_digits="0" height="16" increment="8" initial_val="160" label="Draw Distance:" label_width="101" max_val="1024" min_val="64" name="DrawDistance" width="262"/>
<slider bottom_delta="-15" control_name="RenderMaxPartCount" decimal_digits="0" height="16" increment="256" initial_val="4096" label="Max. Particle Count:" label_width="101" max_val="8192" min_val="0" name="MaxParticleCount" width="262"/>
<slider bottom_delta="-15" control_name="RenderAvatarMaxVisible" decimal_digits="0" increment="1" initial_val="35" label="Max non-impostors" label_width="101" max_val="50" min_val="1" name="AvatarMaxVisible" width="250"/>
<slider bottom_delta="-25" control_name="RenderGlowResolutionPow" decimal_digits="0" height="16" increment="1" initial_val="8" label="Post Process Quality:" label_width="101" max_val="9" min_val="8" name="RenderPostProcess" show_text="false" width="226"/>
<text bottom_delta="-15" height="12" left="215" name="MeshDetailText">Level of Detail:</text>
<slider bottom_delta="-20" control_name="RenderVolumeLODFactor" increment="0.09375" label=" Objects:" label_width="79" max_val="2" min_val="0.5" name="ObjectMeshDetail" show_text="false" width="223"/>
<slider bottom_delta="-20" control_name="RenderFlexTimeFactor" increment="0.1" label=" Flexiprims:" label_width="79" max_val="1" min_val="0" name="FlexibleMeshDetail" show_text="false" width="223"/>
<slider bottom_delta="-20" control_name="RenderTreeLODFactor" increment="0.125" label=" Trees:" label_width="79" max_val="1" min_val="0" name="TreeMeshDetail" show_text="false" width="223"/>
<slider bottom_delta="-20" control_name="RenderAvatarLODFactor" increment="0.125" label=" Avatars:" label_width="79" max_val="1" min_val="0" name="AvatarMeshDetail" show_text="false" width="223"/>
<slider bottom_delta="-20" control_name="RenderTerrainLODFactor" increment="0.125" label=" Terrain:" label_width="79" max_val="2" min_val="1" name="TerrainMeshDetail" show_text="false" width="223"/>
<slider bottom_delta="-20" control_name="WLSkyDetail" decimal_digits="0" increment="8" label=" Sky:" label_width="79" max_val="128" min_val="16" name="SkyMeshDetail" show_text="false" width="223"/>
<text bottom_delta="100" left_delta="229" height="12" name="ObjectMeshDetailText">Low</text>
<text bottom_delta="-20" height="12" name="FlexibleMeshDetailText">Low</text>
<text bottom_delta="-20" height="12" name="TreeMeshDetailText">Low</text>
<text bottom_delta="-20" height="12" name="AvatarMeshDetailText">Low</text>
<text bottom_delta="-20" height="12" name="TerrainMeshDetailText">Low</text>
<text bottom_delta="-20" height="12" name="SkyMeshDetailText">Low</text>
<text bottom_delta="-30" height="12" left="230" name="AvatarRenderingText">Avatar Rendering:</text>
<check_box bottom_delta="-20" control_name="RenderUseImpostors" initial_value="true" label="Avatar impostors" name="AvatarImpostors"/>
<check_box bottom_delta="-16" control_name="RenderAvatarVP" initial_value="true" label="Hardware skinning" name="AvatarVertexProgram"/>
<check_box bottom_delta="-16" control_name="RenderAvatarCloth" initial_value="true" label="Avatar cloth" name="AvatarCloth"/>
<text bottom_delta="53" height="12" left="395" name="TerrainDetailText">Terrain detail:</text>
<radio_group bottom_delta="-44" control_name="RenderTerrainDetail" draw_border="false" height="38" name="TerrainDetailRadio" width="321">
<radio_item bottom="-15" height="16" left="3" name="0" width="315">Low</radio_item>
<radio_item bottom="-31" height="16" name="2" width="315">High</radio_item>
</radio_group>
<button bottom="-440" height="20" label="Reset to defaults" left="10" name="Defaults" scale_image="true" width="240"/>
<!--button bottom="-440" height="20" label="Advanced" left="230" name="CustomSettingsButton" scale_image="true" width="120" toggle="true" control_name="RenderCustomSettings"/-->
<button bottom="-440" height="20" label="Hardware" left="370" name="GraphicsHardwareButton" scale_image="true" width="120"/>
<string name="resolution_format">[RES_X] x [RES_Y]</string>
<string name="aspect_ratio_text">[NUM]:[DEN]</string>
</radio_group>
<text bottom="-106" height="12" left="444" name="PostProcessText">Low</text>
</panel>
<panel border="true" bottom="-400" height="244" left="50" name="Hardware" label="Hardware" width="500">
<check_box bottom="-22" control_name="RenderAnisotropic" height="16" initial_value="false" label="Anisotropic Filtering (slower when enabled)" left="5" name="ani" width="256"/>
<text bottom="-37" height="12" left="10" name="Antialiasing:" width="128">Antialiasing:</text>
<combo_box bottom="-41" control_name="RenderFSAASamples" height="16" initial_value="false" label="Antialiasing" left="148" name="fsaa" width="64">
<combo_item name="FSAADisabled" value="0">Disabled</combo_item>
<combo_item name="2x" value="2">2x</combo_item>
<combo_item name="4x" value="4">4x</combo_item>
<combo_item name="8x" value="8">8x</combo_item>
<combo_item name="16x" value="16">16x</combo_item>
</combo_box>
<spinner bottom_delta="70" control_name="TextureMemory" decimal_digits="0" height="16" increment="16" initial_val="32" label="Texture Memory (MB):" label_width="138" left="10" max_val="4096" min_val="0" name="GrapicsCardTextureMemory" tool_tip="Amount of memory to allocate for textures. Defaults to Video Card Memory. Reducing this may improve performance but may also make textures blurry." width="202"/>
<check_box bottom_delta="-25" control_name="RenderVBOEnable" height="16" initial_value="true" label="Enable OpenGL Vertex Buffer Objects" left="5" name="vbo"
tool_tip="Enabling this on modern hardware gives a performance gain. However, older hardware often has poor implementations of VBOs and you may get crashes when this is enabled."/>
<check_box bottom_delta="-18" control_name="ShyotlRenderUseStreamVBO" height="16" initial_value="false" label="Enable Streamed VBOs" left="14" name="vbo_stream"
tool_tip="Disabling this may improve performance when VBOs are enabled. Disabling produced observable improvement on various AMD GPUs."/>
<check_box bottom_delta="-25" control_name="RenderUseFBO" height="16" initial_value="true" label="Enable OpenGL Frame Buffer Objects" left="5" name="fbo"
tool_tip="Enabling this on modern hardware can provide a performance gain. However, enabling this when combined with antialiasing on AMD GPUs may cause edge artifacts. This setting is required for deferred rendering."/>
<spinner bottom="-42" control_name="RenderGamma" decimal_digits="2" height="16" increment="0.01" initial_val="1" label="Gamma:" label_width="138" left="250" max_val="2" min_val="0.0" name="gamma" width="202" tool_tip="(brightness, lower is brighter)"/>
<spinner bottom_delta="70" control_name="RenderFogRatio" decimal_digits="1" height="16" increment="0.1" initial_val="4" label="Fog Distance Ratio:" label_width="138" max_val="10" min_val="0.5" name="fog" width="202"/>
<text bottom_delta="-50" height="40" name="note">
Note: The Gamma and Fog Distance Ratio
settings are unavailable (since useless)
when the Atmospheric Shaders are enabled.
</text>
</panel>
</tab_container>
<string name="resolution_format">[RES_X] x [RES_Y]</string>
<string name="aspect_ratio_text">[NUM]:[DEN]</string>
</panel>

728
indra/newview/skins/default/xui/en-us/strings.xml
View File

@@ -38,6 +38,7 @@
<!-- progress -->
<string name="ProgressRestoring">Restoring...</string>
<string name="ProgressChangingResolution">Changing Resolution...</string>
<!-- Login -->
<string name="LoginInProgress">Logging in. [APP_NAME] may appear frozen. Please wait.</string>
<string name="LoginInProgressNoFrozen">Logging in...</string>
@@ -111,6 +112,10 @@
<string name="TooltipDragOntoOwnChild">You can't move a folder into its child</string>
<string name="TooltipDragOntoSelf">You can't move a folder into itself</string>
<!-- searching - generic -->
<string name="Searching">Searching...</string>
<string name="NoneFound">None found.</string>
<!-- Indicates that an avatar's name or other similar datum is being retrieved. General usage. -->
<string name="RetrievingData">Retrieving...</string>
@@ -225,6 +230,10 @@
<string name="anim_yes_happy">Yes (Happy)</string>
<string name="anim_yes_head">Yes</string>
<!-- build floater -->
<string name="multiple_textures">Multiple</string>
<!-- world map -->
<string name="texture_loading">Loading...</string>
<string name="worldmap_offline">Offline</string>
@@ -265,6 +274,8 @@
<string name="load_files">Load Files</string>
<string name="choose_the_directory">Choose Directory</string>
<string name="Sound: ">Sound: </string>
<!-- LSL Usage Hover Tips -->
<string name="LSLTipSleepTime">
Sleeps script for [SLEEP_TIME] seconds.
@@ -2749,6 +2760,12 @@ Where tag = tag string to match. Removes bot's matching the tag.
</string>
<!-- *** END OF OpenSimulator & Aurora-Sim syntax section *** -->
<!-- Strings needed by drop targets -->
<string name="CurrentlyNotSet">Currently not set</string>
<string name="CurrentlySetTo">Currently set to</string>
<string name="AnItemNotOnThisAccount">an item not on this account</string>
<string name="NotLoggedIn">Not logged in</string>
<!-- Avatar busy/away mode -->
<string name="AvatarSetNotAway">Not Away</string>
<string name="AvatarSetAway">Away</string>
@@ -2756,10 +2773,32 @@ Where tag = tag string to match. Removes bot's matching the tag.
<string name="AvatarSetBusy">Busy</string>
<!-- LLGroupNotify -->
<!-- used in the construction of a Group Notice blue dialog box, buttons, tooltip etc. Seems to be no longer utilized by code in Viewer 2.0 -->
<string name="next">Next</string>
<string name="ok">OK</string>
<string name="GroupNotifyGroupNotice">Group Notice</string>
<string name="GroupNotifyGroupNotices">Group Notices</string>
<string name="GroupNotifySentBy">Sent by</string>
<string name="GroupNotifyAttached">Attached:</string>
<string name="GroupNotifyViewPastNotices">View past notices or opt-out of receiving these messages here.</string>
<string name="GroupNotifyOpenAttachment">Open Attachment</string>
<string name="GroupNotifySaveAttachment">Save Attachment</string>
<!-- body parts -->
<string name="BodyPartsRightArm">Right Arm</string>
<string name="BodyPartsHead">Head</string>
<string name="BodyPartsLeftArm">Left Arm</string>
<string name="BodyPartsLeftLeg">Left Leg</string>
<string name="BodyPartsTorso">Torso</string>
<string name="BodyPartsRightLeg">Right Leg</string>
<!-- mouselook -->
<string name="LeaveMouselook">Press ESC to return to World View</string>
<!-- inventory -->
<string name="InventoryNoMatchingItems">No matching items found in inventory.</string>
<!-- use value="" because they have preceding spaces -->
<string name="no_transfer" value=" (no transfer)" />
<string name="no_modify" value=" (no modify)" />
@@ -2786,6 +2825,29 @@ Where tag = tag string to match. Removes bot's matching the tag.
<string name="HelloAvatar" value=" Hello, avatar! " />
<string name="ViewAllGestures" value=" View All &gt;&gt;" />
<string name="GetMoreGestures" value=" Get More &gt;&gt;" />
<!-- inventory filter -->
<!-- use value="" because they have preceding spaces -->
<string name="Animations" value=" Animations," />
<string name="Calling Cards" value=" Calling Cards," />
<string name="Clothing" value=" Clothing," />
<string name="Gestures" value=" Gestures," />
<string name="Landmarks" value=" Landmarks," />
<string name="Notecards" value=" Notecards," />
<string name="Objects" value=" Objects," />
<string name="Scripts" value=" Scripts," />
<string name="Sounds" value=" Sounds," />
<string name="Textures" value=" Textures," />
<string name="Snapshots" value=" Snapshots," />
<string name="No Filters" value="No " />
<string name="Since Logoff" value=" - Since Logoff" />
<string name="Worn" value=" - Worn" />
<!-- inventory FVBridge -->
<!-- This is used in llpanelinventory.cpp when constructing a context menu for an item for Sale -->
<string name="Buy">Buy</string>
<string name="Stone">Stone</string>
<string name="Metal">Metal</string>
<string name="Glass">Glass</string>
@@ -2794,12 +2856,59 @@ Where tag = tag string to match. Removes bot's matching the tag.
<string name="Plastic">Plastic</string>
<string name="Rubber">Rubber</string>
<string name="Light">Light</string>
<!-- compile queue-->
<string name="CompileQueueDownloadedCompiling">Downloaded, now compiling</string>
<string name="CompileQueueScriptNotFound">Script not found on server.</string>
<string name="CompileQueueProblemDownloading">Problem downloading</string>
<string name="CompileQueueInsufficientPermDownload">Insufficient permissions to download a script.</string>
<string name="CompileQueueInsufficientPermFor">Insufficient permissions for</string>
<string name="CompileQueueUnknownFailure">Unknown failure to download</string>
<string name="CompileQueueTitle">Recompilation Progress</string>
<string name="CompileQueueStart">recompile</string>
<string name="ResetQueueTitle">Reset Progress</string>
<string name="ResetQueueStart">reset</string>
<string name="RunQueueTitle">Set Running Progress</string>
<string name="RunQueueStart">set running</string>
<string name="NotRunQueueTitle">Set Not Running Progress</string>
<string name="NotRunQueueStart">set not running</string>
<!-- compile comment text-->
<string name="CompileSuccessful">Compile successful!</string>
<string name="CompileSuccessfulSaving">Compile successful, saving...</string>
<string name="SaveComplete">Save complete.</string>
<string name="ObjectOutOfRange">Script (object out of range)</string>
<string name="Unknown">(Unknown)</string>
<!-- Environment settings -->
<string name="Local">Local</string>
<string name="LocalSettings">Local Settings</string>
<string name="Region">Region</string>
<string name="RegionSettings">Region Settings</string>
<!-- inventory offer -->
<string name="InvOfferAnObjectNamed">An object named</string>
<string name="InvOfferOwnedByGroup">owned by the group</string>
<string name="InvOfferOwnedByUnknownGroup">owned by an unknown group</string>
<string name="InvOfferOwnedBy">owned by</string>
<string name="InvOfferOwnedByUnknownUser">owned by an unknown user</string>
<string name="InvOfferGaveYou">gave you</string>
<string name="InvOfferDecline">You decline [DESC] from [NAME].</string>
<!-- Viewer menu -->
<string name="AcquiredItems">Acquired Items</string>
<string name="Cancel">Cancel</string>
<string name="UploadingCosts">Uploading [NAME] costs [CURRENCY] [AMOUNT]</string>
<string name="UnknownFileExtension">
Unknown file extension .%s
Expected .wav, .tga, .bmp, .jpg, .jpeg, or .bvh
</string>
<string name="MuteObject2">Mute</string>
<string name="MuteAvatar">Mute</string>
<string name="UnmuteObject">Unmute</string>
<string name="UnmuteAvatar">Unmute</string>
<!-- menu accelerators -->
<string name="accel-mac-control">Ctrl-</string>
<string name="accel-mac-command">Cmd-</string>
@@ -2808,6 +2917,32 @@ Where tag = tag string to match. Removes bot's matching the tag.
<string name="accel-win-control">Ctrl-</string>
<string name="accel-win-alt">Alt-</string>
<string name="accel-win-shift">Shift-</string>
<!-- Directions, HUD -->
<string name="Direction_Forward">Forward</string>
<string name="Direction_Left">Left</string>
<string name="Direction_Right">Right</string>
<string name="Direction_Back">Back</string>
<string name="Direction_North">North</string>
<string name="Direction_South">South</string>
<string name="Direction_West">West</string>
<string name="Direction_East">East</string>
<string name="Direction_Up">Up</string>
<string name="Direction_Down">Down</string>
<string name="None">None</string>
<!-- punctuations -->
<string name=":">:</string>
<string name=",">,</string>
<string name="...">...</string>
<string name="***">***</string>
<string name="(">(</string>
<string name=")">)</string>
<string name=".">.</string>
<string name="'">'</string>
<string name="---">---</string>
<!-- OSMessageBox messages -->
<string name="MBCmdLineError">
An error was found parsing the command line.
@@ -2869,12 +3004,594 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
If you continue to receive this message, contact the [SUPPORT_SITE].
</string>
<!-- Avatar Shape Information -->
<string name="5 O'Clock Shadow">5 O'Clock Shadow</string>
<string name="All White">All White</string>
<string name="Anime Eyes">Anime Eyes</string>
<string name="Arced">Arched</string>
<string name="Arm Length">Arm Length</string>
<string name="Attached">Attached</string>
<string name="Attached Earlobes">Attached Earlobes</string>
<string name="Back Fringe">Back Fringe</string>
<string name="Baggy">Baggy</string>
<string name="Bangs">Bangs</string>
<string name="Beady Eyes">Beady Eyes</string>
<string name="Belly Size">Belly Size</string>
<string name="Big">Big</string>
<string name="Big Butt">Big Butt</string>
<string name="Big Hair Back">Big Hair: Back</string>
<string name="Big Hair Front">Big Hair: Front</string>
<string name="Big Hair Top">Big Hair: Top</string>
<string name="Big Head">Big Head</string>
<string name="Big Pectorals">Big Pectorals</string>
<string name="Big Spikes">Big Spikes</string>
<string name="Black">Black</string>
<string name="Blonde">Blonde</string>
<string name="Blonde Hair">Blonde Hair</string>
<string name="Blush">Blush</string>
<string name="Blush Color">Blush Color</string>
<string name="Blush Opacity">Blush Opacity</string>
<string name="Body Definition">Body Definition</string>
<string name="Body Fat">Body Fat</string>
<string name="Body Freckles">Body Freckles</string>
<string name="Body Thick">Body Thick</string>
<string name="Body Thickness">Body Thickness</string>
<string name="Body Thin">Body Thin</string>
<string name="Bow Legged">Bow Legged</string>
<string name="Breast Buoyancy">Breast Buoyancy</string>
<string name="Breast Cleavage">Breast Cleavage</string>
<string name="Breast Size">Breast Size</string>
<string name="Bridge Width">Bridge Width</string>
<string name="Broad">Broad</string>
<string name="Brow Size">Brow Size</string>
<string name="Bug Eyes">Bug Eyes</string>
<string name="Bugged Eyes">Bugged Eyes</string>
<string name="Bulbous">Bulbous</string>
<string name="Bulbous Nose">Bulbous Nose</string>
<string name="Breast Physics Mass">Breast Mass</string>
<string name="Breast Physics Smoothing">Breast Smoothing</string>
<string name="Breast Physics Gravity">Breast Gravity</string>
<string name="Breast Physics Drag">Breast Drag</string>
<string name="Breast Physics InOut Max Effect">Max Effect</string>
<string name="Breast Physics InOut Spring">Spring</string>
<string name="Breast Physics InOut Gain">Gain</string>
<string name="Breast Physics InOut Damping">Damping</string>
<string name="Breast Physics UpDown Max Effect">Max Effect</string>
<string name="Breast Physics UpDown Spring">Spring</string>
<string name="Breast Physics UpDown Gain">Gain</string>
<string name="Breast Physics UpDown Damping">Damping</string>
<string name="Breast Physics LeftRight Max Effect">Max Effect</string>
<string name="Breast Physics LeftRight Spring">Spring</string>
<string name="Breast Physics LeftRight Gain">Gain</string>
<string name="Breast Physics LeftRight Damping">Damping</string>
<string name="Belly Physics Mass">Belly Mass</string>
<string name="Belly Physics Smoothing">Belly Smoothing</string>
<string name="Belly Physics Gravity">Belly Gravity</string>
<string name="Belly Physics Drag">Belly Drag</string>
<string name="Belly Physics UpDown Max Effect">Max Effect</string>
<string name="Belly Physics UpDown Spring">Spring</string>
<string name="Belly Physics UpDown Gain">Gain</string>
<string name="Belly Physics UpDown Damping">Damping</string>
<string name="Butt Physics Mass">Butt Mass</string>
<string name="Butt Physics Smoothing">Butt Smoothing</string>
<string name="Butt Physics Gravity">Butt Gravity</string>
<string name="Butt Physics Drag">Butt Drag</string>
<string name="Butt Physics UpDown Max Effect">Max Effect</string>
<string name="Butt Physics UpDown Spring">Spring</string>
<string name="Butt Physics UpDown Gain">Gain</string>
<string name="Butt Physics UpDown Damping">Damping</string>
<string name="Butt Physics LeftRight Max Effect">Max Effect</string>
<string name="Butt Physics LeftRight Spring">Spring</string>
<string name="Butt Physics LeftRight Gain">Gain</string>
<string name="Butt Physics LeftRight Damping">Damping</string>
<string name="Bushy Eyebrows">Bushy Eyebrows</string>
<string name="Bushy Hair">Bushy Hair</string>
<string name="Butt Size">Butt Size</string>
<string name="Butt Gravity">Butt Gravity</string>
<string name="bustle skirt">Bustle Skirt</string>
<string name="no bustle">No Bustle</string>
<string name="more bustle">More Bustle</string>
<string name="Chaplin">Chaplin</string>
<string name="Cheek Bones">Cheek Bones</string>
<string name="Chest Size">Chest Size</string>
<string name="Chin Angle">Chin Angle</string>
<string name="Chin Cleft">Chin Cleft</string>
<string name="Chin Curtains">Chin Curtains</string>
<string name="Chin Depth">Chin Depth</string>
<string name="Chin Heavy">Chin Heavy</string>
<string name="Chin In">Chin In</string>
<string name="Chin Out">Chin Out</string>
<string name="Chin-Neck">Chin-Neck</string>
<string name="Clear">Clear</string>
<string name="Cleft">Cleft</string>
<string name="Close Set Eyes">Close Set Eyes</string>
<string name="Closed">Closed</string>
<string name="Closed Back">Closed Back</string>
<string name="Closed Front">Closed Front</string>
<string name="Closed Left">Closed Left</string>
<string name="Closed Right">Closed Right</string>
<string name="Coin Purse">Coin Purse</string>
<string name="Collar Back">Collar Back</string>
<string name="Collar Front">Collar Front</string>
<string name="Corner Down">Corner Down</string>
<string name="Corner Up">Corner Up</string>
<string name="Creased">Creased</string>
<string name="Crooked Nose">Crooked Nose</string>
<string name="Cuff Flare">Cuff Flare</string>
<string name="Dark">Dark</string>
<string name="Dark Green">Dark Green</string>
<string name="Darker">Darker</string>
<string name="Deep">Deep</string>
<string name="Default Heels">Default Heels</string>
<string name="Dense">Dense</string>
<string name="Double Chin">Double Chin</string>
<string name="Downturned">Downturned</string>
<string name="Duffle Bag">Duffle Bag</string>
<string name="Ear Angle">Ear Angle</string>
<string name="Ear Size">Ear Size</string>
<string name="Ear Tips">Ear Tips</string>
<string name="Egg Head">Egg Head</string>
<string name="Eye Bags">Eye Bags</string>
<string name="Eye Color">Eye Color</string>
<string name="Eye Depth">Eye Depth</string>
<string name="Eye Lightness">Eye Lightness</string>
<string name="Eye Opening">Eye Opening</string>
<string name="Eye Pop">Eye Pop</string>
<string name="Eye Size">Eye Size</string>
<string name="Eye Spacing">Eye Spacing</string>
<string name="Eyebrow Arc">Eyebrow Arc</string>
<string name="Eyebrow Density">Eyebrow Density</string>
<string name="Eyebrow Height">Eyebrow Height</string>
<string name="Eyebrow Points">Eyebrow Points</string>
<string name="Eyebrow Size">Eyebrow Size</string>
<string name="Eyelash Length">Eyelash Length</string>
<string name="Eyeliner">Eyeliner</string>
<string name="Eyeliner Color">Eyeliner Color</string>
<string name="Eyes Bugged">Eyes Bugged</string>
<string name="Face Shear">Face Shear</string>
<string name="Facial Definition">Facial Definition</string>
<string name="Far Set Eyes">Far Set Eyes</string>
<string name="Fat Lips">Fat Lips</string>
<string name="Female">Female</string>
<string name="Fingerless">Fingerless</string>
<string name="Fingers">Fingers</string>
<string name="Flared Cuffs">Flared Cuffs</string>
<string name="Flat">Flat</string>
<string name="Flat Butt">Flat Butt</string>
<string name="Flat Head">Flat Head</string>
<string name="Flat Toe">Flat Toe</string>
<string name="Foot Size">Foot Size</string>
<string name="Forehead Angle">Forehead Angle</string>
<string name="Forehead Heavy">Forehead Heavy</string>
<string name="Freckles">Freckles</string>
<string name="Front Fringe">Front Fringe</string>
<string name="Full Back">Full Back</string>
<string name="Full Eyeliner">Full Eyeliner</string>
<string name="Full Front">Full Front</string>
<string name="Full Hair Sides">Full Hair Sides</string>
<string name="Full Sides">Full Sides</string>
<string name="Glossy">Glossy</string>
<string name="Glove Fingers">Glove Fingers</string>
<string name="Glove Length">Glove Length</string>
<string name="Hair">Hair</string>
<string name="Hair Back">Hair: Back</string>
<string name="Hair Front">Hair: Front</string>
<string name="Hair Sides">Hair: Sides</string>
<string name="Hair Sweep">Hair Sweep</string>
<string name="Hair Thickess">Hair Thickness</string>
<string name="Hair Thickness">Hair Thickness</string>
<string name="Hair Tilt">Hair Tilt</string>
<string name="Hair Tilted Left">Hair Tilted Left</string>
<string name="Hair Tilted Right">Hair Tilted Right</string>
<string name="Hair Volume">Hair: Volume</string>
<string name="Hand Size">Hand Size</string>
<string name="Handlebars">Handlebars</string>
<string name="Head Length">Head Length</string>
<string name="Head Shape">Head Shape</string>
<string name="Head Size">Head Size</string>
<string name="Head Stretch">Head Stretch</string>
<string name="Heel Height">Heel Height</string>
<string name="Heel Shape">Heel Shape</string>
<string name="Height">Height</string>
<string name="High">High</string>
<string name="High Heels">High Heels</string>
<string name="High Jaw">High Jaw</string>
<string name="High Platforms">High Platforms</string>
<string name="High and Tight">High and Tight</string>
<string name="Higher">Higher</string>
<string name="Hip Length">Hip Length</string>
<string name="Hip Width">Hip Width</string>
<string name="In">In</string>
<string name="In Shdw Color">Inner Shadow Color</string>
<string name="In Shdw Opacity">Inner Shadow Opacity</string>
<string name="Inner Eye Corner">Inner Eye Corner</string>
<string name="Inner Eye Shadow">Inner Eye Shadow</string>
<string name="Inner Shadow">Inner Shadow</string>
<string name="Jacket Length">Jacket Length</string>
<string name="Jacket Wrinkles">Jacket Wrinkles</string>
<string name="Jaw Angle">Jaw Angle</string>
<string name="Jaw Jut">Jaw Jut</string>
<string name="Jaw Shape">Jaw Shape</string>
<string name="Join">Join</string>
<string name="Jowls">Jowls</string>
<string name="Knee Angle">Knee Angle</string>
<string name="Knock Kneed">Knock Kneed</string>
<string name="Large">Large</string>
<string name="Large Hands">Large Hands</string>
<string name="Left Part">Left Part</string>
<string name="Leg Length">Leg Length</string>
<string name="Leg Muscles">Leg Muscles</string>
<string name="Less">Less</string>
<string name="Less Body Fat">Less Body Fat</string>
<string name="Less Curtains">Less Curtains</string>
<string name="Less Freckles">Less Freckles</string>
<string name="Less Full">Less Full</string>
<string name="Less Gravity">Less Gravity</string>
<string name="Less Love">Less Love</string>
<string name="Less Muscles">Less Muscles</string>
<string name="Less Muscular">Less Muscular</string>
<string name="Less Rosy">Less Rosy</string>
<string name="Less Round">Less Round</string>
<string name="Less Saddle">Less Saddle</string>
<string name="Less Square">Less Square</string>
<string name="Less Volume">Less Volume</string>
<string name="Less soul">Less soul</string>
<string name="Lighter">Lighter</string>
<string name="Lip Cleft">Lip Cleft</string>
<string name="Lip Cleft Depth">Lip Cleft Depth</string>
<string name="Lip Fullness">Lip Fullness</string>
<string name="Lip Pinkness">Lip Pinkness</string>
<string name="Lip Ratio">Lip Ratio</string>
<string name="Lip Thickness">Lip Thickness</string>
<string name="Lip Width">Lip Width</string>
<string name="Lipgloss">Lipgloss</string>
<string name="Lipstick">Lipstick</string>
<string name="Lipstick Color">Lipstick Color</string>
<string name="Long">Long</string>
<string name="Long Head">Long Head</string>
<string name="Long Hips">Long Hips</string>
<string name="Long Legs">Long Legs</string>
<string name="Long Neck">Long Neck</string>
<string name="Long Pigtails">Long Pigtails</string>
<string name="Long Ponytail">Long Ponytail</string>
<string name="Long Torso">Long Torso</string>
<string name="Long arms">Long arms</string>
<string name="Loose Pants">Loose Pants</string>
<string name="Loose Shirt">Loose Shirt</string>
<string name="Loose Sleeves">Loose Sleeves</string>
<string name="Love Handles">Love Handles</string>
<string name="Low">Low</string>
<string name="Low Heels">Low Heels</string>
<string name="Low Jaw">Low Jaw</string>
<string name="Low Platforms">Low Platforms</string>
<string name="Low and Loose">Low and Loose</string>
<string name="Lower">Lower</string>
<string name="Lower Bridge">Lower Bridge</string>
<string name="Lower Cheeks">Lower Cheeks</string>
<string name="Male">Male</string>
<string name="Middle Part">Middle Part</string>
<string name="More">More</string>
<string name="More Blush">More Blush</string>
<string name="More Body Fat">More Body Fat</string>
<string name="More Curtains">More Curtains</string>
<string name="More Eyeshadow">More Eyeshadow</string>
<string name="More Freckles">More Freckles</string>
<string name="More Full">More Full</string>
<string name="More Gravity">More Gravity</string>
<string name="More Lipstick">More Lipstick</string>
<string name="More Love">More Love</string>
<string name="More Lower Lip">More Lower Lip</string>
<string name="More Muscles">More Muscles</string>
<string name="More Muscular">More Muscular</string>
<string name="More Rosy">More Rosy</string>
<string name="More Round">More Round</string>
<string name="More Saddle">More Saddle</string>
<string name="More Sloped">More Sloped</string>
<string name="More Square">More Square</string>
<string name="More Upper Lip">More Upper Lip</string>
<string name="More Vertical">More Vertical</string>
<string name="More Volume">More Volume</string>
<string name="More soul">More soul</string>
<string name="Moustache">Moustache</string>
<string name="Mouth Corner">Mouth Corner</string>
<string name="Mouth Position">Mouth Position</string>
<string name="Mowhawk">Mohawk</string>
<string name="Muscular">Muscular</string>
<string name="Mutton Chops">Mutton Chops</string>
<string name="Nail Polish">Nail Polish</string>
<string name="Nail Polish Color">Nail Polish Color</string>
<string name="Narrow">Narrow</string>
<string name="Narrow Back">Narrow Back</string>
<string name="Narrow Front">Narrow Front</string>
<string name="Narrow Lips">Narrow Lips</string>
<string name="Natural">Natural</string>
<string name="Neck Length">Neck Length</string>
<string name="Neck Thickness">Neck Thickness</string>
<string name="No Blush">No Blush</string>
<string name="No Eyeliner">No Eyeliner</string>
<string name="No Eyeshadow">No Eyeshadow</string>
<string name="No Lipgloss">No Lipgloss</string>
<string name="No Lipstick">No Lipstick</string>
<string name="No Part">No Part</string>
<string name="No Polish">No Polish</string>
<string name="No Red">No Red</string>
<string name="No Spikes">No Spikes</string>
<string name="No White">No White</string>
<string name="No Wrinkles">No Wrinkles</string>
<string name="Normal Lower">Normal Lower</string>
<string name="Normal Upper">Normal Upper</string>
<string name="Nose Left">Nose Left</string>
<string name="Nose Right">Nose Right</string>
<string name="Nose Size">Nose Size</string>
<string name="Nose Thickness">Nose Thickness</string>
<string name="Nose Tip Angle">Nose Tip Angle</string>
<string name="Nose Tip Shape">Nose Tip Shape</string>
<string name="Nose Width">Nose Width</string>
<string name="Nostril Division">Nostril Division</string>
<string name="Nostril Width">Nostril Width</string>
<string name="Opaque">Opaque</string>
<string name="Open">Open</string>
<string name="Open Back">Open Back</string>
<string name="Open Front">Open Front</string>
<string name="Open Left">Open Left</string>
<string name="Open Right">Open Right</string>
<string name="Orange">Orange</string>
<string name="Out">Out</string>
<string name="Out Shdw Color">Outer Shadow Color</string>
<string name="Out Shdw Opacity">Outer Shadow Opacity</string>
<string name="Outer Eye Corner">Outer Eye Corner</string>
<string name="Outer Eye Shadow">Outer Eye Shadow</string>
<string name="Outer Shadow">Outer Shadow</string>
<string name="Overbite">Overbite</string>
<string name="Package">Package</string>
<string name="Painted Nails">Painted Nails</string>
<string name="Pale">Pale</string>
<string name="Pants Crotch">Pants Crotch</string>
<string name="Pants Fit">Pants Fit</string>
<string name="Pants Length">Pants Length</string>
<string name="Pants Waist">Pants Waist</string>
<string name="Pants Wrinkles">Pants Wrinkles</string>
<string name="Part">Part</string>
<string name="Part Bangs">Part Bangs</string>
<string name="Pectorals">Pectorals</string>
<string name="Pigment">Pigment</string>
<string name="Pigtails">Pigtails</string>
<string name="Pink">Pink</string>
<string name="Pinker">Pinker</string>
<string name="Platform Height">Platform Height</string>
<string name="Platform Width">Platform Width</string>
<string name="Pointy">Pointy</string>
<string name="Pointy Heels">Pointy Heels</string>
<string name="Ponytail">Ponytail</string>
<string name="Poofy Skirt">Poofy Skirt</string>
<string name="Pop Left Eye">Pop Left Eye</string>
<string name="Pop Right Eye">Pop Right Eye</string>
<string name="Puffy">Puffy</string>
<string name="Puffy Eyelids">Puffy Eyelids</string>
<string name="Rainbow Color">Rainbow Color</string>
<string name="Red Hair">Red Hair</string>
<string name="Regular">Regular</string>
<string name="Right Part">Right Part</string>
<string name="Rosy Complexion">Rosy Complexion</string>
<string name="Round">Round</string>
<string name="Ruddiness">Ruddiness</string>
<string name="Ruddy">Ruddy</string>
<string name="Rumpled Hair">Rumpled Hair</string>
<string name="Saddle Bags">Saddle Bags</string>
<string name="Scrawny Leg">Scrawny Leg</string>
<string name="Separate">Separate</string>
<string name="Shallow">Shallow</string>
<string name="Shear Back">Shear Back</string>
<string name="Shear Face">Shear Face</string>
<string name="Shear Front">Shear Front</string>
<string name="Shear Left Up">Shear Left Up</string>
<string name="Shear Right Up">Shear Right Up</string>
<string name="Sheared Back">Sheared Back</string>
<string name="Sheared Front">Sheared Front</string>
<string name="Shift Left">Shift Left</string>
<string name="Shift Mouth">Shift Mouth</string>
<string name="Shift Right">Shift Right</string>
<string name="Shirt Bottom">Shirt Bottom</string>
<string name="Shirt Fit">Shirt Fit</string>
<string name="Shirt Wrinkles">Shirt Wrinkles</string>
<string name="Shoe Height">Shoe Height</string>
<string name="Short">Short</string>
<string name="Short Arms">Short Arms</string>
<string name="Short Legs">Short Legs</string>
<string name="Short Neck">Short Neck</string>
<string name="Short Pigtails">Short Pigtails</string>
<string name="Short Ponytail">Short Ponytail</string>
<string name="Short Sideburns">Short Sideburns</string>
<string name="Short Torso">Short Torso</string>
<string name="Short hips">Short hips</string>
<string name="Shoulders">Shoulders</string>
<string name="Side Fringe">Side Fringe</string>
<string name="Sideburns">Sideburns</string>
<string name="Sides Hair">Sides Hair</string>
<string name="Sides Hair Down">Sides Hair Down</string>
<string name="Sides Hair Up">Sides Hair Up</string>
<string name="Skinny Neck">Skinny Neck</string>
<string name="Skirt Fit">Skirt Fit</string>
<string name="Skirt Length">Skirt Length</string>
<string name="Slanted Forehead">Slanted Forehead</string>
<string name="Sleeve Length">Sleeve Length</string>
<string name="Sleeve Looseness">Sleeve Looseness</string>
<string name="Slit Back">Slit: Back</string>
<string name="Slit Front">Slit: Front</string>
<string name="Slit Left">Slit: Left</string>
<string name="Slit Right">Slit: Right</string>
<string name="Small">Small</string>
<string name="Small Hands">Small Hands</string>
<string name="Small Head">Small Head</string>
<string name="Smooth">Smooth</string>
<string name="Smooth Hair">Smooth Hair</string>
<string name="Socks Length">Socks Length</string>
<string name="Soulpatch">Soulpatch</string>
<string name="Sparse">Sparse</string>
<string name="Spiked Hair">Spiked Hair</string>
<string name="Square">Square</string>
<string name="Square Toe">Square Toe</string>
<string name="Squash Head">Squash Head</string>
<string name="Stretch Head">Stretch Head</string>
<string name="Sunken">Sunken</string>
<string name="Sunken Chest">Sunken Chest</string>
<string name="Sunken Eyes">Sunken Eyes</string>
<string name="Sweep Back">Sweep Back</string>
<string name="Sweep Forward">Sweep Forward</string>
<string name="Tall">Tall</string>
<string name="Taper Back">Taper Back</string>
<string name="Taper Front">Taper Front</string>
<string name="Thick Heels">Thick Heels</string>
<string name="Thick Neck">Thick Neck</string>
<string name="Thick Toe">Thick Toe</string>
<string name="Thin">Thin</string>
<string name="Thin Eyebrows">Thin Eyebrows</string>
<string name="Thin Lips">Thin Lips</string>
<string name="Thin Nose">Thin Nose</string>
<string name="Tight Chin">Tight Chin</string>
<string name="Tight Cuffs">Tight Cuffs</string>
<string name="Tight Pants">Tight Pants</string>
<string name="Tight Shirt">Tight Shirt</string>
<string name="Tight Skirt">Tight Skirt</string>
<string name="Tight Sleeves">Tight Sleeves</string>
<string name="Toe Shape">Toe Shape</string>
<string name="Toe Thickness">Toe Thickness</string>
<string name="Torso Length">Torso Length</string>
<string name="Torso Muscles">Torso Muscles</string>
<string name="Torso Scrawny">Torso Scrawny</string>
<string name="Unattached">Unattached</string>
<string name="Uncreased">Uncreased</string>
<string name="Underbite">Underbite</string>
<string name="Unnatural">Unnatural</string>
<string name="Upper Bridge">Upper Bridge</string>
<string name="Upper Cheeks">Upper Cheeks</string>
<string name="Upper Chin Cleft">Upper Chin Cleft</string>
<string name="Upper Eyelid Fold">Upper Eyelid Fold</string>
<string name="Upturned">Upturned</string>
<string name="Very Red">Very Red</string>
<string name="Waist Height">Waist Height</string>
<string name="Well-Fed">Well-Fed</string>
<string name="White Hair">White Hair</string>
<string name="Wide">Wide</string>
<string name="Wide Back">Wide Back</string>
<string name="Wide Front">Wide Front</string>
<string name="Wide Lips">Wide Lips</string>
<string name="Wild">Wild</string>
<string name="Wrinkles">Wrinkles</string>
<!-- IM system messages -->
<string name="IM_announce_incoming">has begun an IM session with you.</string>
<string name="IM_autoresponded_to">Autoresponse sent to</string>
<string name="IM_autoresponse_sent_item">was sent auto-response item</string>
<string name="Unnamed">(Unnamed)</string>
<string name="Saved_message">(Saved [LONG_TIMESTAMP]) </string>
<string name="PowerUser1">You are bestowed with powers beyond mortal comprehension.</string>
<string name="PowerUser2">Use your newfound abilities wisely.</string>
<string name="Unlocked:">Unlocked:</string>
<string name="PowerUser3">- Animation Priority up to 7 - Meant for animations that should override anything and everything at all times. DO NOT USE THIS FOR GENERAL ANIMATIONS.</string>
<string name="RightClick">Right click</string>
<string name="PowerUser4">Destroy objects - Permanently deletes an object immediately, when you don't feel like waiting for the server to respond.</string>
<string name="PowerUser5">Explode objects - Turns an object physical, temporary, and delinks it.</string>
<string name="group_role_everyone">Everyone</string>
<string name="group_role_officers">Officers</string>
<string name="group_role_owners">Owners</string>
<string name="group_role_owners">Owners</string>
<string name="group_member_status_online">Online</string>
<string name="Chat">Chat</string>
<string name="DefaultMimeType">none/none</string>
@@ -2894,4 +3611,7 @@ Try enclosing path to the editor with double quotes.
<string name="Pathfinding_Object_Attr_Character">Character</string>
<string name="Pathfinding_Object_Attr_MultiSelect">(Multiple)</string>
<string name="Left">Left</string>
<string name="Right">Right</string>
</strings>

30
indra/newview/skins/default/xui/es/floater_about.xml
View File

@@ -1,16 +1,16 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater name="floater_about" title="Acerca de Singularity Viewer">
<tab_container name="about_tab">
<panel label="Información" help_topic="about_support_tab" name="support_panel">
<button label="Copiar al portapapeles" name="copy_btn"/>
</panel>
<tab_container name="about_tab">
<panel label="Información" help_topic="about_support_tab" name="support_panel">
<button label="Copiar al portapapeles" name="copy_btn"/>
</panel>
<panel label="Créditos" help_topic="about_credits_tab" name="credits_panel">
<text_editor name="credits_editor">
<panel label="Créditos" help_topic="about_credits_tab" name="credits_panel">
<text_editor name="credits_editor">
Singularity Viewer es desarrollado y mantenido por Siana Gearz, Shyotl Kuhr, Aleric Inglewood, Narv Czervik, Tigh MacFanatic, Inusaito Kanya, Sovereign Engineer y Latif Khalifa, con contribuciones de Fractured Crystal, Fritigern Gothly, Henri Beauchamp, McCabe Maxsted, Kadah Coba, Kitty Barnett, nhede Core, Nomade Zhao, Revolution Smythe, Selvone Franizzi, Thickbrick Sleaford, Zauber Parecelsus, Wolfspirit Magic y otros. Singularity está basado en el código fuente del Visor Ascent. Los créditos del Visor Ascent incluyen a Hg Beeks, Charley Levenque, Hazim Gazov, Zwagoth Klaar, Qarl Fizz, y otros. El Visor Ascent está basado en el código fuente del visor Inertia.
Singularity Viewer incluye código fuente aportado por los siguientes residentes: Able Whitman, Adam Marker, Agathos Frascati, Aimee Trescothick, Alejandro Rosenthal, Aleric Inglewood, Alissa Sabre, Angus Boyd, Ann Congrejo, Argent Stonecutter, Asuka Neely, Balp Allen, Benja Kepler, Biancaluce Robbiani, Blakar Ogre, blino Nakamura, Boroondas Gupte, Bulli Schumann, bushing Spatula, Carjay McGinnis, Catherine Pfeffer, Celierra Darling, Cron Stardust, Dale Glass, Drewan Keats, Dylan Haskell, Dzonatas Sol, Eddy Stryker, EponymousDylan Ra, Eva Nowicka, Farallon Greyskin, Feep Larsson, Flemming Congrejo, Fluf Fredriksson, Fractured Crystal, Fremont Cunningham, Geneko Nemeth, Gigs Taggart, Ginko Bayliss, Grazer Kline, Gudmund Shepherd, Hamncheese Omlet, HappySmurf Papp, Henri Beauchamp, Hikkoshi Sakai, Hiro Sommambulist, Hoze Menges, Ian Kas, Irene Muni, Iskar Ariantho, Jacek Antonelli, JB Kraft, Joghert LeSabre, Kage Pixel, Ken March, Kerutsen Sellery, Khyota Wulluf, Kunnis Basiat, Lisa Lowe, Lockhart Cordoso,
maciek marksman, Magnus Balczo, Malwina Dollinger, march Korda, Matthew Dowd, McCabe Maxsted, Michelle2 Zenovka, Mm Alder, Mr Greggan, Nicholaz Beresford, Nounouch Hapmouche, Patric Mills, Paul Churchill, Paula Innis, Peekay Semyorka, Peter Lameth, Pf Shan, princess niven, Renault Clio, Ringo Tuxing, Robin Cornelius, Ryozu Kojima, Salahzar Stenvaag, Sammy Frederix, Scrippy Scofield, Seg Baphomet, Sergen Davies, SignpostMarv Martin, Simon Nolan, SpacedOut Frye, Sporked Friis, Stevex Janus, Still Defiant, Strife Onizuka, Tayra Dagostino, TBBle Kurosawa, Teardrops Fall, tenebrous pau, Tharax Ferraris, Thickbrick Sleaford, Thraxis Epsilon, tiamat bingyi, TraductoresAnonimos Alter, Tue Torok, Vadim Bigbear, Vixen Heron, Whoops Babii, Wilton Lundquist, Zarkonnen Decosta, Zi Ree, Zipherius Turas, Franxisco Romano, Damian Zhaoying
maciek marksman, Magnus Balczo, Malwina Dollinger, march Korda, Matthew Dowd, McCabe Maxsted, Michelle2 Zenovka, Mm Alder, Mr Greggan, Nicholaz Beresford, Nounouch Hapmouche, Patric Mills, Paul Churchill, Paula Innis, Peekay Semyorka, Peter Lameth, Pf Shan, princess niven, Renault Clio, Ringo Tuxing, Robin Cornelius, Ryozu Kojima, Salahzar Stenvaag, Sammy Frederix, Scrippy Scofield, Seg Baphomet, Sergen Davies, SignpostMarv Martin, Simon Nolan, SpacedOut Frye, Sporked Friis, Stevex Janus, Still Defiant, Strife Onizuka, Tayra Dagostino, TBBle Kurosawa, Teardrops Fall, tenebrous pau, Tharax Ferraris, Thickbrick Sleaford, Thraxis Epsilon, tiamat bingyi, TraductoresAnonimos Alter, Tue Torok, Vadim Bigbear, Vixen Heron, Whoops Babii, Wilton Lundquist, Zarkonnen Decosta, Zi Ree, Zipherius Turas, Damian Zhaoying
Second Life llega a ti gracias a Philip, Tessa, Andrew, Cory, James, Ben, Char, Charlie, Colin, Dan, Daniel, Doug, Eric, Hamlet, Haney, Eve, Hunter, Ian, Jeff, Jennifer, Jim, John, Lee, Mark, Peter, Phoenix, Richard, Robin, Xenon, Steve, Tanya, Eddie, Avi, Frank, Bruce, Aaron, Alice, Bob, Debra, Eileen, Helen, Janet, Louie, Leviathania, Stefan, Ray, Kevin, Tom, Mikeb, MikeT, Burgess, Elena, Tracy, Bill, Todd, Ryan, Zach, Sarah, Nova, Tim, Stephanie, Michael, Evan, Nicolas, Catherine, Rachelle, Dave, Holly, Bub, Kelly, Magellan, Ramzi, Don, Sabin, Jill, Rheya, Jeska, Torley, Kona, Callum, Charity, Ventrella, Jack, Vektor, Iris, Chris, Nicole, Mick, Reuben, Blue, Babbage, Yedwab, Deana, Lauren, Brent, Pathfinder, Chadrick, Altruima, Jesse, Teeny, Monroe, Icculus, David, Tess, Lizzie, Patsy, Isaac, Lawrence, Cyn, Bo, Gia, Annette, Marius, Tbone, Jonathan, Karen, Ginsu, Satoko, Yuko, Makiko, Thomas, Harry, Seth, Alexei, Brian, Guy, Runitai, Ethan, Data, Cornelius, Kenny, Swiss, Zero, Natria, Wendy, Stephen,
Teeple, Thumper, Lucy, Dee, Mia, Liana, Warren, Branka, Aura, beez, Milo, Hermia, Red, Thrax, Joe, Sally, Magenta, Mogura, Paul, Jose, Rejean, Henrik, Lexie, Amber, Logan, Xan, Nora, Morpheus, Donovan, Leyla, MichaelFrancis, Beast, Cube, Bucky, Joshua, Stryfe, Harmony, Teresa, Claudia, Walker, Glenn, Fritz, Fordak, June, Cleopetra, Jean, Ivy, Betsy, Roosevelt, Spike, Ken, Which, Tofu, Chiyo, Rob, Zee, dustin, George, Del, Matthew, Cat, Jacqui, Lightfoot, Adrian, Viola, Alfred, Noel, Irfan, Sunil, Yool, Rika, Jane, Xtreme, Frontier, a2, Neo, Siobhan, Yoz, Justin, Elle, Qarl, Benjamin, Isabel, Gulliver, Everett, Christopher, Izzy, Stephany, Garry, Sejong, Sean, Tobin, Iridium, Meta, Anthony, Jeremy, JP, Jake, Maurice, Madhavi, Leopard, Kyle, Joon, Kari, Bert, Belinda, Jon, Kristi, Bridie, Pramod, KJ, Socrates, Maria, Ivan, Aric, Yamasaki, Adreanne, Jay, MitchK, Ceren, Coco, Durl, Jenny, Periapse, Kartic, Storrs, Lotte, Sandy, Rohn, Colossus, Zen, BigPapi, Brad, Pastrami, Kurz, Mani, Neuro, Jaime, MJ, Rowan,
@@ -19,11 +19,11 @@ Gabriel, Locklainn, Claire, Devin, Minerva, Monty, Austin, Bradford, Si, Keira,
Linden Lab agradece a los siguientes residentes: able whitman, Adeon Writer, adonaira aabye, Aeron Kohime, Agathos Frascati, Aimee Trescothick, Aleric Inglewood, Alissa Sabre, Aminom Marvin, Angela Talamasca, Aralara Rajal, Armin Weatherwax, Ashrilyn Hayashida, Athanasius Skytower, Aura Dirval, Barney Boomslang, Biancaluce Robbiani, Biker Offcourse, Borg Capalini, Bulli Schumann, catherine pfeffer, Chalice Yao, Corre Porta, Court Goodman, Cummere Mayo, Dale Innis, Darien Caldwell, Darjeeling Schoonhoven, Daten Thielt, dimentox travanti, Dirk Talamasca, Drew Dwi, Duckless Vandyke, Elanthius Flagstaff, Electro Burnstein, emiley tomsen, Escort DeFarge, Eva Rau, Ezian Ecksol, Fire Centaur, Fluf Fredriksson, Francisco Koolhoven, Frontera Thor, Frungi Stastny, Gally Young, gearsawe stonecutter, Gigs Taggart, Gordon Wendt, Gudmund Shepherd, Gypsy Paz, Harleen Gretzky, Henri Beauchamp, Inma Rau, Irene Muni, Iskar Ariantho, Jacek Antonelli, JB Kraft, Jessicka Graves, Joeseph Albanese, Joshua Philgarlic, Khyota
Wulluf, kirstenlee Cinquetti, Latif Khalifa, Lex Neva, Lilibeth Andree, Lisa Lowe, Lunita Savira, Loosey Demonia, lum pfohl, Marcos Fonzarelli, MartinRJ Fayray, Marusame Arai, Matthew Dowd, Maya Remblai, McCabe Maxsted, Meghan Dench, Melchoir Tokhes, Menos Short, Michelle2 Zenovka, Mimika Oh, Minerva Memel, Mm Alder, Ochi Wolfe, Omei Turnbull, Pesho Replacement, Phantom Ninetails, phoenixflames kukulcan, Polo Gufler, prez pessoa, princess niven, Prokofy Neva, Qie Niangao, Rem Beattie, RodneyLee Jessop, Saijanai Kuhn, Seg Baphomet, Sergen Davies, Shirley Marquez, SignpostMarv Martin, Sindy Tsure, Sira Arbizu, Skips Jigsaw, Sougent Harrop, Spritely Pixel, Squirrel Wood, StarSong Bright, Subversive Writer, Sugarcult Dagger, Sylumm Grigorovich, Tammy Nowotny, Tanooki Darkes, Tayra Dagostino, Theoretical Chemistry, Thickbrick Sleaford, valerie rosewood, Vex Streeter, Vixen Heron, Whoops Babii, Winter Ventura, Xiki Luik, Yann Dufaux, Yina Yao, Yukinoroh Kamachi, Zolute Infinity, Zwagoth Klaar
</text_editor>
</panel>
</text_editor>
</panel>
<panel label="Licenses" name="licenses_panel">
<text_editor name="licenses_editor">
<panel label="Licenses" name="licenses_panel">
<text_editor name="licenses_editor">
3Dconnexion SDK Copyright (C) 1992-2007 3Dconnexion
APR Copyright (C) 2000-2012 The Apache Software Foundation
Collada DOM Copyright 2006 Sony Computer Entertainment Inc.
@@ -50,8 +50,8 @@ zlib Copyright (C) 1995-2012 Jean-loup Gailly and Mark Adler.
All rights reserved. Ver licenses.txt para mayor información.
Voice chat Audio coding: Polycom(R) Siren14(TM) (ITU-T Rec. G.722.1 Annex C)
</text_editor>
</panel>
</tab_container>
<string name="you_are_at">Estás en [POSITION]</string>
</text_editor>
</panel>
</tab_container>
<string name="you_are_at">Estás en [POSITION]</string>
</floater>

188
indra/newview/skins/default/xui/es/floater_ao.xml
View File

@@ -1,97 +1,97 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="geminifloater" title="Animation Overrider">
<view_border name="ao_notecard"/>
<view_border name="ao_notecard_vis"/>
<text name="Give inventory" tool_tip="Arrastra aquí una nota de configuración de ZHAO. Las animaciones tienen que estar en la misma carpeta que la nota de configuración">
Arrastra aquí la nota del ZHAO II
</text>
<view_border name="ao_notecard_disp"/>
<text name="ao_nc_text" tool_tip="">
Utilizando: ITEM
</text>
<button name="opencard" label="Ver Notecard"/>
<button name="reloadcard" label="Recargar"/>
<check_box control_name="AOEnabled" label="Activar animations override" name="AOEnabled"/>
<check_box control_name="AOSitsEnabled" label="Activar sits override" name="AOSitsEnabled"/>
<text name="buttons_desc">
De Pie:
</text>
<combo_box name="stands" label=""/>
<button name="prevstand" tool_tip="Vista Previa de Pie" label="&lt;&lt;"/>
<button name="nextstand" tool_tip="Siguiente Animación de Pie" label="&gt;&gt;"/>
<check_box control_name="AOStandRandomize" label="Orden de Reprodución al azar" name="AOStandRandomize"/>
<check_box control_name="AONoStandsInMouselook" label="Desactiva De Pie en Vista Subjetiva" name="AONoStandsInMouselook"/>
<check_box control_name="EnableAORemote" label="Mostrar AO En Barra de Herram." name="ao_remote_checkbox"/>
<spinner control_name="AOStandInterval" name="standtime" label="Tiempo de Ejecución:" label_width="120" tool_tip="Tiempo de ejecuón de la animación, en segundos" />
<button name="newcard" label="Nueva Plantilla de Nota" />
<button label="Más &gt;&gt;" name="more_btn" tool_tip="Opciones Avanzadas" />
<button label="&lt;&lt; Menos" name="less_btn" tool_tip="Opciones Avanzadas" />
<tab_container label="Por Defecto" name="tabcontainer" >
<panel label="Animaciones por Defecto" name="tabdefaultanims">
<text name="textdefaultwalk">
Caminar:
</text>
<combo_box name="walks" label="" control_name="AODefaultWalk" />
<text name="textdefaultrun">
Correr:
</text>
<combo_box name="runs" label="" control_name="AODefaultRun" />
<text name="textdefaultjump">
Saltar:
</text>
<combo_box name="jumps" label="" control_name="AODefaultJump" />
<text name="textdefaultsit">
Sentado:
</text>
<combo_box name="sits" label="" control_name="AODefaultSit" />
<text name="textdefaultgsit">
Sentado en el Suelo:
</text>
<combo_box name="gsits" label="" control_name="AODefaultGroundSit" />
<text name="textdefaultcrouch">
Agachado:
</text>
<combo_box name="crouchs" label="" control_name="AODefaultCrouch" />
<text name="textdefaultcrouchwalk">
Caminar Agachado:
</text>
<combo_box name="cwalks" label="" control_name="AODefaultCrouchWalk" />
<text name="textdefaultfall">
Caer:
</text>
<combo_box name="falls" label="" control_name="AODefaultFall" />
<text name="textdefaulthover">
Flotar:
</text>
<combo_box name="hovers" label="" control_name="AODefaultHover" />
<text name="textdefaultfly">
Volar:
</text>
<combo_box name="flys" label="" control_name="AODefaultFly" />
<text name="textdefaultflyslow">
Vuelo Lento:
</text>
<combo_box name="flyslows" label="" control_name="AODefaultFlySlow" />
<text name="textdefaultflyup">
Volar Subiendo:
</text>
<combo_box name="flyups" label="" control_name="AODefaultFlyUp" />
<text name="textdefaultflydown">
Volar Bajando:
</text>
<combo_box name="flydowns" label="" control_name="AODefaultFlyDown" />
<text name="textdefaultland">
Aterrizar:
</text>
<combo_box name="lands" label="" control_name="AODefaultLand" />
<text name="textdefaultstandup">
Ponerse de Pie:
</text>
<combo_box name="standups" label="" control_name="AODefaultStandUp" />
<text name="textdefaultprejump">
Antes de Saltar:
</text>
<combo_box name="prejumps" label="" control_name="AODefaultPreJump" />
</panel>
</tab_container>
<view_border name="ao_notecard"/>
<view_border name="ao_notecard_vis"/>
<text name="Give inventory" tool_tip="Arrastra aquí una nota de configuración de ZHAO. Las animaciones tienen que estar en la misma carpeta que la nota de configuración">
Arrastra aquí la nota del ZHAO II
</text>
<view_border name="ao_notecard_disp"/>
<text name="ao_nc_text" tool_tip="">
Utilizando: ITEM
</text>
<button name="opencard" label="Ver Notecard"/>
<button name="reloadcard" label="Recargar"/>
<check_box control_name="AOEnabled" label="Activar animations override" name="AOEnabled"/>
<check_box control_name="AOSitsEnabled" label="Activar sits override" name="AOSitsEnabled"/>
<text name="buttons_desc">
De Pie:
</text>
<combo_box name="stands" label=""/>
<button name="prevstand" tool_tip="Vista Previa de Pie" label="&lt;&lt;"/>
<button name="nextstand" tool_tip="Siguiente Animación de Pie" label="&gt;&gt;"/>
<check_box control_name="AOStandRandomize" label="Orden de Reprodución al azar" name="AOStandRandomize"/>
<check_box control_name="AONoStandsInMouselook" label="Desactiva De Pie en Vista Subjetiva" name="AONoStandsInMouselook"/>
<check_box control_name="EnableAORemote" label="Mostrar AO En Barra de Herram." name="ao_remote_checkbox"/>
<spinner control_name="AOStandInterval" name="standtime" label="Tiempo de Ejecución:" label_width="120" tool_tip="Tiempo de ejecuón de la animación, en segundos" />
<button name="newcard" label="Nueva Plantilla de Nota" />
<button label="Más &gt;&gt;" name="more_btn" tool_tip="Opciones Avanzadas" />
<button label="&lt;&lt; Menos" name="less_btn" tool_tip="Opciones Avanzadas" />
<tab_container label="Por Defecto" name="tabcontainer" >
<panel label="Animaciones por Defecto" name="tabdefaultanims">
<text name="textdefaultwalk">
Caminar:
</text>
<combo_box name="walks" label="" control_name="AODefaultWalk" />
<text name="textdefaultrun">
Correr:
</text>
<combo_box name="runs" label="" control_name="AODefaultRun" />
<text name="textdefaultjump">
Saltar:
</text>
<combo_box name="jumps" label="" control_name="AODefaultJump" />
<text name="textdefaultsit">
Sentado:
</text>
<combo_box name="sits" label="" control_name="AODefaultSit" />
<text name="textdefaultgsit">
Sentado en el Suelo:
</text>
<combo_box name="gsits" label="" control_name="AODefaultGroundSit" />
<text name="textdefaultcrouch">
Agachado:
</text>
<combo_box name="crouchs" label="" control_name="AODefaultCrouch" />
<text name="textdefaultcrouchwalk">
Caminar Agachado:
</text>
<combo_box name="cwalks" label="" control_name="AODefaultCrouchWalk" />
<text name="textdefaultfall">
Caer:
</text>
<combo_box name="falls" label="" control_name="AODefaultFall" />
<text name="textdefaulthover">
Flotar:
</text>
<combo_box name="hovers" label="" control_name="AODefaultHover" />
<text name="textdefaultfly">
Volar:
</text>
<combo_box name="flys" label="" control_name="AODefaultFly" />
<text name="textdefaultflyslow">
Vuelo Lento:
</text>
<combo_box name="flyslows" label="" control_name="AODefaultFlySlow" />
<text name="textdefaultflyup">
Volar Subiendo:
</text>
<combo_box name="flyups" label="" control_name="AODefaultFlyUp" />
<text name="textdefaultflydown">
Volar Bajando:
</text>
<combo_box name="flydowns" label="" control_name="AODefaultFlyDown" />
<text name="textdefaultland">
Aterrizar:
</text>
<combo_box name="lands" label="" control_name="AODefaultLand" />
<text name="textdefaultstandup">
Ponerse de Pie:
</text>
<combo_box name="standups" label="" control_name="AODefaultStandUp" />
<text name="textdefaultprejump">
Antes de Saltar:
</text>
<combo_box name="prejumps" label="" control_name="AODefaultPreJump" />
</panel>
</tab_container>
</floater>

12
indra/newview/skins/default/xui/es/floater_asset_text_editor.xml
View File

@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater name="floater_asset_text_editor" title="Editor de Textos">
<text name="status_text">
Cargando...
</text>
<button name="upload_btn" label="[UPLOAD]"/>
<button name="save_btn" label="Grabar"/>
<simple_text_editor name="text_editor" />
<text name="status_text">
Cargando...
</text>
<button name="upload_btn" label="[UPLOAD]"/>
<button name="save_btn" label="Grabar"/>
<simple_text_editor name="text_editor" />
</floater>

34
indra/newview/skins/default/xui/es/floater_blacklist.xml
View File

@@ -1,21 +1,19 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater name="floater_blacklist" title="Lista Negra">
<button name="add_btn" label="Agregar..."/>
<button name="remove_btn" label="Borrar"/>
<combo_box name="asset_combo" label="Tipo de Asset"/>
<line_editor name="id_edit" label="Colocar aquí el UUID del Asset UUID." />
<line_editor name="name_edit" label="Colocar aquí el Nombre de la entrada."/>
<scroll_list name="file_list">
<column name="asset_id" label="ID del Asset"/>
<column name="entry_name" label="Nombre" />
<column name="entry_type" label="Tipo"/>
<column name="entry_agent" label="Agregado por"/>
<column name="entry_date" label="Fecha"/>
<!--column dynamicwidth="false" name="asset_id" label="Asset-ID" width="130"/-->
</scroll_list>
<button name="save_btn" label="Guardar XML" width="100" />
<button name="load_btn" label="Cargar XML" left_delta="110" width="100"/>
<button name="clear_btn" label="Limpiar" left_delta="110" />
<!--button name="rerender_btn" follows="right|bottom" width="150" bottom_delta="0" left_delta="400" height="20" label="Rerender all Objects"/-->
<button name="copy_uuid_btn" label="Copiar UUID"/>
<button name="add_btn" label="Agregar..."/>
<button name="remove_btn" label="Borrar"/>
<combo_box name="asset_combo" label="Tipo de Asset"/>
<line_editor name="id_edit" label="Colocar aquí el UUID del Asset UUID." />
<line_editor name="name_edit" label="Colocar aquí el Nombre de la entrada."/>
<scroll_list name="file_list">
<column name="asset_id" label="ID del Asset"/>
<column name="entry_name" label="Nombre" />
<column name="entry_type" label="Tipo"/>
<column name="entry_agent" label="Agregado por"/>
<column name="entry_date" label="Fecha"/>
</scroll_list>
<button name="save_btn" label="Guardar XML" width="100" />
<button name="load_btn" label="Cargar XML" left_delta="110" width="100"/>
<button name="clear_btn" label="Limpiar" left_delta="110" />
<button name="copy_uuid_btn" label="Copiar UUID"/>
</floater>

4
indra/newview/skins/default/xui/es/floater_chatterbox_wolf.xml
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<multi_floater name="floater_chatterbox" title="Comunicarse">
<tab_container name="chatterbox_tabs"/>
</multi_floater>
<tab_container name="chatterbox_tabs"/>
</multi_floater>1

14
indra/newview/skins/default/xui/es/floater_clothing.xml
View File

@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater name="clothing" title="Ropas">
<scroll_list name="clothing_list">
<column label="" name="icon"/>
<column label="Nombre" name="name"/>
<column name="sort" width="-1" />
</scroll_list>
<button label="Quitarse" name="take_off_btn"/>
<button label="Vestirse" name="wear_btn"/>
<scroll_list name="clothing_list">
<column label="" name="icon"/>
<column label="Nombre" name="name"/>
<column name="sort" width="-1" />
</scroll_list>
<button label="Quitarse" name="take_off_btn"/>
<button label="Vestirse" name="wear_btn"/>
</floater>

37
indra/newview/skins/default/xui/es/floater_contact_groups.xml
View File

@@ -1,23 +1,18 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<!-- All our XML is utf-8 encoded. -->
<!-- Floaters can optionally have their titlebar drag handle on the left.
If so, the title is not visible.
When a floater is resizable, a min_width and min_height must be specified. -->
<floater name="floater_contact_groups" title="Administrar Grupos">
<text name="InstructManageContacts">
Selecciona un Grupo (o Presiona Nuevo para crear uno):
</text>
<combo_box tool_tip="Grupos de Contactos" name="buddy_group_combobox">
<combo_item name="All" value="All">
Todos
</combo_item>
</combo_box>
<button label="+" name="combo_group_add"/>
<button label="-" name="combo_group_remove"/>
<button label="Nuevo" name="combo_group_create"/>
<text name="contact_list_text">
Actualmente en:
</text>
<scroll_list name="group_scroll_list"/>
<floater name="floater_contact_groups" title="Administrar Grupos">
<text name="InstructManageContacts">
Selecciona un Grupo (o Presiona Nuevo para crear uno):
</text>
<combo_box tool_tip="Grupos de Contactos" name="buddy_group_combobox">
<combo_item name="All" value="All">
Todos
</combo_item>
</combo_box>
<button label="+" name="combo_group_add"/>
<button label="-" name="combo_group_remove"/>
<button label="Nuevo" name="combo_group_create"/>
<text name="contact_list_text">
Actualmente en:
</text>
<scroll_list name="group_scroll_list"/>
</floater>

13
indra/newview/skins/default/xui/es/floater_directory.xml
View File

@@ -6,7 +6,7 @@
Buscando...
</string>
<string name="not_found_text">
Nada encontrado.
Nada hallado.
</string>
<text name="find">
Buscar:
@@ -167,10 +167,10 @@
Arte y Cultura
</combo_item>
<combo_item name="Charity/SupportGroups">
Representaciones
Grupos de Ayuda y Caridad
</combo_item>
<combo_item name="Miscellaneous">
Miscelaneos
Misceláneos
</combo_item>
</combo_box>
<check_box label="Contenido PG" name="incpg"/>
@@ -180,7 +180,7 @@
<button label="Borrar" label_selected="Borrar" name="Delete"/>
<scroll_list name="results">
<column label="Nombre" name="name"/>
<column label="Hora (PT)" name="date"/>
<column label="Día (PT)" name="date"/>
<column label="Hora" name="time"/>
</scroll_list>
<button label="Siguiente &gt;" label_selected="Siguiente &gt;" name="Next &gt;"/>
@@ -247,8 +247,6 @@ subasta. Para comprarlo directamente, visítalo y pulsa en el nombre del terreno
<text name="areacheck_symbol">
m²
</text>
<line_editor name="priceedit"/>
<line_editor name="areaedit"/>
<button label="Buscar" label_selected="Buscar" name="Search"/>
<scroll_list name="results">
<column label="Nombre" name="name"/>
@@ -270,7 +268,6 @@ subasta. Para comprarlo directamente, visítalo y pulsa en el nombre del terreno
<text name="find">
Buscar:
</text>
<line_editor name="name"/>
<check_box label="Contenido PG" name="incpg"/>
<check_box label="Contenido Mature" name="incmature"/>
<check_box label="Contenido Adulto" name="incadult"/>
@@ -380,7 +377,6 @@ subasta. Para comprarlo directamente, visítalo y pulsa en el nombre del terreno
<text name="find">
Buscar:
</text>
<line_editor name="name"/>
<button label="Buscar" label_selected="Buscar" name="Search"/>
<scroll_list name="results">
<column label="Nombre" name="name"/>
@@ -409,7 +405,6 @@ subasta. Para comprarlo directamente, visítalo y pulsa en el nombre del terreno
<column label="Nombre" name="name"/>
<column label="Miembros" name="members"/>
</scroll_list>
<text name="result_text"/>
</panel>
</tab_container>
<panel name="Panel Avatar"/>

787
indra/newview/skins/default/xui/es/floater_directory2.xml
View File

@@ -1,638 +1,387 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater can_close="true" can_drag_on_left="false" can_minimize="true"
can_resize="true" height="570" min_height="570" min_width="780"
name="directory" rect_control="FloaterFindRect2" title="Search Second Life"
width="780">
<tab_container bottom="-570" follows="left|top|right|bottom" height="550" left="0"
mouse_opaque="false" name="Directory Tabs" tab_position="top" width="780">
<panel border="true" bottom="-549" follows="left|top|right|bottom" height="533"
label="All" left="1" mouse_opaque="false" name="find_all_old_panel" width="778">
<floater name="directory" title="Buscar en Second Life">
<tab_container name="Directory Tabs">
<panel label="Todo" name="find_all_old_panel">
<string name="searching_text">
Searching...
Buscando...
</string>
<string name="not_found_text">
None Found.
Nada Encontrado.
</string>
<button bottom="-533" follows="left|bottom" font="SansSerif" halign="center"
height="20" label="&lt; Prev" label_selected="&lt; Prev" left="80"
mouse_opaque="true" name="&lt; Prev" width="60" />
<button bottom="-533" follows="left|bottom" font="SansSerif" halign="center"
height="20" label="Next &gt;" label_selected="Next &gt;"
mouse_opaque="true" name="Next &gt;" width="60" />
<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="-24" drop_shadow_visible="true" follows="left|top" font="SansSerif"
h_pad="0" halign="left" height="16" left="4" mouse_opaque="true"
name="find" v_pad="0" width="50">
Find:
<button label="&lt; Ant." label_selected="&lt; Ant." name="&lt; Prev"/>
<button label="Sig. &gt;" label_selected="Sig. &gt;" name="Next &gt;"/>
<text name="find">
Buscar:
</text>
<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-24"
follows="left|top" font="SansSerif" height="18" left_delta="38"
max_length="63" mouse_opaque="true" name="name" width="128" spell_check="true" />
<button bottom="-26" follows="left|top" font="SansSerif" halign="center" height="20"
label="Search" label_selected="Search" left_delta="136" mouse_opaque="true"
name="Search" width="70" />
<check_box bottom="-22" control_name="ShowPGSearchAll" follows="left|top"
font="SansSerifSmall" height="16" initial_value="true"
label="PG content" left_delta="78" mouse_opaque="true"
name="incpg" width="156" />
<check_box bottom="-22" control_name="ShowMatureSearchAll" follows="left|top"
font="SansSerifSmall" height="16" initial_value="false"
label="Mature content" left_delta="100" mouse_opaque="true"
name="incmature" width="156" />
<check_box bottom="-22" control_name="ShowAdultSearchAll" follows="left|top"
font="SansSerifSmall" height="16" initial_value="false"
label="Adult content" left_delta="120" mouse_opaque="true"
name="incadult" width="156" />
<scroll_list background_visible="true" bottom="-513" column_padding="0" draw_border="true"
draw_heading="false" fg_disable_color="1, 1, 1, 1"
follows="left|top|right|bottom" height="464" left="4" mouse_opaque="true"
multi_select="false" name="results" search_column="1" width="339">
<column label="" name="icon" width="24" />
<column label="Name" name="name" width="235" />
<column label="Price" name="price" width="90" />
<column label="Time (PT)" name="date" width="90" />
<column label="Time" name="time" width="-1" />
<column label="Traffic" name="dwell" width="90" />
<column label="Area" name="area" width="90" />
<column label="L$/sq.m" name="per_meter" width="90" />
<column label="Online" name="online" width="90" />
<column label="Members" name="members" width="90" />
<button label="Buscar" label_selected="Buscar" name="Search"/>
<check_box label="Contenido PG" name="incpg"/>
<check_box label="Contenido Mature" name="incmature"/>
<check_box label="Contenido Adulto" name="incadult"/>
<scroll_list name="results">
<column label="" name="icon"/>
<column label="Nombre" name="name"/>
<column label="Precio" name="price"/>
<column label="Día (PT)" name="date"/>
<column label="Hora" name="time"/>
<column label="Tráfico" name="dwell"/>
<column label="Superfice" name="area"/>
<column label="L$/m²" name="per_meter"/>
<column label="Conectado" name="online"/>
<column label="Miembros" name="members"/>
</scroll_list>
<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom_delta="-20" drop_shadow_visible="true" follows="left|bottom"
font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"
mouse_opaque="true" name="result_text" v_pad="0" width="328" />
</panel>
<panel border="true" bottom="-549" follows="left|top|right|bottom" height="533"
label="Classifieds" left="1" left_delta="68" mouse_opaque="false"
name="classified_panel" width="778">
<panel label="Clasificados" name="classified_panel">
<string name="searching_text">
Searching...
Buscando...
</string>
<string name="not_found_text">
None Found.
Nada Encontrado.
</string>
<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="-24" drop_shadow_visible="true" follows="left|top" font="SansSerif"
h_pad="0" halign="left" height="16" left="4" mouse_opaque="true"
name="find" v_pad="0" width="50">
Find:
<text name="find">
Buscar:
</text>
<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-24"
follows="left|right|top" font="SansSerif" height="18" left="56"
max_length="63" mouse_opaque="true" name="name" width="160" spell_check="true" />
<check_box bottom="-22" control_name="ShowPGClassifieds" follows="right|top"
font="SansSerifSmall" height="16" initial_value="true"
label="PG content" left="420" mouse_opaque="true"
name="incpg" width="156" />
<check_box bottom="-40" control_name="ShowMatureClassifieds" follows="right|top"
font="SansSerifSmall" height="16" initial_value="true"
label="Mature content" left="420" mouse_opaque="true"
name="incmature" width="156" />
<check_box bottom="-58" control_name="ShowAdultClassifieds" follows="right|top"
font="SansSerifSmall" height="16" initial_value="false"
label="Adult content" left="420" mouse_opaque="true"
name="incadult" width="156" />
<combo_box allow_text_entry="false" bottom="-46" follows="right|top" height="18" left="230"
max_chars="20" mouse_opaque="true" name="Category" width="158">
<combo_item name="AnyCategory" value="0">
Any Category
<check_box label="Contenido PG" name="incpg"/>
<check_box label="Contenido Mature" name="incmature"/>
<check_box label="Contenido Adulto" name="incadult"/>
<combo_box name="Category">
<combo_item name="AnyCategory">
Cualquier Categoría
</combo_item>
<combo_item name="Shopping" value="1">
Shopping
<combo_item name="Shopping">
Compra
</combo_item>
<combo_item name="LandRental" value="2">
Land Rental
<combo_item name="LandRental">
Terreno en alquiler
</combo_item>
<combo_item name="PropertyRental" value="3">
Property Rental
<combo_item name="PropertyRental">
Propiedad en alquiler
</combo_item>
<combo_item name="SpecialAttraction" value="4">
Special Attraction
<combo_item name="SpecialAttraction">
Atracciones especiales
</combo_item>
<combo_item name="NewProducts" value="5">
New Products
<combo_item name="NewProducts">
Nuevos Productos
</combo_item>
<combo_item name="Employment" value="6">
Employment
<combo_item name="Employment">
Empleos
</combo_item>
<combo_item name="Wanted" value="7">
Wanted
<combo_item name="Wanted">
Se Busca
</combo_item>
<combo_item name="Service" value="8">
Service
<combo_item name="Service">
Servicios
</combo_item>
<combo_item name="Personal" value="9">
<combo_item name="Personal">
Personal
</combo_item>
</combo_box>
<button bottom="-48" follows="right|top" font="SansSerif" halign="center" height="20"
label="Browse" label_selected="Browse" left="121" mouse_opaque="true"
name="Browse" width="95" />
<button bottom="-48" follows="right|top" font="SansSerif" halign="center" height="20"
label="Search" label_selected="Search" left="121" mouse_opaque="true" name="Search"
visible="false" width="95" />
<button bottom="-46" follows="right|top" font="SansSerif" halign="center" height="20"
label="Place an Ad..." label_selected="Place an Ad..." left="630"
mouse_opaque="true" name="Place an Ad..." width="145" />
<button bottom="-533" follows="left|bottom" font="SansSerif" halign="center"
height="20" label="Delete" label_selected="Delete" left="80"
mouse_opaque="true" name="Delete" width="80" />
<scroll_list background_visible="true" bottom="-510" column_padding="0" draw_border="true"
draw_heading="true" follows="left|top|right|bottom" height="450" left="4"
mouse_opaque="true" multi_select="false" name="results" search_column="2" width="339">
<column label="" name="icon" width="24" />
<column label="" name="type" width="-1" />
<column label="Name" name="name" width="225" />
<column label="Price" name="price" width="55" />
<button label="Navegar" label_selected="Navegar" name="Browse"/>
<button label="Buscar" label_selected="Buscar" name="Search"/>
<button label="Poner un Anuncio..." label_selected="Poner un Anuncio..." name="Place an Ad..."/>
<button label="Borrar" label_selected="Borrar" name="Delete"/>
<scroll_list name="results">
<column label="" name="icon"/>
<column label="" name="type"/>
<column label="Nombre" name="name"/>
<column label="Precio" name="price"/>
</scroll_list>
<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom_delta="-20" drop_shadow_visible="true" follows="left|bottom"
font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"
mouse_opaque="true" name="result_text" v_pad="0" width="80" />
<button bottom="-533" follows="right|bottom" font="SansSerif" halign="center"
height="20" label="Next &gt;" label_selected="Next &gt;"
mouse_opaque="true" name="Next &gt;" right="344" width="80" />
<button bottom_delta="0" follows="right|bottom" font="SansSerif" halign="center"
height="20" label="&lt; Prev" label_selected="&lt; Prev"
mouse_opaque="true" name="&lt; Prev" right="258" width="80" />
<button label="Sig. &gt;" label_selected="Sig. &gt;" name="Next &gt;"/>
<button label="&lt; Ant." label_selected="&lt; Ant." name="&lt; Prev"/>
</panel>
<panel border="true" bottom="-549" default_tab_group="1"
follows="left|top|right|bottom" height="533" label="Events" left="1"
mouse_opaque="false" name="events_panel" width="778">
<panel label="Eventos" name="events_panel">
<string name="searching_text">
Searching...
Buscando...
</string>
<string name="not_found_text">
None Found.
Ninguno Encontrado.
</string>
<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="-24" drop_shadow_visible="true" follows="left|top" font="SansSerif"
h_pad="0" halign="left" height="16" left="4" mouse_opaque="true"
name="text2" v_pad="0" width="50">
Find:
<text name="text2">
Buscar:
</text>
<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-24"
follows="left|right|top" font="SansSerif" height="18" left="56"
max_length="63" mouse_opaque="true" name="event_search_text" width="160" spell_check="true" />
<radio_group bottom="-40" draw_border="false" follows="right|top" height="40" left="560"
mouse_opaque="true" name="date_mode" width="300">
<radio_item bottom="-20" follows="left|top" height="20" left="0" mouse_opaque="true"
name="current" width="174">
In-Progress and Upcoming
<radio_group name="date_mode">
<radio_item name="current">
En curso y próximos
</radio_item>
<radio_item bottom_delta="-10" follows="left|top" height="20" left="0" mouse_opaque="true"
name="date" width="56">
Date
<radio_item name="date">
Fecha
</radio_item>
</radio_group>
<button bottom="-40" follows="right|top" font="SansSerif" halign="center" height="20"
label="&lt;&lt;" label_selected="&lt;&lt;" left_delta="54"
mouse_opaque="true" name="&lt;&lt;" tool_tip="Go back a day" width="24" />
<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="-36" drop_shadow_visible="true" follows="right|top" font="SansSerif"
h_pad="0" halign="center" height="14" left_delta="22" mouse_opaque="true"
name="date_text" v_pad="0" width="48">
<button label="&lt;&lt;" label_selected="&lt;&lt;" name="&lt;&lt;" tool_tip="Retroceder un día"/>
<text name="date_text">
6/6
</text>
<button bottom="-40" follows="right|top" font="SansSerif" halign="center" height="20"
label="&gt;&gt;" label_selected="&gt;&gt;" left_delta="50"
mouse_opaque="true" name="&gt;&gt;" tool_tip="Go forward a day" width="24" />
<button bottom="-40" follows="right|top" font="SansSerif" halign="center" height="20"
label="Today" label_selected="Today" left_delta="28" mouse_opaque="true"
name="Today" tool_tip="Show today&apos;s events" width="60" />
<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="-24" drop_shadow_visible="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="20" left="289"
mouse_opaque="true" name="text" v_pad="0" width="90" visible="false">
Category:
<button label="&gt;&gt;" label_selected="&gt;&gt;" name="&gt;&gt;" tool_tip="Avanzar un día"/>
<button label="Hoy" label_selected="Hoy" name="Today" tool_tip="Mostrar los eventos del día de hoy"/>
<text name="text">
Categoría:
</text>
<combo_box allow_text_entry="false" bottom="-46" follows="right|top" height="18" left="230"
max_chars="20" mouse_opaque="true" name="category combo" width="158">
<combo_item name="All" value="0">
Any Category
<combo_box name="category combo">
<combo_item name="All">
Cualquier categoría
</combo_item>
<combo_item name="Discussion" value="18">
Discussion
<combo_item name="Discussion">
Debates
</combo_item>
<combo_item name="Sports" value="19">
Sports
<combo_item name="Sports">
Deportes
</combo_item>
<combo_item name="LiveMusic" value="20">
Live Music
<combo_item name="LiveMusic">
Música en vivo
</combo_item>
<combo_item name="Commercial" value="22">
Commercial
<combo_item name="Commercial">
Comercial
</combo_item>
<combo_item name="Nightlife/Entertainment" value="23">
Nightlife/Entertainment
<combo_item name="Nightlife/Entertainment">
Vida nocturna/Entretenimiento
</combo_item>
<combo_item name="Games/Contests" value="24">
Games/Contests
<combo_item name="Games/Contests">
Juegos/Concursos
</combo_item>
<combo_item name="Pageants" value="25">
Pageants
<combo_item name="Pageants">
Representaciones
</combo_item>
<combo_item name="Education" value="26">
Education
<combo_item name="Education">
Educación
</combo_item>
<combo_item name="ArtsandCulture" value="27">
Arts and Culture
<combo_item name="ArtsandCulture">
Arte y Cultura
</combo_item>
<combo_item name="Charity/SupportGroups" value="28">
Charity/Support Groups
<combo_item name="Charity/SupportGroups">
Grupos de Ayuda y Caridad
</combo_item>
<combo_item name="Miscellaneous" value="29">
Miscellaneous
Misceláneos
</combo_item>
</combo_box>
<check_box bottom="-22" control_name="ShowPGEvents" follows="right|top"
font="SansSerifSmall" height="16" initial_value="true"
label="PG content" left="420" mouse_opaque="true"
name="incpg" width="156" />
<check_box bottom="-40" control_name="ShowMatureEvents" follows="right|top"
font="SansSerifSmall" height="16" initial_value="true"
label="Mature content" left="420" mouse_opaque="true"
name="incmature" width="156" />
<check_box bottom="-58" control_name="ShowAdultEvents" follows="right|top"
font="SansSerifSmall" height="16" initial_value="false"
label="Adult content" left="420" mouse_opaque="true"
name="incadult" width="156" />
<button bottom="-48" follows="right|top" font="SansSerif" halign="center" height="20"
label="Search" label_selected="Search" left="121" mouse_opaque="true" name="Search"
visible="true" width="95" />
<button bottom="-533" follows="left|bottom" font="SansSerif" halign="center"
height="20" label="Delete" label_selected="Delete" left="80"
mouse_opaque="true" name="Delete" width="80" />
<scroll_list background_visible="true" bottom="-510" column_padding="0" draw_border="true" draw_heading="true"
follows="left|top|right|bottom" height="450" left="4" mouse_opaque="true"
multi_select="false" name="results" search_column="2" width="339">
<column label="" name="icon" width="24" />
<column label="" name="type" width="-1" />
<column dynamicwidth="true" label="Name" name="name" />
<column label="Time (PT)" name="date" sort="time" width="106" />
<column label="" name="event_id" width="-1" />
<column label="Time" name="time" width="-1" />
<check_box label="Contenido PG" name="incpg"/>
<check_box label="Contenido Mature" name="incmature"/>
<check_box label="Contenido Adult" name="incadult"/>
<button label="Buscar" label_selected="Buscar" name="Search"/>
<button label="Borrar" label_selected="Borrar" name="Delete"/>
<scroll_list name="results">
<column label="" name="icon"/>
<column label="" name="type"/>
<column label="Nombre" name="name" />
<column label="Día (PT)" name="date"/>
<column label="" name="event_id"/>
<column label="Hora" name="time"/>
</scroll_list>
<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom_delta="-20" drop_shadow_visible="true" follows="left|bottom"
font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"
mouse_opaque="true" name="result_text" v_pad="0" width="80" />
<button bottom="-533" follows="right|bottom" font="SansSerif" halign="center"
height="20" label="Next &gt;" label_selected="Next &gt;"
mouse_opaque="true" name="Next &gt;" right="344" width="80" />
<button bottom_delta="0" follows="right|bottom" font="SansSerif" halign="center"
height="20" label="&lt; Prev" label_selected="&lt; Prev"
mouse_opaque="true" name="&lt; Prev" right="258" width="80" />
<button label="Sig. &gt;" label_selected="Sig. &gt;" name="Next &gt;"/>
<button label="&lt; Ant." label_selected="&lt; Ant." name="&lt; Prev"/>
</panel>
<panel border="true" bottom="-549" follows="left|top|right|bottom" height="533"
label="Land Sales" left="1" mouse_opaque="false" name="land_sales_panel"
width="778" default_tab_group="1">
<panel label="Venta de Terrenos" name="land_sales_panel">
<string name="searching_text">
Searching...
Buscando...
</string>
<string name="not_found_text">
None Found.
Ninguno Encontrado.
</string>
<string name="land_help_text">
Land can be bought direct for in-world money ([CURRENCY]) or at auction for either [CURRENCY] or [REALCURRENCY].
To buy direct, visit the land and click on the place name in the title bar.
El terreno puede comprarse directamente en la moneda del mundo ([CURRENCY]) , o con [CURRENCY] o [REALCURRENCY]. en una
subasta. Para comprarlo directamente, visítalo y pulsa en el nombre del terreno en la barra superior del visor.
</string>
<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="-24" drop_shadow_visible="true" follows="left|top" font="SansSerif"
h_pad="0" halign="left" height="16" left="4" mouse_opaque="true"
name="find" v_pad="0" width="50">
Find:
<text name="find">
Buscar:
</text>
<check_box bottom="-22" control_name="ShowPGLand" follows="right|top"
font="SansSerifSmall" height="16" initial_value="true"
label="PG content" left="420" mouse_opaque="true"
name="incpg" tab_group="7" width="156" />
<check_box bottom="-40" control_name="ShowMatureLand" follows="right|top"
font="SansSerifSmall" height="16" initial_value="true"
label="Mature content" left="420" mouse_opaque="true"
name="incmature" tab_group="8" width="156" />
<check_box bottom="-58" control_name="ShowAdultLand" follows="right|top"
font="SansSerifSmall" height="16" initial_value="false"
label="Adult content" left="420" mouse_opaque="true"
name="incadult" tab_group="9" width="156" />
<combo_box allow_text_entry="false" bottom="-46" follows="left|top|right" height="18" left="282"
max_chars="20" mouse_opaque="true" name="type" tab_group="6" width="128">
<combo_item name="AllTypes" value="All Types">
All Types
<check_box label="Contenido PG" name="incpg"/>
<check_box label="Contenido Mature" name="incmature"/>
<check_box label="Contenido Adult" name="incadult"/>
<combo_box name="type">
<combo_item name="AllTypes">
Todos los tipos
</combo_item>
<combo_item name="Auction" value="Auction">
Auction
<combo_item name="Auction">
Subasta
</combo_item>
<combo_item name="MainlandSales" value="Mainland Sales">
For Sale - Mainland
<combo_item name="MainlandSales">
En Venta - Mainland
</combo_item>
<combo_item name="EstateSales" value="Estate Sales">
For Sale - Estate
<combo_item name="EstateSales">
En Venta - Estado
</combo_item>
</combo_box>
<check_box bottom="-24" control_name="FindLandPrice" follows="left|top"
font="SansSerifSmall" height="16" initial_value="true"
label="Price &#8804; " left="56" mouse_opaque="true" name="pricecheck"
tab_group="1" width="88" />
<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" follows="left|top"
bottom="-24" font="SansSerifSmall" halign="left" height="16" left="116" mouse_opaque="true"
name="pricecheck_symbol" width="15">
L$
<check_box label="Precio &#8804; " name="pricecheck"/>
<text name="pricecheck_symbol">
[CURRENCY]
</text>
<check_box bottom_delta="-18" control_name="FindLandArea" follows="left|top"
font="SansSerifSmall" height="16" initial_value="true"
label="Area &#8805; " left="56" mouse_opaque="true" name="areacheck"
tab_group="3" width="80" />
<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" follows="left|top"
bottom="-42" font="SansSerifSmall" halign="left" height="16" left="170" mouse_opaque="true"
name="areacheck_symbol" width="15">
<check_box label="Superficie &#8805; " name="areacheck"/>
<text name="areacheck_symbol">
m²
</text>
<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-22"
follows="left|top" font="SansSerifSmall" height="16" left="132"
max_length="10" mouse_opaque="true" name="priceedit" tab_group="2" width="50" spell_check="true" />
<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-18"
follows="left|top" font="SansSerifSmall" height="16" left="117"
max_length="10" mouse_opaque="true" name="areaedit" tab_group="4" width="50" spell_check="true" />
<button bottom="-48" follows="left|top" font="SansSerif" halign="center" height="20"
label="Search" label_selected="Search" left="208" mouse_opaque="true"
name="Search" tab_group="5" width="70" />
<scroll_list background_visible="true" bottom="-510" column_padding="0" draw_border="true" draw_heading="true"
follows="left|top|right|bottom" height="450" left="4" mouse_opaque="true"
multi_select="false" name="results" search_column="2" tab_group="10" width="387">
<column label="" name="icon" width="24" />
<column label="" name="type" width="-1" />
<column dynamicwidth="true" label="Name" name="name" />
<column label="Type" name="landtype" width="50" />
<column label="L$ Price" name="price" width="65" />
<column label="Area" name="area" width="50" />
<column label="L$/m²" name="per_meter" width="65" />
<button label="Buscar" label_selected="Buscar" name="Search"/>
<scroll_list name="results">
<column label="" name="icon"/>
<column label="" name="type"/>
<column label="Nombre" name="name" />
<column label="Tipo" name="landtype"/>
<column label="[CURRENCY] Precio" name="price"/>
<column label="Superficie" name="area"/>
<column label="[CURRENCY]/m²" name="per_meter"/>
</scroll_list>
<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom_delta="-20" drop_shadow_visible="true" follows="left|bottom"
font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"
mouse_opaque="true" name="result_text" v_pad="0" width="328" />
<button bottom="-533" follows="right|bottom" font="SansSerif" halign="center"
height="20" label="Next &gt;" label_selected="Next &gt;"
mouse_opaque="true" name="Next &gt;" right="344" width="80" />
<button bottom_delta="0" follows="right|bottom" font="SansSerif" halign="center"
height="20" label="&lt; Prev" label_selected="&lt; Prev"
mouse_opaque="true" name="&lt; Prev" right="258" width="80" />
<button label="Sig. &gt;" label_selected="Sig. &gt;" name="Next &gt;"/>
<button label="&lt; Ant." label_selected="&lt; Ant." name="&lt; Prev"/>
</panel>
<panel border="true" bottom="-549" follows="left|top|right|bottom" height="533"
label="Places" left="1" mouse_opaque="false" name="places_panel"
width="778">
<panel label="Lugares" name="places_panel">
<string name="searching_text">
Searching...
Buscando...
</string>
<string name="not_found_text">
None Found.
Ninguno Encontrado.
</string>
<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="-24" drop_shadow_visible="true" follows="left|top" font="SansSerif"
h_pad="0" halign="left" height="16" left="4" mouse_opaque="true"
name="find" v_pad="0" width="50">
Find:
<text name="find">
Buscar:
</text>
<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-24"
follows="left|right|top" font="SansSerif" height="18" left="56"
max_length="63" mouse_opaque="true" name="name" width="160" spell_check="true" />
<check_box bottom="-22" control_name="ShowPGSims" follows="right|top"
font="SansSerifSmall" height="16" initial_value="true"
label="PG content" left="420" mouse_opaque="true"
name="incpg" width="156" />
<check_box bottom="-40" control_name="ShowMatureSims" follows="right|top"
font="SansSerifSmall" height="16" initial_value="true"
label="Mature content" left="420" mouse_opaque="true"
name="incmature" width="156" />
<check_box bottom="-58" control_name="ShowAdultSims" follows="right|top"
font="SansSerifSmall" height="16" initial_value="false"
label="Adult content" left="420" mouse_opaque="true"
name="incadult" width="156" />
<combo_box allow_text_entry="false" bottom="-46" enabled="false" follows="right|top" height="18" left="230"
max_chars="20" mouse_opaque="true" name="Category" width="128" visible="false">
<combo_item name="AnyCategory" value="any">
Any Category
<check_box label="Contenido PG" name="incpg"/>
<check_box label="Contenido Mature" name="incmature"/>
<check_box label="Contenido Adulto" name="incadult"/>
<combo_box name="Category">
<combo_item name="AnyCategory">
Cualquier Categoría
</combo_item>
<combo_item name="LindenLocation" value="linden">
Official Location
<combo_item name="LindenLocation">
Localización Linden
</combo_item>
<combo_item name="Arts&amp;Culture" value="arts">
Artsand Culture
<combo_item name="Arts&amp;Culture">
Arte y Cultura
</combo_item>
<combo_item name="Business" value="store">
Business
<combo_item name="Business">
Negocios
</combo_item>
<combo_item name="Educational" value="educational">
Educational
<combo_item name="Educational">
Educacional
</combo_item>
<combo_item name="Gaming" value="game">
Gaming
<combo_item name="Gaming">
Juegos de Azar
</combo_item>
<combo_item name="Hangout" value="gather">
Hangout
<combo_item name="Hangout">
Entretenimiento
</combo_item>
<combo_item name="NewcomerFriendly" value="newcomer">
Newcomer Friendly
<combo_item name="NewcomerFriendly">
Para recién llegados
</combo_item>
<combo_item name="Parks&amp;Nature" value="park">
Parks and Nature
<combo_item name="Parks&amp;Nature">
Parques y Naturaleza
</combo_item>
<combo_item name="Residential" value="home">
Residential
<combo_item name="Residential">
Residencial
</combo_item>
<combo_item name="Shopping" value="shopping">
Shopping
<combo_item name="Shopping">
Compras
</combo_item>
<combo_item name="Other" value="other">
Other
<combo_item name="Other">
Otra
</combo_item>
<combo_item name="Rental" value="rental">
Alquiler
</combo_item>
<combo_item name="Rental" value="rental">
Rental
</combo_item>
</combo_box>
<!-- This is used only during the AO transition and can be deleted once the AO transition is
complete. It is identical to the combo box above except that it has the Adult category.
You might also want to set it back to default visible and enabled. -->
<combo_box allow_text_entry="false" bottom="-46" enabled="false" follows="right|top" height="18" left="230"
max_chars="20" mouse_opaque="true" name="Category_Adult" width="128" visible="false">
<combo_item name="AnyCategory" value="any">
Any Category
<combo_box name="Category_Adult">
<combo_item name="AnyCategory">
Cualquier Categoría
</combo_item>
<combo_item name="LindenLocation" value="linden">
Linden Location
<combo_item name="LindenLocation">
Localización Linden
</combo_item>
<combo_item name="Adult" value="adult">
Adult
Adulto
</combo_item>
<combo_item name="Arts&amp;Culture" value="arts">
Arts and Culture
<combo_item name="Arts&amp;Culture">
Arte y Cultura
</combo_item>
<combo_item name="Business" value="store">
Business
<combo_item name="Business">
Negocios
</combo_item>
<combo_item name="Educational" value="educational">
Educational
<combo_item name="Educational">
Educacional
</combo_item>
<combo_item name="Gaming" value="game">
Gaming
<combo_item name="Gaming">
Juegos de Azar
</combo_item>
<combo_item name="Hangout" value="gather">
Hangout
<combo_item name="Hangout">
Entretenimiento
</combo_item>
<combo_item name="NewcomerFriendly" value="newcomer">
Newcomer Friendly
<combo_item name="NewcomerFriendly">
Para recién llegados
</combo_item>
<combo_item name="Parks&amp;Nature" value="park">
Parks and Nature
<combo_item name="Parks&amp;Nature">
Parques y Naturaleza
</combo_item>
<combo_item name="Residential" value="home">
Residential
<combo_item name="Residential">
Residencial
</combo_item>
<combo_item name="Shopping" value="shopping">
Shopping
<combo_item name="Shopping">
Compras
</combo_item>
<combo_item name="Other" value="other">
Other
<combo_item name="Other">
Otra
</combo_item>
<combo_item name="Rental" value="rental">
Alquiler
</combo_item>
<combo_item name="Rental" value="rental">
Rental
</combo_item>
</combo_box>
<button bottom="-48" follows="right|top" font="SansSerif" halign="center" height="20"
label="Search" label_selected="Search" left="121" mouse_opaque="true"
name="Search" width="95" />
<scroll_list background_visible="true" bottom="-510" column_padding="0" draw_border="true"
draw_heading="true"
follows="left|top|right|bottom" height="450" left="4" mouse_opaque="true"
multi_select="false" name="results" search_column="2" width="339">
<column label="" name="icon" width="24" />
<column label="" name="type" width="-1" />
<column dynamicwidth="true" label="Name" name="name" />
<column label="Traffic" name="dwell" width="75" />
<button label="Buscar" label_selected="Buscar" name="Search"/>
<scroll_list name="results">
<column label="" name="icon"/>
<column label="" name="type"/>
<column abel="Nombre" name="name" />
<column label="Tráfico" name="dwell"/>
</scroll_list>
<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom_delta="-20" drop_shadow_visible="true" follows="left|bottom"
font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"
mouse_opaque="true" name="result_text" v_pad="0" width="328" />
<button bottom="-533" follows="left|bottom" font="SansSerif" halign="center"
height="20" label="Next &gt;" label_selected="Next &gt;"
mouse_opaque="true" name="Next &gt;" right="344" width="80" />
<button bottom_delta="0" follows="left|bottom" font="SansSerif" halign="center"
height="20" label="&lt; Prev" label_selected="&lt; Prev"
mouse_opaque="true" name="&lt; Prev" right="258" width="80" />
<button label="Sig. &gt;" label_selected="Sig. &gt;" name="Next &gt;"/>
<button label="&lt; Ant." label_selected="&lt; Ant." name="&lt; Prev"/>
</panel>
<panel border="true" bottom="-549" follows="left|top|right|bottom" height="533"
label="People" left="1" mouse_opaque="false" name="people_panel"
width="778">
<panel label="Personas" name="people_panel">
<string name="searching_text">
Searching...
Buscando...
</string>
<string name="not_found_text">
None Found.
Nadie encontrado.
</string>
<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="-24" drop_shadow_visible="true" follows="left|top" font="SansSerif"
h_pad="0" halign="left" height="16" left="4" mouse_opaque="true"
name="find" v_pad="0" width="50">
Find:
</text>
<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-24"
follows="left|right|top" font="SansSerif" height="18" left="56"
max_length="63" mouse_opaque="true" name="name" width="160" spell_check="true" />
<button bottom="-48" follows="right|top" font="SansSerif" halign="center" height="20"
label="Search" label_selected="Search" left="121" mouse_opaque="true"
name="Search" width="95" />
<scroll_list background_visible="true" bottom="-510" column_padding="0" draw_border="true"
draw_heading="true"
follows="left|top|right|bottom" height="450" left="4" mouse_opaque="true"
multi_select="false" name="results" search_column="2" width="326">
<column label="" name="icon" width="24" />
<column label="" name="type" width="-1" />
<column label="Name" name="name" width="274" />
</scroll_list>
<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom_delta="-20" drop_shadow_visible="true" follows="left|bottom"
font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"
mouse_opaque="true" name="result_text" v_pad="0" width="328" />
<button bottom="-533" follows="left|bottom" font="SansSerif" halign="center"
height="20" label="Next &gt;" label_selected="Next &gt;"
mouse_opaque="true" name="Next &gt;" right="330" width="80" />
<button bottom_delta="0" follows="left|bottom" font="SansSerif" halign="center"
height="20" label="&lt; Prev" label_selected="&lt; Prev"
mouse_opaque="true" name="&lt; Prev" right="244" width="80" />
</panel>
<panel border="true" bottom="-549" follows="left|top|right|bottom" height="533"
label="Groups" left="1" mouse_opaque="false" name="groups_panel"
width="778">
<string name="searching_text">
Searching...
</string>
<string name="not_found_text">
None Found.
</string>
<button bottom="-533" follows="left|bottom" font="SansSerif" halign="center"
height="20" label="Next &gt;" label_selected="Next &gt;"
mouse_opaque="true" name="Next &gt;" right="344" width="80" />
<button bottom_delta="0" follows="left|bottom" font="SansSerif" halign="center"
height="20" label="&lt; Prev" label_selected="&lt; Prev"
mouse_opaque="true" name="&lt; Prev" right="258" width="80" />
<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="-24" drop_shadow_visible="true" follows="left|top" font="SansSerif"
h_pad="0" halign="left" height="16" left="4" mouse_opaque="true"
name="find" v_pad="0" width="50">
Find:
<text name="find">
Buscar:
</text>
<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-24"
follows="left|top" font="SansSerif" height="18" left_delta="38"
max_length="63" mouse_opaque="true" name="name" width="200" spell_check="true" />
<button bottom="-26" follows="left|top" font="SansSerif" halign="center" height="20"
label="Search" label_selected="Search" left_delta="210" mouse_opaque="true"
name="Search" width="70" />
<check_box bottom="-46" control_name="ShowPGGroups" follows="left|top"
font="SansSerifSmall" height="16" initial_value="true"
label="PG content" left="4" mouse_opaque="true"
name="incpg" width="204" />
<check_box bottom="-46" control_name="ShowMatureGroups" follows="left|top"
font="SansSerifSmall" height="16" initial_value="true"
label="Mature content" left_delta="90" mouse_opaque="true"
name="incmature" width="204" />
<check_box bottom="-46" control_name="ShowAdultGroups" follows="left|top"
font="SansSerifSmall" height="16" initial_value="false"
label="Adult content" left_delta="110" mouse_opaque="true"
name="incadult" width="204" />
<scroll_list background_visible="true" bottom="-513" column_padding="0" draw_border="true"
draw_heading="true"
follows="left|top|right|bottom" height="464" left="4" mouse_opaque="true"
multi_select="false" name="results" search_column="2" width="339">
<column label="" name="icon" sort="score" sort_ascending="false" width="24" />
<column label="" name="type" width="-1" />
<column dynamicwidth="true" label="Name" name="name" />
<column halign="left" label="Members" name="members" sort_ascending="false" width="100" />
<column label="" name="score" width="-1" />
<button label="Buscar" label_selected="Buscar" name="Search"/>
<scroll_list name="results">
<column label="" name="icon"/>
<column label="" name="type"/>
<column label="Nombre" name="name"/>
</scroll_list>
<button label="Sig. &gt;" label_selected="Sig. &gt;" name="Next &gt;"/>
<button label="&lt; Ant." label_selected="&lt; Ant." name="&lt; Prev"/>
</panel>
<panel label="Grupos" name="groups_panel">
<string name="searching_text">
Buscando...
</string>
<string name="not_found_text">
Ninguno Encontrado.
</string>
<button label="Sig. &gt;" label_selected="Sig. &gt;" name="Next &gt;"/>
<button label="&lt; Ant." label_selected="&lt; Ant." name="&lt; Prev"/>
<text name="find">
Buscar:
</text>
<button label="Buscar" label_selected="Buscar" name="Search"/>
<check_box label="Contenido PG" name="incpg"/>
<check_box label="Contenido Mature" name="incmature"/>
<check_box label="Contenido Adulto" name="incadult"/>
<scroll_list name="results">
<column label="" name="icon"/>
<column label="" name="type"/>
<column label="Nombre" name="name" />
<column label="Miembros" name="members"/>
<column label="" name="score"/>
</scroll_list>
<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom_delta="-20" drop_shadow_visible="true" follows="left|bottom"
font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"
mouse_opaque="true" name="result_text" v_pad="0" width="328" />
</panel>
</tab_container>
<panel bottom="-560" follows="right|top" height="470" left="340"
name="classified_details_panel" width="440" />
<panel bottom="-560" follows="right|top" height="486" left="350" name="Panel Avatar"
width="430" />
<panel bottom="-560" follows="right|top" height="470" left="340"
name="event_details_panel" width="440" />
<panel bottom="-580" follows="right|top" height="515" left="350"
name="group_details_panel_holder" width="430">
<panel bottom="0" follows="right|top" height="470" left="0" name="group_details_panel"
width="430" />
<panel name="classified_details_panel"/>
<panel name="Panel Avatar"/>
<panel name="event_details_panel"/>
<panel name="group_details_panel_holder">
<panel name="group_details_panel"/>
</panel>
<panel bottom="-560" follows="right|top" height="470" left="340"
name="place_details_panel" width="440" />
<panel bottom="-560" follows="right|top" height="470" left="385"
name="place_details_small_panel" width="395" />
<panel name="place_details_panel"/>
<panel name="place_details_small_panel"/>
</floater>

960
indra/newview/skins/default/xui/es/floater_directory3.xml
View File

File diff suppressed because it is too large Load Diff

2
indra/newview/skins/default/xui/es/floater_display_name.xml
View File

@@ -6,11 +6,9 @@
<text name="set_name_label">
Nuevo Nombre a Mostrar:
</text>
<line_editor name="display_name_editor"/>
<text name="name_confirm_label">
Vuelve a escribir tu nombre nuevo para confirmarlo:
</text>
<line_editor name="display_name_confirm"/>
<button label="Guardar" name="save_btn" tool_tip="Guardar tu nuevo Nombre a Mostrar" />
<button label="Restablecer" name="reset_btn" tool_tip="Hacer que tu Nombre a Mostrar sea el mismo que tu nombre de usuario" />
<button label="Cancelar" name="cancel_btn" tool_tip="Cancelar y cerrar esta ventana" />

8
indra/newview/skins/default/xui/es/floater_explore_animations.xml
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater name="floater_explore_animations" title="Animaciones">
<scroll_list name="anim_list">
<column label="Nombre" name="name" />
<column label="" name="info" />
</scroll_list>
<scroll_list name="anim_list">
<column label="Nombre" name="name" />
<column label="" name="info" />
</scroll_list>
</floater>

44
indra/newview/skins/default/xui/es/floater_explore_sounds.xml
View File

@@ -1,25 +1,25 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater name="floater_explore_sounds" title="Sonidos">
<text name="result_label">
Fuentes:
</text>
<check_box name="avatars_chk" label="Avatares"/>
<check_box name="objects_chk" label="Objetos"/>
<check_box name="collision_chk" label="Sonido de Colisión por Defecto" />
<text name="result_label">
Controles:
</text>
<check_box name="repeated_asset_chk" label="Mostrar Repeticiones"/>
<check_box name="pause_chk" label="Pausar Registro" left_delta="130" />
<scroll_list name="sound_list">
<column tool_tip="Tipo" name="type" />
<column label="Tiempo" name="playing" width="60" />
<column label="Propietario" name="owner" />
<column label="Sonido" name="sound" />
</scroll_list>
<button label="Mirar Hacia" name="look_at_btn" />
<button label="Reproducir Localmente" name="play_locally_btn" width="150"/>
<button label="Reproducir en el Mundo" name="play_ambient_btn" left_delta="155" width="155"/>
<button label="Detener" name="stop_btn"/>
<button label="Agregar a Lista Negra" name="bl_btn" />
<text name="result_label">
Fuentes:
</text>
<check_box name="avatars_chk" label="Avatares"/>
<check_box name="objects_chk" label="Objetos"/>
<check_box name="collision_chk" label="Sonido de Colisión por Defecto" />
<text name="result_label">
Controles:
</text>
<check_box name="repeated_asset_chk" label="Mostrar Repeticiones"/>
<check_box name="pause_chk" label="Pausar Registro" left_delta="130" />
<scroll_list name="sound_list">
<column tool_tip="Tipo" name="type" />
<column label="Tiempo" name="playing" width="60" />
<column label="Propietario" name="owner" />
<column label="Sonido" name="sound" />
</scroll_list>
<button label="Mirar Hacia" name="look_at_btn" />
<button label="Reproducir Localmente" name="play_locally_btn" width="150"/>
<button label="Reproducir en el Mundo" name="play_ambient_btn" left_delta="155" width="155"/>
<button label="Detener" name="stop_btn"/>
<button label="Agregar a Lista Negra" name="bl_btn" />
</floater>

14
indra/newview/skins/default/xui/es/floater_fast_timers.xml
View File

@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater name="fast_timers">
<string name="pause" >
Pausa
</string>
<string name="run">
Ejecutar
</string>
<button name="pause_btn"label="Pausa"/>
<string name="pause" >
Pausa
</string>
<string name="run">
Ejecutar
</string>
<button name="pause_btn" label="Pausa"/>
</floater>

168
indra/newview/skins/default/xui/es/floater_font_test.xml
View File

@@ -1,87 +1,87 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater name="contents" title="Prueba de Fuentes">
<text font="SansSerifSmall">
SansSerifSmall
</text>
<text font="SansSerifMedium">
SansSerifMedium
</text>
<text font="SansSerif">
SansSerif, sin tamaño ni estilo (Debería ser igual a Medium)
</text>
<text font="SansSerifLarge">
SansSerifLarge
</text>
<text font="SansSerifHuge">
SansSerifHuge
</text>
<text font="Monospace">
Monospace
</text>
<text font="Monospace" font_size="Large">
Monospace tamaño=Grande
</text>
<text font="SansSerifLarge" font_style="BOLD">
SansSerifLarge estilo=NEGRITA
</text>
<text font="SansSerifBold">
SansSerifBold
</text>
<text font="SansSerif" font_style="BOLD">
SansSerif estilo=NEGRITA (debería ser igual a SansSerifBold)
</text>
<text font="SansSerif" font-style="ITALIC">
SansSerif estilo=ITÁLICA
</text>
<text font="SansSerif" font-style="BOLD|ITALIC">
SansSerif estilo=NEGRITA|ITÁLICA
</text>
<text font="SansSerif" font-style="BOLD|ITALIC" font-shadow="soft">
SansSerif estilo=NEGRITA|ITÁLICA sombreado = DROP_SHADOW_SOFT
</text>
<text font="SansSerif" font-style="UNDERLINE">
SansSerif estilo=SUBRAYADO
</text>
<text font="SansSerif" font-shadow="hard">
SansSerif sombreado =DROP_SHADOW
</text>
<text font="SansSerif" font-shadow="soft">
SansSerif sombreado=DROP_SHADOW_SOFT
</text>
<text font="DejaVu">
DejaVu
</text>
<text font="DejaVu" font-style="BOLD">
DejaVu estilo=NEGRITA
</text>
<text font="DejaVu" font-style="ITALIC">
DejaVu estilo=ITALIC
</text>
<text font="DejaVu" font-style="BOLD|ITALIC">
DejaVu estilo=NEGRITA|ITÁLICA
</text>
<text font="DejaVu" font_size="Large" font-style="BOLD|ITALIC">
DejaVu tamaño=grande estilo=NEGRITA|ITÁLICA
</text>
<text font="Helvetica">
Helvetica
</text>
<text font="Helvetica" font-style="BOLD">
Helvetica estilo=NEGRITA
</text>
<text font="Helvetica" font-style="ITALIC">
Helvetica estilo=ITALIC
</text>
<text font="Helvetica" font-style="BOLD|ITALIC">
Helvetica estilo=NEGRITA|ITÁLICA
</text>
<text font="Helvetica" font_size="Large" font-style="BOLD|ITALIC">
Helvetica tamaño=grande estilo=NEGRITA|ITÁLICA
</text>
<text name="linea">
OverrideTest, debería de aparecer aquí en Times. (Desde default/xui/en-us)
</text>
<text font="BogusFontName">
BogusFontName
</text>
<text font="SansSerifSmall">
SansSerifSmall
</text>
<text font="SansSerifMedium">
SansSerifMedium
</text>
<text font="SansSerif">
SansSerif, sin tamaño ni estilo (Debería ser igual a Medium)
</text>
<text font="SansSerifLarge">
SansSerifLarge
</text>
<text font="SansSerifHuge">
SansSerifHuge
</text>
<text font="Monospace">
Monospace
</text>
<text font="Monospace" font_size="Large">
Monospace tamaño=Grande
</text>
<text font="SansSerifLarge" font_style="BOLD">
SansSerifLarge estilo=NEGRITA
</text>
<text font="SansSerifBold">
SansSerifBold
</text>
<text font="SansSerif" font_style="BOLD">
SansSerif estilo=NEGRITA (debería ser igual a SansSerifBold)
</text>
<text font="SansSerif" font-style="ITALIC">
SansSerif estilo=ITÁLICA
</text>
<text font="SansSerif" font-style="BOLD|ITALIC">
SansSerif estilo=NEGRITA|ITÁLICA
</text>
<text font="SansSerif" font-style="BOLD|ITALIC" font-shadow="soft">
SansSerif estilo=NEGRITA|ITÁLICA sombreado = DROP_SHADOW_SOFT
</text>
<text font="SansSerif" font-style="UNDERLINE">
SansSerif estilo=SUBRAYADO
</text>
<text font="SansSerif" font-shadow="hard">
SansSerif sombreado =DROP_SHADOW
</text>
<text font="SansSerif" font-shadow="soft">
SansSerif sombreado=DROP_SHADOW_SOFT
</text>
<text font="DejaVu">
DejaVu
</text>
<text font="DejaVu" font-style="BOLD">
DejaVu estilo=NEGRITA
</text>
<text font="DejaVu" font-style="ITALIC">
DejaVu estilo=ITALIC
</text>
<text font="DejaVu" font-style="BOLD|ITALIC">
DejaVu estilo=NEGRITA|ITÁLICA
</text>
<text font="DejaVu" font_size="Large" font-style="BOLD|ITALIC">
DejaVu tamaño=grande estilo=NEGRITA|ITÁLICA
</text>
<text font="Helvetica">
Helvetica
</text>
<text font="Helvetica" font-style="BOLD">
Helvetica estilo=NEGRITA
</text>
<text font="Helvetica" font-style="ITALIC">
Helvetica estilo=ITALIC
</text>
<text font="Helvetica" font-style="BOLD|ITALIC">
Helvetica estilo=NEGRITA|ITÁLICA
</text>
<text font="Helvetica" font_size="Large" font-style="BOLD|ITALIC">
Helvetica tamaño=grande estilo=NEGRITA|ITÁLICA
</text>
<text name="linea">
OverrideTest, debería de aparecer aquí en Times. (Desde default/xui/en-us)
</text>
<text font="BogusFontName">
BogusFontName
</text>
</floater>

333
indra/newview/skins/default/xui/es/floater_god_tools.xml
View File

@@ -1,285 +1,106 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater bottom="-534" can_close="true" can_drag_on_left="false" can_minimize="true"
can_resize="false" height="384" left="433" min_height="384" min_width="400"
mouse_opaque="true" name="godtools floater" title="God Tools" width="400">
<tab_container bottom="-384" follows="left|top" height="364" left="0" mouse_opaque="false"
name="GodTools Tabs" tab_position="top" width="400">
<panel border="true" bottom="-363" follows="left|top|right|bottom" height="347"
label="Grid" left="1" mouse_opaque="false" name="grid" width="398">
<button bottom="-28" follows="left|top" font="SansSerif" halign="center" height="20"
label="Kick all users" label_selected="Kick all users" left="10"
mouse_opaque="true" name="Kick all users" width="100" />
<button bottom_delta="-28" follows="left|top" font="SansSerif" halign="center"
height="20" label="Flush This Region&apos;s Map Visibility Caches"
label_selected="Flush This Region&apos;s Map Visibility Caches" left="10"
mouse_opaque="true" name="Flush This Region&apos;s Map Visibility Caches"
width="250" />
<floater name="godtools floater" title="Herramientas de Dios">
<tab_container name="GodTools Tabs">
<panel label="Grid" name="grid">
<button label="Expulsar a todos los usuarios" label_selected="Expulsar a todos los usuarios" name="Kick all users" width="200"/>
<button label="Vaciar caché de visibilidad del Mapa de esta Región" label_selected="Vaciar caché de visibilidad del Mapa de esta Región" name="Flush This Region&apos;s Map Visibility Caches" width="350"/>
</panel>
<panel border="true" bottom="-363" follows="left|top|right|bottom" height="347"
label="Region" left="1" mouse_opaque="false" name="region" width="398">
<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="-20" drop_shadow_visible="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
mouse_opaque="true" name="Sim Name:" v_pad="0" width="50">
Sim Name:
<panel label="Región" name="region">
<text name="Sim Name:">
Nombre del Sim:
</text>
<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-26"
follows="left|top|right" font="SansSerifSmall" height="16" left="70"
max_length="63" mouse_opaque="true" name="region name" width="208" />
<check_box bottom="-46" follows="left|top" font="SansSerifSmall" height="16"
initial_value="false" label="Prelude" left="10" mouse_opaque="true"
name="check prelude" tool_tip="Set this to make the region a prelude."
width="180" />
<check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16"
initial_value="false" label="Fixed Sun" left="10" mouse_opaque="true"
name="check fixed sun"
tool_tip="Fix the sun position (like in Region/Estate &gt; Terrain."
width="180" />
<check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16"
initial_value="false" label="Reset Home On Teleport" left="10"
mouse_opaque="true" name="check reset home"
tool_tip="When resident teleports out, reset their home to the destination position."
width="180" />
<check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16"
initial_value="false" label="Visible" left="10" mouse_opaque="true"
name="check visible"
tool_tip="Set this to make the region visible to non-gods." width="180" />
<check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16"
initial_value="false" label="Damage" left="10" mouse_opaque="true"
name="check damage" tool_tip="Set this to enable damage in this region."
width="180" />
<check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16"
initial_value="false" label="Block Traffic Tracking" left="10"
mouse_opaque="true" name="block dwell"
tool_tip="Set this to make the region not compute traffic." width="180" />
<check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16"
initial_value="false" label="Block Terraform" left="10" mouse_opaque="true"
name="block terraform"
tool_tip="Set this to disallow people terraforming their land" width="180" />
<check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16"
initial_value="false" label="Sandbox" left="10" mouse_opaque="true"
name="is sandbox" tool_tip="Toggle whether this is a sandbox region."
width="180" />
<button bottom_delta="-52" follows="top|right" font="SansSerifSmall" halign="center"
height="20" label="Bake Terrain" label_selected="Bake Terrain" left="8"
mouse_opaque="true" name="Bake Terrain"
tool_tip="Save the current terrain as default." width="110" />
<button bottom_delta="-24" follows="top|right" font="SansSerifSmall" halign="center"
height="20" label="Revert Terrain" label_selected="Revert Terrain" left="8"
mouse_opaque="true" name="Revert Terrain"
tool_tip="Replace the current terrain with default." width="110" />
<button bottom_delta="-24" follows="top|right" font="SansSerifSmall" halign="center"
height="20" label="Swap Terrain" label_selected="Swap Terrain" left="8"
mouse_opaque="true" name="Swap Terrain"
tool_tip="Swap current terrain with default." width="110" />
<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="-46" drop_shadow_visible="true" follows="left|top" font="SansSerif"
h_pad="0" halign="left" height="16" left="200" mouse_opaque="true"
name="estate id" v_pad="0" width="190">
Estate ID:
<check_box label="Preludio" name="check prelude" tool_tip="Marcar aqui para hacer un preludio de esta Región."/>
<check_box label="Sol Fijo" name="check fixed sun" tool_tip="Fijar la posición del sol (Así como en Región/Estado &gt; Terreno."/>
<check_box label="Reiniciar Base al Teleportar" name="check reset home" tool_tip="Cuando un residente se teleporta a otro lugar, reiniciar su base al punto de destino."/>
<check_box label="Visible" name="check visible" tool_tip="Marcar aquí para hacer esta región visible para todos"/>
<check_box label="Daño" name="check damage" tool_tip="Marcar aquí para habilitar el daño en esta región"/>
<check_box label="Bloquear Seguimiento de Tráfico" name="block dwell" tool_tip="Marcar aquí para que esta región no compute el tráfico"/>
<check_box label="Bloquear Terraformado" name="block terraform" tool_tip="Marcar aquí para impedir que los usuarios puedan terraformar sus terrenos"/>
<check_box label="Sandbox" name="is sandbox" tool_tip="Definir cuando esta región es o no un sandbox."/>
<button label="Resguardar Terreno" label_selected="Resguardar Terreno" name="Bake Terrain" tool_tip="Guardar el terreno actual como predefinido"/>
<button label="Revertir Terreno" label_selected="Revertir Terreno" name="Revert Terrain" tool_tip="Sustituir el terreno actual por el predefinido"/>
<button label="Intercambiar Terreno" label_selected="Intercambiar Terreno" name="Swap Terrain" tool_tip="Intercambiar terreno por el predefinido"/>
<text name="estate id">
ID del Estado:
</text>
<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-46"
follows="top|right" font="SansSerifSmall" height="16" left_delta="108"
max_length="10" mouse_opaque="true" name="estate" width="50" />
<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="-66" drop_shadow_visible="true" follows="left|top" font="SansSerif"
h_pad="0" halign="left" height="16" left="200" mouse_opaque="true"
name="parent id" v_pad="0" width="190">
Parent ID:
<text name="parent id">
ID del padre:
</text>
<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-66"
follows="top|right" font="SansSerifSmall" height="16" left_delta="108"
max_length="10" mouse_opaque="true" name="parentestate"
tool_tip="This is the parent estate for this region" width="50" />
<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="-86" drop_shadow_visible="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="16" left="200"
mouse_opaque="true" name="Grid Pos: " v_pad="0" width="190">
Grid Pos:
<line_editor name="parentestate" tool_tip="Esta es una propiedad padre para esta región"/>
<text name="Grid Pos: ">
Pos. del Grid:
</text>
<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-86"
follows="top|right" font="SansSerifSmall" height="16" left_delta="88"
max_length="10" mouse_opaque="true" name="gridposx"
tool_tip="This is the grid x position for this region" width="50" />
<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-86"
follows="top|right" font="SansSerifSmall" height="16" left_delta="60"
max_length="10" mouse_opaque="true" name="gridposy"
tool_tip="This is the grid y position for this region" width="40" />
<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="-106" drop_shadow_visible="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="16" left="200"
mouse_opaque="true" name="Redirect to Grid: " v_pad="0" width="190">
Redirect to Grid:
<line_editor name="gridposx" tool_tip="Esta es la posición X para esta región en el grid"/>
<line_editor name="gridposy" tool_tip="Esta es la posición Y para esta región en el grid"/>
<text name="Redirect to Grid: ">
Redireccionar al Grid:
</text>
<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-106"
follows="top|right" font="SansSerifSmall" height="16" left_delta="88"
max_length="10" mouse_opaque="true" name="redirectx" width="50" />
<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-106"
follows="top|right" font="SansSerifSmall" height="16" left_delta="60"
max_length="10" mouse_opaque="true" name="redirecty" width="40" />
<spinner bottom="-126" decimal_digits="3" follows="top|right" height="16"
increment="0.1" initial_val="1" left="308" max_val="4" min_val="0"
mouse_opaque="true" name="billable factor" width="80" />
<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="-126" drop_shadow_visible="true" follows="left|top"
font="SansSerif" h_pad="0" halign="left" height="16" left_delta="-108"
mouse_opaque="true" name="billable factor text" v_pad="0" width="110">
Billable Factor:
<text name="billable factor text">
Factor de cobro:
</text>
<spinner bottom="-146" decimal_digits="3" follows="top|right" height="16" increment="1"
initial_val="1" left="308" max_val="100" min_val="0" mouse_opaque="true"
name="land cost" width="80" />
<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="-146" drop_shadow_visible="true" follows="left|top"
font="SansSerif" h_pad="0" halign="left" height="16" left_delta="-108"
mouse_opaque="true" name="land cost text" v_pad="0" width="110">
[CURRENCY] per sq. meter:
<text name="land cost text">
[CURRENCY] por m2:
</text>
<button bottom="-170" follows="top|right" font="SansSerifSmall" halign="center"
height="20" label="Refresh" label_selected="Refresh" left="278"
mouse_opaque="true" name="Refresh"
tool_tip="Click here to refresh the above information." width="110" />
<button bottom_delta="-56" follows="top|right" font="SansSerifSmall" halign="center"
height="20" label="Apply" label_selected="Apply" left="278"
mouse_opaque="true" name="Apply"
tool_tip="Click here to apply any changes from above." width="110" />
<button bottom="-258" follows="top|right" font="SansSerifSmall" halign="center"
height="20" label="Select Region" label_selected="Select Region" left="128"
mouse_opaque="true" name="Select Region"
tool_tip="Select the whole region with the land tool." width="110" />
<button bottom_delta="-24" follows="top|right" font="SansSerifSmall" halign="center"
height="20" label="Autosave now" label_selected="Autosave now" left="128"
mouse_opaque="true" name="Autosave now"
tool_tip="Save gzipped state to autosave directory." width="110" />
<button label="Actualizar" label_selected="Actualizar" name="Refresh" tool_tip="Pulsa aqui para actualizar la información superior"/>
<button label="Aplicar" label_selected="Aplicar" name="Apply" tool_tip="Pulsa aqui para aplicar los cambios superiores"/>
<button label="Seleccionar Región" label_selected="Seleccionar Región" name="Select Region" tool_tip="Seccionar toda la región con la herramienta de terreno"/>
<button label="Guardado Automático Ahora" label_selected="Guardado Automático Ahora" name="Autosave now" tool_tip="Guardar con gzip el estado actual en el directorio de guardado automático"/>
</panel>
<panel border="true" bottom="-363" follows="left|top|right|bottom" height="347"
label="Objects" left="1" mouse_opaque="false" name="objects" width="398">
<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="-20" drop_shadow_visible="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
mouse_opaque="true" name="Sim Name:" v_pad="0" width="50">
Sim Name:
<panel label="Objetos" name="objects">
<text name="Sim Name:">
Nombre del Sim:
</text>
<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="-20" drop_shadow_visible="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="10" left_delta="60"
mouse_opaque="true" name="region name" v_pad="0" width="320">
Welsh
<text name="region name">
Galés
</text>
<check_box bottom="-46" follows="left|top" font="SansSerifSmall" height="16"
initial_value="false" label="Disable Scripts" left="10" mouse_opaque="true"
name="disable scripts"
tool_tip="Set this to disable all scripts in this region" width="110" />
<check_box bottom="-46" follows="left|top" font="SansSerifSmall" height="16"
initial_value="false" label="Disable Collisions" left_delta="120"
mouse_opaque="true" name="disable collisions"
tool_tip="Set this to disable non-agent collisions in this region"
width="121" />
<check_box bottom="-46" follows="left|top" font="SansSerifSmall" height="16"
initial_value="false" label="Disable Physics" left_delta="120"
mouse_opaque="true" name="disable physics"
tool_tip="Set this to disable all physics in this region" width="130" />
<button bottom="-74" follows="top|right" font="SansSerifSmall" halign="center"
height="20" label="Apply" label_selected="Apply" left="278"
mouse_opaque="true" name="Apply"
tool_tip="Click here to apply any changes from above." width="110" />
<button bottom="-98" follows="top|right" font="SansSerifSmall" halign="center"
height="20" label="Set Target" label_selected="Set Target" left="8"
mouse_opaque="true" name="Set Target"
tool_tip="Set the target avatar for object deletion." width="110" />
<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="-88" drop_shadow_visible="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="10" left="130"
mouse_opaque="true" name="target_avatar_name" v_pad="0" width="260">
(no target)
<check_box label="Desactivar Scripts" name="disable scripts" tool_tip="Marca aquí para desactivar todos los scripts en esta región"/>
<check_box label="Desactivar Colisiones" name="disable collisions" tool_tip="Marca aquí para desactivar las colisiones entre no agentes para esta región"/>
<check_box label="Desactivar Física" name="disable physics" tool_tip="Marca aquí para desactivar toda la física de esta región"/>
<button label="Aplicar" label_selected="Aplicar" name="Apply" tool_tip="Pulsa aquí para aplicar los cambios superiores"/>
<button label="Definir Objetivo" label_selected="Definir Objetivo" name="Set Target" tool_tip="Define el avatar objetivo para la eliminación del objeto."/>
<text name="target_avatar_name">
(sin objetivo)
</text>
<button bottom="-146" follows="top|right" font="SansSerifSmall" halign="center"
height="20" label="Delete Target&apos;s Scripted Objects On Others Land"
label_selected="Delete Target&apos;s Scripted Objects On Others Land"
left="8" mouse_opaque="true"
name="Delete Target&apos;s Scripted Objects On Others Land"
tool_tip="Delete all scripted objects owned by the target on land not owned by the target. (no copy) objects will be returned."
width="380" />
<button bottom_delta="-48" follows="top|right" font="SansSerifSmall" halign="center"
height="20" label="Delete Target&apos;s Scripted Objects On *Any* Land"
label_selected="Delete Target&apos;s Scripted Objects On *Any* Land"
left="8" mouse_opaque="true"
name="Delete Target&apos;s Scripted Objects On *Any* Land"
tool_tip="Delete all scripted objects owned by the target in this region. (no copy) objects will be returned."
width="380" />
<button bottom_delta="-48" follows="top|right" font="SansSerifSmall" halign="center"
height="20" label="Delete *ALL* Of Target&apos;s Objects"
label_selected="Delete *ALL* Of Target&apos;s Objects" left="8"
mouse_opaque="true" name="Delete *ALL* Of Target&apos;s Objects"
tool_tip="Delete all objects owned by the target in this region. (no copy) objects will be returned."
width="380" />
<button bottom_delta="-48" follows="top|right" font="SansSerifSmall" halign="center"
height="20" label="Get Top Colliders" label_selected="Get Top Colliders"
left="8" mouse_opaque="true" name="Get Top Colliders"
tool_tip="Gets list of objects experiencing the most narrowphase callbacks."
width="110" />
<button bottom_delta="-24" follows="top|right" font="SansSerifSmall" halign="center"
height="20" label="Get Top Scripts" label_selected="Get Top Scripts"
left="8" mouse_opaque="true" name="Get Top Scripts"
tool_tip="Gets list of objects spending the most time running scripts."
width="110" />
<button bottom_delta="-24" follows="top|right" font="SansSerifSmall" halign="center"
height="20" label="Scripts digest" label_selected="Scripts digest" left="8"
mouse_opaque="true" name="Scripts digest"
tool_tip="Gets a list of all scripts and number of occurences of each."
width="110" />
<button label="Borrar objetos con scripts del Objetivo en otros terrenos" label_selected="Borrar objetos con scripts del Objetivo en otros terrenos" name="Delete Target&apos;s Scripted Objects On Others Land" tool_tip="Borrar todos los objetivos con scripts propiedad del Objetivo en terrenos que no son propiedad del Objetivo. Los Objetos (No Copiables) serán retornados"/>
<button label="Borrar los objetos con scripts del Objetivo en *Cualquier* terreno" label_selected="Borrar los objetos con scripts del Objetivo en *Cualquier* terreno" name="Delete Target&apos;s Scripted Objects On *Any* Land" tool_tip="Borra todos los objetos con scripts propiedad del Objetivo en esta región. Los objetos (no copiables) serán retornados"/>
<button label="Borrar *TODOS* los objetos del Objetivo" label_selected="Borrar *TODOS* los objetos del Objetivo" name="Delete *ALL* Of Target&apos;s Objects" tool_tip="Borra todos los objetos propiedad del Objetivo en esta región. Los objetos (no copiables) serán retornados"/>
<button label="Obtener Principales Colisionadores" label_selected="Obtener Principales Colisionadores" name="Get Top Colliders" tool_tip="Obtiene una lista de los objetos que experimentan llamadas de fase estrecha."/>
<button label="Obtener Principales Scripts" label_selected="Obtener Principales Scripts" name="Get Top Scripts" tool_tip="Obtiene una lista de los objetos que consumen mas tiempo ejecutando scripts"/>
<button label="Compilación de Scripts" label_selected="Compilación de Scripts" name="Scripts digest" tool_tip="Obtener un listado de todos los scripts y número de ocurrencias de cada uno."/>
</panel>
<panel border="true" bottom="-363" follows="left|top|right|bottom" height="347"
label="Request" left="1" mouse_opaque="true" name="request" width="398">
<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="-14" drop_shadow_visible="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
mouse_opaque="true" name="Destination:" v_pad="0" width="80">
Destination:
<panel label="Solicitar" name="request">
<text name="Destination:">
Destino:
</text>
<combo_box allow_text_entry="false" bottom="-20" follows="left|top" height="16" left="100"
max_chars="20" mouse_opaque="true" name="destination" width="290">
<combo_item name="Selection" value="Selection">
Selection
<combo_box name="destination">
<combo_item name="Selection">
Selección
</combo_item>
<combo_item name="AgentRegion" value="Agent Region">
Agent Region
<combo_item name="AgentRegion">
Agente de Region
</combo_item>
</combo_box>
<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="-38" drop_shadow_visible="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
mouse_opaque="true" name="Request:" v_pad="0" width="80">
Request:
<text name="Request:">
Requerimiento:
</text>
<combo_box allow_text_entry="true" bottom="-44" follows="left|top" height="16" left="100"
max_chars="20" mouse_opaque="true" name="request" width="290">
<combo_item name="colliders&lt;steps&gt;" value="colliders &lt;steps&gt;">
colliders &lt;steps&gt;
<combo_box name="request">
<combo_item name="colliders&lt;steps&gt;" >
Colisionadores &lt;pasos&gt;
</combo_item>
<combo_item name="scripts&lt;count&gt;,&lt;optionalpattern&gt;"
value="scripts &lt;count&gt;,&lt;optional pattern&gt;">
scripts &lt;count&gt;,&lt;optional pattern&gt;
<combo_item name="scripts&lt;count&gt;,&lt;optionalpattern&gt;">
scripts &lt;conteo&gt;,&lt;patrón opcional&gt;
</combo_item>
<combo_item name="objects&lt;pattern&gt;" value="objects &lt;pattern&gt;">
objects &lt;pattern&gt;
<combo_item name="objects&lt;pattern&gt;">
objetos &lt;patrón&gt;
</combo_item>
<combo_item name="rez&lt;asset_id&gt;" value="rez &lt;asset_id&gt;">
<combo_item name="rez&lt;asset_id&gt;">
rez &lt;asset_id&gt;
</combo_item>
</combo_box>
<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="-62" drop_shadow_visible="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
mouse_opaque="true" name="Parameter:" v_pad="0" width="80">
Parameter:
<text name="Parameter:">
Parámetro:
</text>
<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-68"
follows="left|top" font="SansSerifSmall" height="16" left="100"
max_length="63" mouse_opaque="true" name="parameter" width="290" />
<button bottom="-116" follows="left|top" font="SansSerif" halign="center" height="20"
label="Make Request" label_selected="Make Request" left="10"
mouse_opaque="true" name="Make Request" width="100" />
<button label="Hacer Solicitud" label_selected="Hacer Solicitud" name="Make Request"/>
</panel>
</tab_container>
</floater>

14
indra/newview/skins/default/xui/es/floater_group_titles.xml
View File

@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater name="goup titles" title="Títulos del Grupo (Tags)" >
<scroll_list name="titles_list">
<column name="title" label="Título" />
<column name="group_name" label="Grupo"/>
<!--Hidden field, used as storage for UUID, please keep at width 0-->
<column name="group_id" label="" width="0" />
</scroll_list>
<button name="activate" label="Activar" tool_tip="Activa el título de Grupo Seleccionado"/>
<scroll_list name="titles_list">
<column name="title" label="Título" />
<column name="group_name" label="Grupo"/>
<!--Hidden field, used as storage for UUID, please keep at width 0-->
<column name="group_id" label=""/>
</scroll_list>
<button name="activate" label="Activar" tool_tip="Activa el título de Grupo Seleccionado"/>
</floater>

47
indra/newview/skins/default/xui/es/floater_hardware_settings.xml
View File

@@ -1,47 +0,0 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater name="Hardware Settings Floater" title="Opciones del Dispositivo">
<text name="Filtering:">
Filtrado:
</text>
<check_box label="Filtrado Anisotrópico (más lento si se activa)" name="ani"/>
<text name="Antialiasing:">
Antialiasing:
</text>
<combo_box label="Antialiasing" name="fsaa">
<combo_item name="FSAADisabled" value="0">
Desactivado
</combo_item>
<combo_item name="2x" value="2">
2x
</combo_item>
<combo_item name="4x" value="4">
4x
</combo_item>
<combo_item name="8x" value="8">
8x
</combo_item>
<combo_item name="16x" value="16">
16x
</combo_item>
</combo_box>
<spinner label="Gama:" name="gamma"/>
<text name="(brightness, lower is brighter)">
(brillo; menor es más brillante, 0=predeterminado)
</text>
<text name="Enable VBO:">
Activar VBO:
</text>
<check_box label="Activar OpenGL Vertex Buffer Objects" name="vbo" tool_tip="En hardware moderno, habilitar esta opción mejora el rendimiento. Pero en hardware antiguo, el habilitarlo hace que, frecuentemente, se obtenga una implementación pobre de VBO, lo que puede provocarle caídas."/>
<check_box label="Activar Streamed VBOs" left="157" name="vbo_stream" tool_tip="Desactivar esta opción puede mejorar el rendimiento cuando se habilita VBO. Desactivarlo produce una mejora visible en diversas GPUs de AMD."/>
<text name="Enable FBO:">
Activar Framebuffer Objects:
</text>
<check_box label="Activar OpenGL Frame Buffer Objects" name="fbo" tool_tip="Habilitar esta opción en hardware moderno puede proporcionar una mejora en el rendimiento. Sin embargo, si se habilita en combinacoón con el antialiasing en GPUs de AMD pueden causar problemas de mezcla de texturas. Este ajuste es necesario para renderizado diferido.."/>
<slider label="Memoria para Texturas (MB):" name="GrapicsCardTextureMemory" tool_tip="Cantidad de memoria asignada a las texturas. Por defecto es la memoria de la tarjeta de vídeo. Reducir esta cantidad puede mejorar el rendimiento, pero también puede hacer que las texturas se vean borrosas."/>
<spinner label="Intensidad de la Niebla:" name="fog"/>
<text name="note">
Nota: Las configuraciones de Gama e Intensidad de la Niebla no están
disponibles cuando se activan las Sombras de la Atmósfera.
</text>
<button label="OK" label_selected="OK" name="OK"/>
</floater>

14
indra/newview/skins/default/xui/es/floater_hex.xml
View File

@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater name="floater_hex" title="Editor Hexadecimal" >
<text name="status_text" >
Cargando...
</text>
<slider label="Columnas" name="column_count"/>
<button name="upload_btn" label="[UPLOAD]"/>
<button name="save_btn" label="Guardar"/>
<hex_editor name="hex"/>
<text name="status_text" >
Cargando...
</text>
<slider label="Columnas" name="column_count"/>
<button name="upload_btn" label="[UPLOAD]"/>
<button name="save_btn" label="Guardar"/>
<hex_editor name="hex"/>
</floater>

2
indra/newview/skins/default/xui/es/floater_html_simple.xml
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater name="floater_html_simple" title="">
<web_browser name="browser"/>
<web_browser name="browser"/>
</floater>

6
indra/newview/skins/default/xui/es/floater_hud.xml
View File

@@ -1,9 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater name="floater_hud" title="Tutorial">
<!-- NOTE: Height and width must match values in settings.xml for
<!-- NOTE: Height and width must match values in settings.xml for
FloaterHUDRect because this floater is resized to those values
in LLViewerWindow initialization. JC -->
<web_browser name="floater_hud_browser"
start_url="data:text/html,%3Chtml%3E%3Chead%3E%3C/head%3E%3Cbody bgcolor=%22#000000%22 text=%22ffffff%22%3E%3Ch1%3E%3Ctt%3E%0D%0A%0D%0ALoading...%3C/tt%3E%3C/h1%3E%3C/body%3E%3C/html%3E"
/>
<web_browser name="floater_hud_browser" start_url="data:text/html,%3Chtml%3E%3Chead%3E%3C/head%3E%3Cbody bgcolor=%22#000000%22 text=%22ffffff%22%3E%3Ch1%3E%3Ctt%3E%0D%0A%0D%0ALoading...%3C/tt%3E%3C/h1%3E%3C/body%3E%3C/html%3E"/>
</floater>

4
indra/newview/skins/default/xui/es/floater_image_preview.xml
View File

@@ -3,13 +3,11 @@
<text name="name_label">
Nombre:
</text>
<line_editor name="name_form"/>
<text name="description_label">
Descripción:
</text>
<line_editor name="description_form"/>
<text name="preview_label">
Vista Previa como:
Vista Previa como:
</text>
<combo_box label="Ropa" name="clothing_type_combo">
<combo_item name="Image">

26
indra/newview/skins/default/xui/es/floater_instant_message_group.xml
View File

@@ -1,42 +1,42 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater label="(desconocido)" name="im_floater" title="(desconocido)">
<string name="ringing">
Joining Voice Chat...
Uniéndose al Chat de Voz...
</string>
<string name="connected">
Connected, click End Call to hang up
Conectado, pulsa Colgar para terminar
</string>
<string name="hang_up">
Left Voice Chat
Abandonando Chat de Voz
</string>
<string name="voice_icon">
icn_voice-groupfocus.tga
</string>
<string name="title_string">
Instant Message with [NAME]
Mensaje Instantáneo con [NAME]
</string>
<string name="typing_start_string">
[NAME] is typing...
[NAME] está escribiendo...
</string>
<string name="session_start_string">
Starting session with [NAME], please wait.
Iniciando sesión con [NAME], espera por favor.
</string>
<string name="default_text_label">
Click here to instant message.
Pulsa aquí para enviar un Mensaje Instantáneo.
</string>
<string name="moderated_chat_label">
(Moderated: Voices off by default)
(Moderado: Voz apagada por defecto)
</string>
<string name="muted_text_label">
Your text chat has been disabled by a Group Moderator.
Tu chat de texto ha sido deshabilitado por un Moderador del Grupo.
</string>
<layout_stack name="panels">
<layout_panel name="im_contents_panel">
<button label="Group Info" name="group_info_btn"/>
<button label="Join Call" name="start_call_btn"/>
<button label="End Call" name="end_call_btn"/>
<button label="Info del Grupo" name="group_info_btn"/>
<button label="Unirse" name="start_call_btn"/>
<button label="Finalizar" name="end_call_btn"/>
<button label="Historial" name="history_btn"/>
<button label="&lt; &lt;" label_selected="&gt; &gt;" name="toggle_active_speakers_btn" tool_tip="Click here to toggle a list of active participants in this IM session."/>
<button label="&lt; &lt;" label_selected="&gt; &gt;" name="toggle_active_speakers_btn" tool_tip="Pulsa aquí para mostrar/ocultar la lista de participantes activos en esta sesión de MI."/>
<button label="Enviar" name="send_btn"/>
</layout_panel>
</layout_stack>

292
indra/newview/skins/default/xui/es/floater_inventory.xml
View File

@@ -1,149 +1,149 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater name="Inventory" title="Inventario">
<search_editor label="Escribe aquí para buscar" name="inventory search editor"/>
<button label="" name="collapse_btn" tool_tip="Cerrar Todo" />
<button label="" name="Inventory.ExpandAll" tool_tip="Expandir Todo"/>
<text name="group_titles_textbox">
Filtro Rápido:
</text>
<!-- Inventory Type Filter Labels -->
<string name="filter_type_all">
Todos los Tipos
</string>
<string name="filter_type_animation">
Animaciones
</string>
<string name="filter_type_callingcard">
Tarjetas de Llamada
</string>
<string name="filter_type_wearable">
Ropas / Partes de Cuerpo
</string>
<string name="filter_type_gesture">
Gestos
</string>
<string name="filter_type_landmark">
Hitos
</string>
<string name="filter_type_notecard">
Notas
</string>
<string name="filter_type_object">
Objetos
</string>
<string name="filter_type_script">
Scripts
</string>
<string name="filter_type_sound">
Sonidos
</string>
<string name="filter_type_texture">
Texturas
</string>
<string name="filter_type_snapshot">
Fotos
</string>
<string name="filter_type_custom">
Personalizado...
</string>
<combo_box name="Quick Filter" label="Filtro Rápido">
<combo_item name="filter_type_all">
Todos los Tipos
</combo_item>
<separator />
<combo_item name="filter_type_animation">
Animaciones
</combo_item>
<combo_item name="filter_type_callingcard">
Tarjetas de Llamada
</combo_item>
<combo_item name="filter_type_wearable">
Ropas / Partes de Cuerpo
</combo_item>
<combo_item name="filter_type_gesture">
Gestos
</combo_item>
<combo_item name="filter_type_landmark">
Hitos
</combo_item>
<combo_item name="filter_type_notecard">
Notas
</combo_item>
<combo_item name="filter_type_object">
Objetos
</combo_item>
<combo_item name="filter_type_script">
Scripts
</combo_item>
<combo_item name="filter_type_sound">
Sonidos
</combo_item>
<combo_item name="filter_type_texture">
Texturas
</combo_item>
<combo_item name="filter_type_snapshot">
Fotos
</combo_item>
<separator />
<combo_item name="filter_type_custom">
Personalizado...
</combo_item>
</combo_box>
<tab_container name="inventory filter tabs" >
<inventory_panel label="Todos los Items" name="All Items"/>
<inventory_panel label="Items Recientes" name="Recent Items"/>
<inventory_panel label="Items Vestidos" name="Worn Items"/>
</tab_container>
<menu_bar name="Inventory Menu">
<menu label="Archivo" name="File">
<menu_item_call label="Abrir" name="Open"></menu_item_call>
<menu_item_separator name="separator"/>
<menu_item_call label="Nueva Ventana" name="New Window"></menu_item_call>
<menu_item_separator name="separator2"/>
<menu_item_call label="Mostrar Filtros" name="Show Filters"></menu_item_call>
<menu_item_call label="Restablecer Filtros" name="Reset Current"></menu_item_call>
<menu_item_call label="Cerrar todas las Carpetas" name="Close All Folders"></menu_item_call>
<menu_item_separator name="separator3"/>
<menu_item_call label="Vaciar la Papelera" name="Empty Trash"></menu_item_call>
<menu_item_call label="Actualizar Inventario" name="Refresh Inventory"></menu_item_call>
</menu>
<menu label="Crear" name="Create">
<menu_item_call label="Nueva Carpeta" name="New Folder"></menu_item_call>
<menu_item_call label="Nuevo Script" name="New Script"></menu_item_call>
<menu_item_call label="Nueva Nota" name="New Note"></menu_item_call>
<menu_item_call label="Nuevo Gesto" name="New Gesture"></menu_item_call>
<menu label="Ropas Nuevas" name="New Clothes">
<menu_item_call label="Nueva Camisa" name="New Shirt"></menu_item_call>
<menu_item_call label="Nuevos Pantalones" name="New Pants"></menu_item_call>
<menu_item_call label="Nuevos Zapatos" name="New Shoes"></menu_item_call>
<menu_item_call label="Nuevas Medias" name="New Socks"></menu_item_call>
<menu_item_call label="Nueva Chaqueta" name="New Jacket"></menu_item_call>
<menu_item_call label="Nueva Falda" name="New Skirt"></menu_item_call>
<menu_item_call label="Nuevos Guantes" name="New Gloves"></menu_item_call>
<menu_item_call label="Nueva Camiseta" name="New Undershirt"></menu_item_call>
<menu_item_call label="Nueva Ropa Interior" name="New Underpants"></menu_item_call>
<menu_item_call label="Nuevo Tatuaje" name="New Tattoo"></menu_item_call>
<menu_item_call label="Nueva Capa Alfa" name="New Alpha"></menu_item_call>
<menu_item_call label="Nueva Física" name="New Physics"></menu_item_call>
</menu>
<menu label="Partes de Cuerpo Nuevas" name="New Body Parts">
<menu_item_call label="Nueva Forma" name="New Shape"></menu_item_call>
<menu_item_call label="Nueva Piel" name="New Skin"></menu_item_call>
<menu_item_call label="Nuevo Pelo" name="New Hair"></menu_item_call>
<menu_item_call label="Nuevos Ojos" name="New Eyes"></menu_item_call>
</menu>
</menu>
<menu label="Ordenar" name="Sort">
<menu_item_check label="Por Nombre" name="By Name"></menu_item_check>
<menu_item_check label="Por Fecha" name="By Date"></menu_item_check>
<menu_item_separator name="separator"/>
<menu_item_check label="Carpetas, siempre por Nombre" name="Folders Always By Name"></menu_item_check>
<menu_item_check label="Carpeta de Sistema al Principio" name="System Folders To Top"></menu_item_check>
</menu>
<menu label="Buscar" name="Search">
<menu_item_check label="Nombre del Item" name="Item name"></menu_item_check>
<menu_item_check label="Descripción del Item" name="Item description"></menu_item_check>
<menu_item_check label="Creador del Item" name="Item creatorr"></menu_item_check>
</menu>
</menu_bar>
<search_editor label="Escribe aquí para buscar" name="inventory search editor"/>
<button label="" name="collapse_btn" tool_tip="Cerrar Todo" />
<button label="" name="Inventory.ExpandAll" tool_tip="Expandir Todo"/>
<text name="group_titles_textbox">
Filtro Rápido:
</text>
<!-- Inventory Type Filter Labels -->
<string name="filter_type_all">
Todos los Tipos
</string>
<string name="filter_type_animation">
Animaciones
</string>
<string name="filter_type_callingcard">
Tarjetas de Llamada
</string>
<string name="filter_type_wearable">
Ropas / Partes de Cuerpo
</string>
<string name="filter_type_gesture">
Gestos
</string>
<string name="filter_type_landmark">
Hitos
</string>
<string name="filter_type_notecard">
Notas
</string>
<string name="filter_type_object">
Objetos
</string>
<string name="filter_type_script">
Scripts
</string>
<string name="filter_type_sound">
Sonidos
</string>
<string name="filter_type_texture">
Texturas
</string>
<string name="filter_type_snapshot">
Fotos
</string>
<string name="filter_type_custom">
Personalizado...
</string>
<combo_box name="Quick Filter" label="Filtro Rápido">
<combo_item name="filter_type_all">
Todos los Tipos
</combo_item>
<separator />
<combo_item name="filter_type_animation">
Animaciones
</combo_item>
<combo_item name="filter_type_callingcard">
Tarjetas de Llamada
</combo_item>
<combo_item name="filter_type_wearable">
Ropas / Partes de Cuerpo
</combo_item>
<combo_item name="filter_type_gesture">
Gestos
</combo_item>
<combo_item name="filter_type_landmark">
Hitos
</combo_item>
<combo_item name="filter_type_notecard">
Notas
</combo_item>
<combo_item name="filter_type_object">
Objetos
</combo_item>
<combo_item name="filter_type_script">
Scripts
</combo_item>
<combo_item name="filter_type_sound">
Sonidos
</combo_item>
<combo_item name="filter_type_texture">
Texturas
</combo_item>
<combo_item name="filter_type_snapshot">
Fotos
</combo_item>
<separator />
<combo_item name="filter_type_custom">
Personalizado...
</combo_item>
</combo_box>
<tab_container name="inventory filter tabs" >
<inventory_panel label="Todos los Items" name="All Items"/>
<inventory_panel label="Items Recientes" name="Recent Items"/>
<inventory_panel label="Items Vestidos" name="Worn Items"/>
</tab_container>
<menu_bar name="Inventory Menu">
<menu label="Archivo" name="File">
<menu_item_call label="Abrir" name="Open"></menu_item_call>
<menu_item_separator name="separator"/>
<menu_item_call label="Nueva Ventana" name="New Window"></menu_item_call>
<menu_item_separator name="separator2"/>
<menu_item_call label="Mostrar Filtros" name="Show Filters"></menu_item_call>
<menu_item_call label="Restablecer Filtros" name="Reset Current"></menu_item_call>
<menu_item_call label="Cerrar todas las Carpetas" name="Close All Folders"></menu_item_call>
<menu_item_separator name="separator3"/>
<menu_item_call label="Vaciar la Papelera" name="Empty Trash"></menu_item_call>
<menu_item_call label="Actualizar Inventario" name="Refresh Inventory"></menu_item_call>
</menu>
<menu label="Crear" name="Create">
<menu_item_call label="Nueva Carpeta" name="New Folder"></menu_item_call>
<menu_item_call label="Nuevo Script" name="New Script"></menu_item_call>
<menu_item_call label="Nueva Nota" name="New Note"></menu_item_call>
<menu_item_call label="Nuevo Gesto" name="New Gesture"></menu_item_call>
<menu label="Ropas Nuevas" name="New Clothes">
<menu_item_call label="Nueva Camisa" name="New Shirt"></menu_item_call>
<menu_item_call label="Nuevos Pantalones" name="New Pants"></menu_item_call>
<menu_item_call label="Nuevos Zapatos" name="New Shoes"></menu_item_call>
<menu_item_call label="Nuevas Medias" name="New Socks"></menu_item_call>
<menu_item_call label="Nueva Chaqueta" name="New Jacket"></menu_item_call>
<menu_item_call label="Nueva Falda" name="New Skirt"></menu_item_call>
<menu_item_call label="Nuevos Guantes" name="New Gloves"></menu_item_call>
<menu_item_call label="Nueva Camiseta" name="New Undershirt"></menu_item_call>
<menu_item_call label="Nueva Ropa Interior" name="New Underpants"></menu_item_call>
<menu_item_call label="Nuevo Tatuaje" name="New Tattoo"></menu_item_call>
<menu_item_call label="Nueva Capa Alfa" name="New Alpha"></menu_item_call>
<menu_item_call label="Nueva Física" name="New Physics"></menu_item_call>
</menu>
<menu label="Partes de Cuerpo Nuevas" name="New Body Parts">
<menu_item_call label="Nueva Forma" name="New Shape"></menu_item_call>
<menu_item_call label="Nueva Piel" name="New Skin"></menu_item_call>
<menu_item_call label="Nuevo Pelo" name="New Hair"></menu_item_call>
<menu_item_call label="Nuevos Ojos" name="New Eyes"></menu_item_call>
</menu>
</menu>
<menu label="Ordenar" name="Sort">
<menu_item_check label="Por Nombre" name="By Name"></menu_item_check>
<menu_item_check label="Por Fecha" name="By Date"></menu_item_check>
<menu_item_separator name="separator"/>
<menu_item_check label="Carpetas, siempre por Nombre" name="Folders Always By Name"></menu_item_check>
<menu_item_check label="Carpeta de Sistema al Principio" name="System Folders To Top"></menu_item_check>
</menu>
<menu label="Buscar" name="Search">
<menu_item_check label="Nombre del Item" name="Item name"></menu_item_check>
<menu_item_check label="Descripción del Item" name="Item description"></menu_item_check>
<menu_item_check label="Creador del Item" name="Item creatorr"></menu_item_check>
</menu>
</menu_bar>
</floater>

12
indra/newview/skins/default/xui/es/floater_inventory_backup.xml
View File

@@ -1,10 +1,8 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater name="floater_inventory_backup" title="Respaldar Inventario">
<scroll_list name="item_list">
<column name="type" width="20" />
<column label="Nombre" name="name" />
<column label="Estado" name="status"/>
</scroll_list>
<line_editor name="progress_background" />
<line_editor name="progress_foreground"/>
<scroll_list name="item_list">
<column name="type" width="20" />
<column label="Nombre" name="name" />
<column label="Estado" name="status"/>
</scroll_list>
</floater>

24
indra/newview/skins/default/xui/es/floater_inventory_backup_settings.xml
View File

@@ -1,15 +1,15 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater name="inventory_backup_settings" title="Opciones de Descarga">
<check_box name="chk_textures" label="Texturas" />
<check_box name="chk_sounds" label="Sonidos" />
<check_box name="chk_callingcards" label="Tarjetas de LLamada" />
<check_box name="chk_landmarks" label="Hitos" />
<check_box name="chk_scripts" label="Scripts" />
<check_box name="chk_wearables" label="Wearables" />
<check_box name="chk_objects" label="Objetos" />
<check_box name="chk_notecards" label="Notas" />
<check_box name="chk_animations" label="Animaciones" />
<check_box bottom_delta="-20" follows="left|top" left="10" ="chk_gestures" label="Gestos" />
<!--<check_box bottom_delta="-20" follows="left|top" left="10" name="chk_others" label="Others" />-->
<button label="Siguiente >>" name="next_btn" />
<check_box name="chk_textures" label="Texturas" />
<check_box name="chk_sounds" label="Sonidos" />
<check_box name="chk_callingcards" label="Tarjetas de LLamada" />
<check_box name="chk_landmarks" label="Hitos" />
<check_box name="chk_scripts" label="Scripts" />
<check_box name="chk_wearables" label="Wearables" />
<check_box name="chk_objects" label="Objetos" />
<check_box name="chk_notecards" label="Notas" />
<check_box name="chk_animations" label="Animaciones" />
<check_box name="chk_gestures" label="Gestos" />
<!--<check_box bottom_delta="-20" follows="left|top" left="10" name="chk_others" label="Others" />-->
<button label="Siguiente >>" name="next_btn" />
</floater>

15
indra/newview/skins/default/xui/es/floater_inventory_item_properties.xml
View File

@@ -47,8 +47,17 @@
<text name="NextMaskDebug">
N:
</text>
<check_box label="Compartir con el Grupo" name="CheckShareWithGroup"/>
<check_box label="Permitir a cualquiera que lo copie" name="CheckEveryoneCopy"/>
<text name="GroupLabel">
Los miembros del grupo pueden:
</text>
<check_box label="Modificarlo" name="CheckGroupMod"/>
<check_box label="Copiarlo" name="CheckGroupCopy"/>
<check_box label="Moverlo" name="CheckGroupMove"/>
<text name="EveryoneLabel">
Cualquiera puede:
</text>
<check_box label="Copiarlo" name="CheckEveryoneCopy"/>
<check_box label="Moverlo" name="CheckEveryoneMove"/>
<text name="NextOwnerLabel" width="250">
El próximo propietario puede:
</text>
@@ -56,7 +65,7 @@
<check_box label="Copiarlo" name="CheckNextOwnerCopy"/>
<check_box label="Venderlo/Darlo" name="CheckNextOwnerTransfer"/>
<text name="SaleLabel" width="150">
Marcar Item como:
Marcar Ítem como:
</text>
<check_box label="En Venta" name="CheckPurchase"/>
<radio_group name="RadioSaleType">

95
indra/newview/skins/default/xui/es/floater_local_asset_browse.xml
View File

@@ -2,52 +2,51 @@
<!-- Local Asset Browser: xui -->
<!-- floater definition start -->
<floater name="local_bitmap_browser_floater" title="Navegador Local de Bitmap" >
<!-- floater definition end, left side begin -->
<button name="add_btn" label="Agregar"/>
<button name="del_btn" label="Quitar"/>
<button name="upload_btn" label="Subir"/>
<button name="more_btn" label="Mas"/>
<button name="less_btn" label="Menos"/>
<scroll_list name="bitmap_list" >
<column name="bitmap_name" label="Nombre"/>
<column name="bitmap_uuid" label="UUID"/>
</scroll_list>
<!-- left side done, right side begin -->
<line_editor name="path_text"/>
<text name="path_caption_text">
Ruta Local:
</text>
<line_editor name="uuid_text" />
<text name="uuid_caption_text">
Local UdddUID:
</text>
<texture_picker label="Textura" name="texture_view"/>
<check_box label="Mantener Actualizado" name="keep_updating_checkbox" tool_tip="Activar o desactivar el control periódico de las fuentes de bitmaps en tu disco duro para ver si han sido actualizadas"/>
<combo_box name="type_combobox">
<combo_item name="type_texture" value="type_texture">
Textura
</combo_item>
<combo_item name="type_sculptie" value="type_sculptie">
Sculptmap
</combo_item>
<combo_item name="type_layer" value="type_layer">
Ropas
</combo_item>
</combo_box>
<text name="time_caption_text">
Hora:
</text>
<text name="time_text">
(aqui la fecha)
</text>
<text name="link_caption_text">
Enlace:
</text>
<text name="link_text">
(Estado del Link)
</text>
<text name="name_caption_text">
Nombre:
</text>
<line_editor name="name_text"/>
<!-- floater definition end, left side begin -->
<button name="add_btn" label="Agregar"/>
<button name="del_btn" label="Quitar"/>
<button name="upload_btn" label="Subir"/>
<button name="more_btn" label="Mas"/>
<button name="less_btn" label="Menos"/>
<scroll_list name="bitmap_list" >
<column name="bitmap_name" label="Nombre"/>
<column name="bitmap_uuid" label="UUID"/>
</scroll_list>
<!-- left side done, right side begin -->
<line_editor name="path_text"/>
<text name="path_caption_text">
Ruta Local:
</text>
<line_editor name="uuid_text" />
<text name="uuid_caption_text">
Local UdddUID:
</text>
<texture_picker label="Textura" name="texture_view"/>
<check_box label="Mantener Actualizado" name="keep_updating_checkbox" tool_tip="Activar o desactivar el control periódico de las fuentes de bitmaps en tu disco duro para ver si han sido actualizadas"/>
<combo_box name="type_combobox">
<combo_item name="type_texture" value="type_texture">
Textura
</combo_item>
<combo_item name="type_sculptie" value="type_sculptie">
Sculptmap
</combo_item>
<combo_item name="type_layer" value="type_layer">
Ropas
</combo_item>
</combo_box>
<text name="time_caption_text">
Hora:
</text>
<text name="time_text">
(aqui la fecha)
</text>
<text name="link_caption_text">
Enlace:
</text>
<text name="link_text">
(Estado del Link)
</text>
<text name="name_caption_text">
Nombre:
</text>
</floater>

48
indra/newview/skins/default/xui/es/floater_media_filter.xml
View File

@@ -1,27 +1,27 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater name="floatermediafilter" title="Filtro de Medios">
<text name="info1" >
Los dominios en Negrita están en la lista permanente (ej.: en lista blanca o lista negra).
</text>
<text name="info2" >
Los dominios en itálica están en la lista de sesión (ej: permitidos o denegados temporariamente).
</text>
<scroll_list name="whitelist_list" >
<column name="whitelist_col" label="Dominios Permitidos u objetos del servidor" />
</scroll_list>
<scroll_list name="blacklist_list" >
<column name="blacklist_col" label="Dominios bloqueados u objetos del servidor" />
</scroll_list>
<button name="add_whitelist" label="Añadir..." tool_tip="Añadir un servidor a la Lista Blanca"/>
<button name="remove_whitelist" label="Quitar" tool_tip="Quitar el servidor seleccionado de la Lista Blanca"/>
<button name="clear_lists" label="Limpiar Listas" tool_tip="Limpiar todas las Listas" />
<button name="show_ips" label="Mostrar IPs" tool_tip="Mostrar las direcciones IP asociadas a cada nombre de dominio (Hace que el visor entre en paus mientras actualiza la lista debido a la búsqueda de DNSs)"/>
<button name="add_blacklist" label="Añadir..." tool_tip="Añadir un server a la Lista Negra"/>
<button name="remove_blacklist" label="Quitar" tool_tip="Quitar el servidor seleccionado de la Lista Negra"/>
<text name="add_text">
Nuevo dominio:
</text>
<check_box name="match_ip" label="Añadir/Quitar IP coincidente" tool_tip="Añadir o Quitar cualquier IP asociada con un nombre de dominio agregado o quitado"/>
<line_editor name="input_domain" tool_tip="Ingresa la nueva URL, nombre de dominio, IP o ruta HTTP del servidor del objeto con script"/>
<button name="commit_domain" label="Añadir" tool_tip="Añadir a la Lista"/>
<text name="info1" >
Los dominios en Negrita están en la lista permanente (ej.: en lista blanca o lista negra).
</text>
<text name="info2" >
Los dominios en itálica están en la lista de sesión (ej: permitidos o denegados temporariamente).
</text>
<scroll_list name="whitelist_list" >
<column name="whitelist_col" label="Dominios Permitidos u objetos del servidor" />
</scroll_list>
<scroll_list name="blacklist_list" >
<column name="blacklist_col" label="Dominios bloqueados u objetos del servidor" />
</scroll_list>
<button name="add_whitelist" label="Añadir..." tool_tip="Añadir un servidor a la Lista Blanca"/>
<button name="remove_whitelist" label="Quitar" tool_tip="Quitar el servidor seleccionado de la Lista Blanca"/>
<button name="clear_lists" label="Limpiar Listas" tool_tip="Limpiar todas las Listas" />
<button name="show_ips" label="Mostrar IPs" tool_tip="Mostrar las direcciones IP asociadas a cada nombre de dominio (Hace que el visor entre en paus mientras actualiza la lista debido a la búsqueda de DNSs)"/>
<button name="add_blacklist" label="Añadir..." tool_tip="Añadir un server a la Lista Negra"/>
<button name="remove_blacklist" label="Quitar" tool_tip="Quitar el servidor seleccionado de la Lista Negra"/>
<text name="add_text">
Nuevo dominio:
</text>
<check_box name="match_ip" label="Añadir/Quitar IP coincidente" tool_tip="Añadir o Quitar cualquier IP asociada con un nombre de dominio agregado o quitado"/>
<line_editor name="input_domain" tool_tip="Ingresa la nueva URL, nombre de dominio, IP o ruta HTTP del servidor del objeto con script"/>
<button name="commit_domain" label="Añadir" tool_tip="Añadir a la Lista"/>
</floater>

20
indra/newview/skins/default/xui/es/floater_message_builder.xml
View File

@@ -1,14 +1,12 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater name="Message Builder" title="Constructor de Mensajes" >
<scroll_list name="net_list">
<column name="text" label="texto" />
<column name="state" label="Estado" />
</scroll_list>
<combo_box name="untrusted_message_combo" tool_tip="No Seguro">
</combo_box>
<combo_box name="trusted_message_combo" tool_tip="Seguro">
</combo_box>
<text_editor name="message_edit" >
</text_editor>
<button name="send_btn" label="Enviar" tool_tip="Enviar (Ctrl+Intro)"/>
<scroll_list name="net_list">
<column name="text" label="texto" />
<column name="state" label="Estado" />
</scroll_list>
<combo_box name="untrusted_message_combo" tool_tip="No Seguro">
</combo_box>
<combo_box name="trusted_message_combo" tool_tip="Seguro">
</combo_box>
<button name="send_btn" label="Enviar" tool_tip="Enviar (Ctrl+Intro)"/>
</floater>

46
indra/newview/skins/default/xui/es/floater_message_log.xml
View File

@@ -1,28 +1,24 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater name="Message Log" title="Registro de Mensajes" >
<scroll_list name="net_list">
<column name="text" label="texto" />
<column name="icon0" label="icon0"/>
<column name="icon1" label="icon1"/>
</scroll_list>
<button name="filter_choice_btn" label="…"/>
<line_editor name="filter_edit" />
<button name="filter_apply_btn" label="✔"/>
<button name="clear_log_btn" label="C"/>
<scroll_list name="message_log">
<column name="sequence" label="secuencia"/>
<column name="type" label="tipo"/>
<column name="direction" label="dirección"/>
<column name="net" label="red"/>
<column name="name" label="nombre"/>
<!--<column name="flag_zer" label="zer" width="8"/>
<column name="flag_rel" label="rel" width="8"/>
<column name="flag_rsd" label="rsd" width="8"/>
<column name="flag_ack" label="ack" width="8"/>-->
<column name="summary" label="sumario"/>
</scroll_list>
<text name="log_status_text">
</text>
<text_editor name="net_info" >
</text_editor>
<scroll_list name="net_list">
<column name="text" label="texto" />
<column name="icon0" label="icon0"/>
<column name="icon1" label="icon1"/>
</scroll_list>
<button name="filter_choice_btn" label="…"/>
<line_editor name="filter_edit" />
<button name="filter_apply_btn" label="✔"/>
<button name="clear_log_btn" label="C"/>
<scroll_list name="message_log">
<column name="sequence" label="secuencia"/>
<column name="type" label="tipo"/>
<column name="direction" label="dirección"/>
<column name="net" label="red"/>
<column name="name" label="nombre"/>
<!--<column name="flag_zer" label="zer" width="8"/>
<column name="flag_rel" label="rel" width="8"/>
<column name="flag_rsd" label="rsd" width="8"/>
<column name="flag_ack" label="ack" width="8"/>-->
<column name="summary" label="sumario"/>
</scroll_list>
</floater>

8
indra/newview/skins/default/xui/es/floater_mute.xml
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater name="mute floater" short_title="Lista de Ignorados" title="Residentes y Objetos Ignorados">
<scroll_list name="mutes" tool_tip="Lista de residentes ignorados actualmente" />
<button label="Residente Ignorado..." label_selected="Residente Ignorado..." name="Mute resident..." tool_tip="Selecciona un residente para ignorar" />
<button label="Ignorar objeto por su nombre..." label_selected="Ignorar objeto por su nombre..." name="Mute object by name..."/>
<button label="No Ignorar" label_selected="No Ignorar" name="Unmute" tool_tip="Quitar un residente u objeto de la lista de ignorados" />
<scroll_list name="mutes" tool_tip="Lista de residentes ignorados actualmente" />
<button label="Residente Ignorado..." label_selected="Residente Ignorado..." name="Mute resident..." tool_tip="Selecciona un residente para ignorar" />
<button label="Ignorar objeto por su nombre..." label_selected="Ignorar objeto por su nombre..." name="Mute object by name..."/>
<button label="No Ignorar" label_selected="No Ignorar" name="Unmute" tool_tip="Quitar un residente u objeto de la lista de ignorados" />
</floater>

181
indra/newview/skins/default/xui/es/floater_new_local_inventory.xml
View File

@@ -1,96 +1,91 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater name="item properties" title="Propiedades de los Items del Inventario">
<text name="LabelItemNameTitle">
Nombre:
</text>
<line_editor name="name_line"/>
<text name="LabelItemDescTitle">
Descripción:
</text>
<line_editor name="desc_line"/>
<text name="LabelAssetTitle">
Asset:
</text>
<line_editor name="asset_id_line"/>
<text name="LabelCreatorTitle">
Creador:
</text>
<line_editor name="creator_id_line"/>
<text name="LabelOwnerTitle">
Propietario:
</text>
<line_editor name="owner_id_line"/>
<combo_box name="type_combo">
<combo_item name="texture" value="texture">
textura
</combo_item>
<combo_item name="sound" value="sound">
sonido
</combo_item>
<combo_item name="callcard" value="callcard">
tarjeta de llamada
</combo_item>
<combo_item name="landmark" value="landmark">
hito
</combo_item>
<combo_item name="script" value="script">
script
</combo_item>
<combo_item name="clothing" value="clothing">
Ropa
</combo_item>
<combo_item name="object" value="object">
objeto
</combo_item>
<combo_item name="notecard" value="notecard">
nota
</combo_item>
<combo_item name="category" value="category">
categoría
</combo_item>
<combo_item name="root" value="root">
raíz
</combo_item>
<combo_item name="lsltext" value="lsltext">
lsltext
</combo_item>
<combo_item name="lslbyte" value="lslbyte">
lslbyte
</combo_item>
<combo_item name="txtr_tga" value="txtr_tga">
txtr_tga
</combo_item>
<combo_item name="bodypart" value="bodypart">
parte de cuerpo
</combo_item>
<combo_item name="trash" value="trash">
papelera
</combo_item>
<combo_item name="snapshot" value="snapshot">
foto
</combo_item>
<combo_item name="lstndfnd" value="lstndfnd">
lstndfnd
</combo_item>
<combo_item name="snd_wav" value="snd_wav">
snd_wav
</combo_item>
<combo_item name="img_tga" value="img_tga">
img_tga
</combo_item>
<combo_item name="jpeg" value="jpeg">
jpeg
</combo_item>
<combo_item name="animatn" value="animatn">
animación
</combo_item>
<combo_item name="gesture" value="gesture">
gesto
</combo_item>
<combo_item name="simstate" value="simstate">
simstate
</combo_item>
</combo_box>
<check_box label="Abrir inmediatamente" name="chk_open"/>
<button label="OK" name="ok_btn"/>
<text name="LabelItemNameTitle">
Nombre:
</text>
<text name="LabelItemDescTitle">
Descripción:
</text>
<text name="LabelAssetTitle">
Asset:
</text>
<text name="LabelCreatorTitle">
Creador:
</text>
<text name="LabelOwnerTitle">
Propietario:
</text>
<combo_box name="type_combo">
<combo_item name="texture">
Textura
</combo_item>
<combo_item name="sound">
Sonido
</combo_item>
<combo_item name="callcard">
Tarjeta de llamada
</combo_item>
<combo_item name="landmark">
Hito
</combo_item>
<combo_item name="script">
Script
</combo_item>
<combo_item name="clothing">
Ropa
</combo_item>
<combo_item name="object">
Objeto
</combo_item>
<combo_item name="notecard">
Nota
</combo_item>
<combo_item name="category">
Categoría
</combo_item>
<combo_item name="root">
Raíz
</combo_item>
<combo_item name="lsltext">
lsltext
</combo_item>
<combo_item name="lslbyte">
lslbyte
</combo_item>
<combo_item name="txtr_tga">
txtr_tga
</combo_item>
<combo_item name="bodypart">
Parte de cuerpo
</combo_item>
<combo_item name="trash">
Papelera
</combo_item>
<combo_item name="snapshot">
Foto
</combo_item>
<combo_item name="lstndfnd">
lstndfnd
</combo_item>
<combo_item name="snd_wav">
Sonido_wav
</combo_item>
<combo_item name="img_tga">
Imagen tga
</combo_item>
<combo_item name="jpeg">
jpeg
</combo_item>
<combo_item name="animatn">
Animación
</combo_item>
<combo_item name="gesture">
Gesto
</combo_item>
<combo_item name="simstate">
simstate
</combo_item>
</combo_box>
<check_box label="Abrir inmediatamente" name="chk_open"/>
<button label="OK" name="ok_btn"/>
</floater>

6
indra/newview/skins/default/xui/es/floater_object_backup.xml
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater name="Import" title="Progreso de la Importación">
<text name="name_label">
Progreso
</text>
<text name="name_label">
Progreso
</text>
</floater>

4
indra/newview/skins/default/xui/es/floater_post_process.xml
View File

@@ -50,10 +50,10 @@
<slider label="" name="noise_strength"/>
</panel>
<panel label="Extras" name="Extras">
<combo_box name="PPEffectsCombo"/>
<line_editor label="Nombre del Efecto" name="PPEffectNameEditor"/>
<button label="Cargar Efecto" label_selected="Cargar Efecto" name="PPLoadEffect"/>
<button label="Guardar Efecto" label_selected="Guardar Efecto" name="PPSaveEffect"/>
<combo_box name="PPEffectsCombo"/>
<line_editor label="Nombre del Efecto" name="PPEffectNameEditor"/>
</panel>
</tab_container>
</floater>

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