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

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

Browse Source 
Conflicts:
	indra/newview/llvoavatar.cpp
This commit is contained in:
Shyotl
2012-02-01 03:10:46 -06:00
parent 8ae25e4812 b755bcd495
commit b0ccec2b62
38 changed files with 1102 additions and 1599 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
indra/llcommon/llfasttimer_class.cpp
View File

@@ -130,8 +130,16 @@ public:
mActiveTimerRoot->setCollapsed(false);
mRootFrameState = new LLFastTimer::FrameState(mActiveTimerRoot);
mRootFrameState->mParent = &mTimerRoot->getFrameState();
mActiveTimerRoot->setParent(mTimerRoot);
// getFrameState and setParent recursively call this function,
// so we have to work around that by using a specialized implementation
// for the special case were mTimerRoot != mActiveTimerRoot -- Aleric
mRootFrameState->mParent = &LLFastTimer::getFrameStateList()[0]; // &mTimerRoot->getFrameState()
// And the following four lines are mActiveTimerRoot->setParent(mTimerRoot);
llassert(!mActiveTimerRoot->mParent);
mActiveTimerRoot->mParent = mTimerRoot; // mParent = parent;
mRootFrameState->mParent = mRootFrameState->mParent; // getFrameState().mParent = &parent->getFrameState();
mTimerRoot->getChildren().push_back(mActiveTimerRoot); // parent->getChildren().push_back(this);
mTimerRoot->mNeedsSorting = true; // parent->mNeedsSorting = true;
mAppTimer = new LLFastTimer(mRootFrameState);
}

51
indra/llcommon/llsingleton.h
View File

@@ -151,9 +151,10 @@ public:
*/
static void deleteSingleton()
{
delete getData().mSingletonInstance;
getData().mSingletonInstance = NULL;
DERIVED_TYPE* instance = getData().mSingletonInstance;
getData().mInitState = DELETED;
getData().mSingletonInstance = NULL;
delete instance;
}
static SingletonInstanceData& getData()
@@ -175,25 +176,11 @@ public:
{
SingletonInstanceData& data = getData();
if (data.mInitState == CONSTRUCTING)
if (data.mInitState != INITIALIZED)
{
llerrs << "Tried to access singleton " << typeid(DERIVED_TYPE).name() << " from singleton constructor!" << llendl;
createInstance(data);
}
if (data.mInitState == DELETED)
{
llwarns << "Trying to access deleted singleton " << typeid(DERIVED_TYPE).name() << " creating new instance" << llendl;
}
if (!data.mSingletonInstance)
{
data.mInitState = CONSTRUCTING;
data.mSingletonInstance = new DERIVED_TYPE();
data.mInitState = INITIALIZING;
data.mSingletonInstance->initSingleton();
data.mInitState = INITIALIZED;
}
return data.mSingletonInstance;
}
@@ -219,7 +206,35 @@ public:
}
private:
static void createInstance(SingletonInstanceData& data);
virtual void initSingleton() {}
};
// Moved this here cause it's too big to be inlined --Aleric.
template<typename DERIVED_TYPE>
void LLSingleton<DERIVED_TYPE>::createInstance(SingletonInstanceData& data)
{
if (data.mInitState == CONSTRUCTING)
{
llerrs << "Tried to access singleton " << typeid(DERIVED_TYPE).name() << " from singleton constructor!" << llendl;
}
if (data.mInitState == DELETED)
{
llwarns << "Trying to access deleted singleton " << typeid(DERIVED_TYPE).name() << " creating new instance" << llendl;
}
if (data.mInitState == INITIALIZING)
{
llwarns << "Tried to access singleton " << typeid(DERIVED_TYPE).name() << " from initSingleton(), using half-initialized object" << llendl;
return;
}
data.mInitState = CONSTRUCTING;
data.mSingletonInstance = new DERIVED_TYPE();
data.mInitState = INITIALIZING;
data.mSingletonInstance->initSingleton();
data.mInitState = INITIALIZED;
}
#endif

2
indra/llimage/llimage.h
View File

@@ -330,7 +330,7 @@ public:
virtual void setLastError(const std::string& message, const std::string& filename = std::string());
protected:
BOOL copyData(U8 *data, S32 size); // calls updateData()
BOOL copyData(U8 *data, S32 size);
protected:
S8 mCodec;

2
indra/llvfs/lldir_linux.cpp
View File

@@ -117,7 +117,7 @@ LLDir_Linux::LLDir_Linux()
mOSUserAppDir = "";
mLindenUserDir = "";
char path [32]; /* Flawfinder: ignore */
char path [MAX_PATH]; /* Flawfinder: ignore */
// *NOTE: /proc/%d/exe doesn't work on FreeBSD. But that's ok,
// because this is the linux implementation.

6
indra/llvfs/llvfile.cpp
View File

@@ -130,7 +130,7 @@ BOOL LLVFile::read(U8 *buffer, S32 bytes, BOOL async, F32 priority)
}
//static
U8* LLVFile::readFile(LLVFS *vfs, const LLUUID &uuid, LLAssetType::EType type, S32* bytes_read)
U8* LLVFile::readFile(LLVFS *vfs, LLPrivateMemoryPool* poolp, const LLUUID &uuid, LLAssetType::EType type, S32* bytes_read)
{
U8 *data;
LLVFile file(vfs, uuid, type, LLVFile::READ);
@@ -142,12 +142,12 @@ U8* LLVFile::readFile(LLVFS *vfs, const LLUUID &uuid, LLAssetType::EType type, S
}
else
{
data = new U8[file_size];
data = (U8*)ALLOCATE_MEM(poolp, file_size);
file.read(data, file_size); /* Flawfinder: ignore */
if (file.getLastBytesRead() != (S32)file_size)
{
delete[] data;
FREE_MEM(poolp, data);
data = NULL;
file_size = 0;
}

4
indra/llvfs/llvfile.h
View File

@@ -38,6 +38,8 @@
#include "llvfs.h"
#include "llvfsthread.h"
class LLPrivateMemoryPool;
class LLVFile
{
public:
@@ -45,7 +47,7 @@ public:
~LLVFile();
BOOL read(U8 *buffer, S32 bytes, BOOL async = FALSE, F32 priority = 128.f); /* Flawfinder: ignore */
static U8* readFile(LLVFS *vfs, const LLUUID &uuid, LLAssetType::EType type, S32* bytes_read = 0);
static U8* readFile(LLVFS *vfs, LLPrivateMemoryPool* poolp, const LLUUID &uuid, LLAssetType::EType type, S32* bytes_read = 0);
void setReadPriority(const F32 priority);
BOOL isReadComplete();
S32 getLastBytesRead();

2
indra/newview/CMakeLists.txt
View File

@@ -165,6 +165,7 @@ set(viewer_SOURCE_FILES
lleventinfo.cpp
lleventnotifier.cpp
lleventpoll.cpp
llexternaleditor.cpp
llface.cpp
llfasttimerview.cpp
llfeaturemanager.cpp
@@ -645,6 +646,7 @@ set(viewer_HEADER_FILES
lleventinfo.h
lleventnotifier.h
lleventpoll.h
llexternaleditor.h
llface.h
llfasttimerview.h
llfeaturemanager.h

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

@@ -7399,7 +7399,7 @@
<key>Comment</key>
<string>Translate incoming chat messages</string>
<key>Persist</key>
<integer>1</integer>
<integer>0</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
@@ -14436,6 +14436,17 @@
<key>Value</key>
<real>150000.0</real>
</map>
<key>ExternalEditor</key>
<map>
<key>Comment</key>
<string>Path to program used to edit LSL scripts and XUI files, e.g.: /usr/bin/gedit --new-window "%s"</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>String</string>
<key>Value</key>
<string />
</map>
<key>YawFromMousePosition</key>
<map>
<key>Comment</key>

208
indra/newview/llexternaleditor.cpp Normal file
View File

@@ -0,0 +1,208 @@
/**
* @file llexternaleditor.cpp
* @brief A convenient class to run external editor.
*
* $LicenseInfo:firstyear=2010&license=viewerlgpl$
* Second Life Viewer Source Code
* Copyright (C) 2010, Linden Research, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation;
* version 2.1 of the License only.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
* Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA
* $/LicenseInfo$
*/
#include "llviewerprecompiledheaders.h"
#include "llexternaleditor.h"
#include "lltrans.h"
#include "llui.h"
// static
const std::string LLExternalEditor::sFilenameMarker = "%s";
// static
const std::string LLExternalEditor::sSetting = "ExternalEditor";
LLExternalEditor::EErrorCode LLExternalEditor::setCommand(const std::string& env_var, const std::string& override)
{
std::string cmd = findCommand(env_var, override);
if (cmd.empty())
{
llwarns << "Editor command is empty or not set" << llendl;
return EC_NOT_SPECIFIED;
}
// Add the filename marker if missing.
if (cmd.find(sFilenameMarker) == std::string::npos)
{
cmd += " \"" + sFilenameMarker + "\"";
llinfos << "Adding the filename marker (" << sFilenameMarker << ")" << llendl;
}
string_vec_t tokens;
if (tokenize(tokens, cmd) < 2) // 2 = bin + at least one arg (%s)
{
llwarns << "Error parsing editor command" << llendl;
return EC_PARSE_ERROR;
}
// Check executable for existence.
std::string bin_path = tokens[0];
if (!LLFile::isfile(bin_path))
{
llwarns << "Editor binary [" << bin_path << "] not found" << llendl;
return EC_BINARY_NOT_FOUND;
}
// Save command.
mProcess.setExecutable(bin_path);
mArgs.clear();
for (size_t i = 1; i < tokens.size(); ++i)
{
if (i > 1) mArgs += " ";
mArgs += "\"" + tokens[i] + "\"";
}
llinfos << "Setting command [" << bin_path << " " << mArgs << "]" << llendl;
return EC_SUCCESS;
}
LLExternalEditor::EErrorCode LLExternalEditor::run(const std::string& file_path)
{
std::string args = mArgs;
if (mProcess.getExecutable().empty() || args.empty())
{
llwarns << "Editor command not set" << llendl;
return EC_NOT_SPECIFIED;
}
// Substitute the filename marker in the command with the actual passed file name.
LLStringUtil::replaceString(args, sFilenameMarker, file_path);
// Split command into separate tokens.
string_vec_t tokens;
tokenize(tokens, args);
// Set process arguments taken from the command.
mProcess.clearArguments();
for (string_vec_t::const_iterator arg_it = tokens.begin(); arg_it != tokens.end(); ++arg_it)
{
mProcess.addArgument(*arg_it);
}
// Run the editor.
llinfos << "Running editor command [" << mProcess.getExecutable() + " " + args << "]" << llendl;
int result = mProcess.launch();
if (result == 0)
{
// Prevent killing the process in destructor (will add it to the zombies list).
mProcess.orphan();
}
return result == 0 ? EC_SUCCESS : EC_FAILED_TO_RUN;
}
// static
std::string LLExternalEditor::getErrorMessage(EErrorCode code)
{
switch (code)
{
case EC_SUCCESS: return LLTrans::getString("ok");
case EC_NOT_SPECIFIED: return LLTrans::getString("ExternalEditorNotSet");
case EC_PARSE_ERROR: return LLTrans::getString("ExternalEditorCommandParseError");
case EC_BINARY_NOT_FOUND: return LLTrans::getString("ExternalEditorNotFound");
case EC_FAILED_TO_RUN: return LLTrans::getString("ExternalEditorFailedToRun");
}
return LLTrans::getString("Unknown");
}
// static
size_t LLExternalEditor::tokenize(string_vec_t& tokens, const std::string& str)
{
tokens.clear();
// Split the argument string into separate strings for each argument
typedef boost::tokenizer< boost::char_separator<char> > tokenizer;
boost::char_separator<char> sep("", "\" ", boost::drop_empty_tokens);
tokenizer tokens_list(str, sep);
tokenizer::iterator token_iter;
BOOL inside_quotes = FALSE;
BOOL last_was_space = FALSE;
for (token_iter = tokens_list.begin(); token_iter != tokens_list.end(); ++token_iter)
{
if (!strncmp("\"",(*token_iter).c_str(),2))
{
inside_quotes = !inside_quotes;
}
else if (!strncmp(" ",(*token_iter).c_str(),2))
{
if(inside_quotes)
{
tokens.back().append(std::string(" "));
last_was_space = TRUE;
}
}
else
{
std::string to_push = *token_iter;
if (last_was_space)
{
tokens.back().append(to_push);
last_was_space = FALSE;
}
else
{
tokens.push_back(to_push);
}
}
}
return tokens.size();
}
// static
std::string LLExternalEditor::findCommand(
const std::string& env_var,
const std::string& override)
{
std::string cmd;
// Get executable path.
if (!override.empty()) // try the supplied override first
{
cmd = override;
llinfos << "Using override" << llendl;
}
else if (!gSavedSettings.getString(sSetting).empty())
{
cmd = gSavedSettings.getString(sSetting);
llinfos << "Using setting" << llendl;
}
else // otherwise use the path specified by the environment variable
{
char* env_var_val = getenv(env_var.c_str());
if (env_var_val)
{
cmd = env_var_val;
llinfos << "Using env var " << env_var << llendl;
}
}
llinfos << "Found command [" << cmd << "]" << llendl;
return cmd;
}

105
indra/newview/llexternaleditor.h Normal file
View File

@@ -0,0 +1,105 @@
/**
* @file llexternaleditor.h
* @brief A convenient class to run external editor.
*
* $LicenseInfo:firstyear=2010&license=viewerlgpl$
* Second Life Viewer Source Code
* Copyright (C) 2010, Linden Research, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation;
* version 2.1 of the License only.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
* Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA
* $/LicenseInfo$
*/
#ifndef LL_LLEXTERNALEDITOR_H
#define LL_LLEXTERNALEDITOR_H
#include <llprocesslauncher.h>
/**
* Usage:
* LLExternalEditor ed;
* ed.setCommand("MY_EXTERNAL_EDITOR_VAR");
* ed.run("/path/to/file1");
* ed.run("/other/path/to/file2");
*/
class LLExternalEditor
{
typedef std::vector<std::string> string_vec_t;
public:
typedef enum e_error_code {
EC_SUCCESS, /// No error.
EC_NOT_SPECIFIED, /// Editor path not specified.
EC_PARSE_ERROR, /// Editor command parsing error.
EC_BINARY_NOT_FOUND, /// Could find the editor binary (missing or not quoted).
EC_FAILED_TO_RUN, /// Could not execute the editor binary.
} EErrorCode;
/**
* Set editor command.
*
* @param env_var Environment variable of the same purpose.
* @param override Optional override.
*
* First tries the override, then a predefined setting (sSetting),
* then the environment variable.
*
* @return EC_SUCCESS if command is valid and refers to an existing executable,
* EC_NOT_SPECIFIED or EC_FAILED_TO_RUNan on error.
*
* @see sSetting
*/
EErrorCode setCommand(const std::string& env_var, const std::string& override = LLStringUtil::null);
/**
* Run the editor with the given file.
*
* @param file_path File to edit.
* @return EC_SUCCESS on success, error code on error.
*/
EErrorCode run(const std::string& file_path);
/**
* Get a meaningful error message for the given status code.
*/
static std::string getErrorMessage(EErrorCode code);
private:
static std::string findCommand(
const std::string& env_var,
const std::string& override);
static size_t tokenize(string_vec_t& tokens, const std::string& str);
/**
* Filename placeholder that gets replaced with an actual file name.
*/
static const std::string sFilenameMarker;
/**
* Setting that can specify the editor command.
*/
static const std::string sSetting;
std::string mArgs;
LLProcessLauncher mProcess;
};
#endif // LL_LLEXTERNALEDITOR_H

211
indra/newview/llpreviewscript.cpp
View File

@@ -45,6 +45,8 @@
#include "llkeyboard.h"
#include "lllineeditor.h"
#include "lllivefile.h"
#include "llexternaleditor.h"
#include "llnotificationsutil.h"
#include "llresmgr.h"
#include "llscrollbar.h"
@@ -147,6 +149,50 @@ static bool have_script_upload_cap(LLUUID& object_id)
return object && (! object->getRegion()->getCapability("UpdateScriptTask").empty());
}
/// ---------------------------------------------------------------------------
/// LLLiveLSLFile
/// ---------------------------------------------------------------------------
class LLLiveLSLFile : public LLLiveFile
{
public:
typedef boost::function<bool (const std::string& filename)> change_callback_t;
LLLiveLSLFile(std::string file_path, change_callback_t change_cb);
~LLLiveLSLFile();
void ignoreNextUpdate() { mIgnoreNextUpdate = true; }
protected:
/*virtual*/ bool loadFile();
change_callback_t mOnChangeCallback;
bool mIgnoreNextUpdate;
};
LLLiveLSLFile::LLLiveLSLFile(std::string file_path, change_callback_t change_cb)
: mOnChangeCallback(change_cb)
, mIgnoreNextUpdate(false)
, LLLiveFile(file_path, 1.0)
{
llassert(mOnChangeCallback);
}
LLLiveLSLFile::~LLLiveLSLFile()
{
LLFile::remove(filename());
}
bool LLLiveLSLFile::loadFile()
{
if (mIgnoreNextUpdate)
{
mIgnoreNextUpdate = false;
return true;
}
return mOnChangeCallback(filename());
}
/// ---------------------------------------------------------------------------
/// LLScriptEdCore
/// ---------------------------------------------------------------------------
@@ -169,6 +215,8 @@ LLScriptEdCore::LLScriptEdCore(
void (*save_callback)(void*, BOOL),
void (*search_replace_callback) (void* userdata),
void* userdata,
LLUUID objectUUID,
LLUUID itemUUID,
S32 bottom_pad)
:
LLPanel( std::string("name"), rect ),
@@ -183,8 +231,11 @@ LLScriptEdCore::LLScriptEdCore(
mLastHelpToken(NULL),
mLiveHelpHistorySize(0),
mEnableSave(FALSE),
mLiveFile(NULL),
mHasScriptData(FALSE),
LLEventTimer(60)
LLEventTimer(60),
mObjectUUID(objectUUID),
mItemUUID(itemUUID)
{
setFollowsAll();
setBorderVisible(FALSE);
@@ -275,6 +326,7 @@ LLScriptEdCore::LLScriptEdCore(
childSetCommitCallback("lsl errors", &LLScriptEdCore::onErrorList, this);
childSetAction("Save_btn", onBtnSave,this);
childSetAction("Edit_btn", openInExternalEditor, this);
initMenu();
@@ -290,6 +342,7 @@ LLScriptEdCore::LLScriptEdCore(
LLScriptEdCore::~LLScriptEdCore()
{
deleteBridges();
delete mLiveFile;
}
BOOL LLScriptEdCore::tick()
@@ -359,6 +412,106 @@ void LLScriptEdCore::setScriptText(const std::string& text, BOOL is_valid)
}
}
bool LLScriptEdCore::loadScriptText(const std::string& filename)
{
if (filename.empty())
{
llwarns << "Empty file name" << llendl;
return false;
}
LLFILE* file = LLFile::fopen(filename, "rb"); /*Flawfinder: ignore*/
if (!file)
{
llwarns << "Error opening " << filename << llendl;
return false;
}
// read in the whole file
fseek(file, 0L, SEEK_END);
size_t file_length = (size_t) ftell(file);
fseek(file, 0L, SEEK_SET);
char* buffer = new char[file_length+1];
size_t nread = fread(buffer, 1, file_length, file);
if (nread < file_length)
{
llwarns << "Short read" << llendl;
}
buffer[nread] = '\0';
fclose(file);
mEditor->setText(LLStringExplicit(buffer));
delete[] buffer;
return true;
}
bool LLScriptEdCore::writeToFile(const std::string& filename)
{
LLFILE* fp = LLFile::fopen(filename, "wb");
if (!fp)
{
llwarns << "Unable to write to " << filename << llendl;
LLSD row;
row["columns"][0]["value"] = "Error writing to local file. Is your hard drive full?";
row["columns"][0]["font"] = "SANSSERIF_SMALL";
mErrorList->addElement(row);
return false;
}
std::string utf8text = mEditor->getText();
// Special case for a completely empty script - stuff in one space so it can store properly. See SL-46889
if (utf8text.size() == 0)
{
utf8text = " ";
}
fputs(utf8text.c_str(), fp);
fclose(fp);
return true;
}
void LLScriptEdCore::sync()
{
// Sync with external editor.
std::string tmp_file = getTmpFileName();
llstat s;
if (LLFile::stat(tmp_file, &s) == 0) // file exists
{
if (mLiveFile) mLiveFile->ignoreNextUpdate();
writeToFile(tmp_file);
}
}
std::string LLScriptEdCore::getTmpFileName()
{
// Take script inventory item id (within the object inventory)
// to consideration so that it's possible to edit multiple scripts
// in the same object inventory simultaneously (STORM-781).
std::string script_id = mObjectUUID.asString() + "_" + mItemUUID.asString();
// Use MD5 sum to make the file name shorter and not exceed maximum path length.
char script_id_hash_str[33]; /* Flawfinder: ignore */
LLMD5 script_id_hash((const U8 *)script_id.c_str());
script_id_hash.hex_digest(script_id_hash_str);
return std::string(LLFile::tmpdir()) + "sl_script_" + script_id_hash_str + ".lsl";
}
bool LLScriptEdCore::onExternalChange(const std::string& filename)
{
if (!loadScriptText(filename))
{
return false;
}
// Avoid recursive save/compile loop
doSave(this, false, false);
return true;
}
BOOL LLScriptEdCore::hasChanged(void* userdata)
{
LLScriptEdCore* self = (LLScriptEdCore*)userdata;
@@ -752,7 +905,7 @@ void LLScriptEdCore::onBtnInsertFunction(LLUICtrl *ui, void* userdata)
}
// static
void LLScriptEdCore::doSave( void* userdata, BOOL close_after_save )
void LLScriptEdCore::doSave( void* userdata, BOOL close_after_save, BOOL sync_external_editor)
{
LLViewerStats::getInstance()->incStat( LLViewerStats::ST_LSL_SAVE_COUNT );
@@ -762,6 +915,56 @@ void LLScriptEdCore::doSave( void* userdata, BOOL close_after_save )
{
self->mSaveCallback( self->mUserdata, close_after_save );
}
if ( sync_external_editor )
{
self->sync();
}
}
void LLScriptEdCore::openInExternalEditor(void *userdata)
{
LLScriptEdCore* self = (LLScriptEdCore*) userdata;
delete self->mLiveFile; // deletes file
// Save the script to a temporary file.
std::string filename = self->getTmpFileName();
self->writeToFile(filename);
// Start watching file changes.
self->mLiveFile = new LLLiveLSLFile(filename, boost::bind(&LLScriptEdCore::onExternalChange, self, _1));
self->mLiveFile->ignoreNextUpdate();
self->mLiveFile->addToEventTimer();
// Open it in external editor.
{
LLExternalEditor ed;
LLExternalEditor::EErrorCode status;
std::string msg;
status = ed.setCommand("LL_SCRIPT_EDITOR");
if (status != LLExternalEditor::EC_SUCCESS)
{
if (status == LLExternalEditor::EC_NOT_SPECIFIED) // Use custom message for this error.
{
msg = "External editor not set";
}
else
{
msg = LLExternalEditor::getErrorMessage(status);
}
LLNotificationsUtil::add("GenericAlert", LLSD().with("MESSAGE", msg));
return;
}
status = ed.run(filename);
if (status != LLExternalEditor::EC_SUCCESS)
{
msg = LLExternalEditor::getErrorMessage(status);
LLNotificationsUtil::add("GenericAlert", LLSD().with("MESSAGE", msg));
}
}
}
// static
@@ -1038,6 +1241,8 @@ void* LLPreviewLSL::createScriptEdPanel(void* userdata)
LLPreviewLSL::onSave,
LLPreviewLSL::onSearchReplace,
self,
self->mObjectID,
self->mItemUUID,
0);
return self->mScriptEd;
@@ -1602,6 +1807,8 @@ void* LLLiveLSLEditor::createScriptEdPanel(void* userdata)
&LLLiveLSLEditor::onSave,
&LLLiveLSLEditor::onSearchReplace,
self,
self->mObjectID,
self->mItemUUID,
0);
return self->mScriptEd;

15
indra/newview/llpreviewscript.h
View File

@@ -42,7 +42,7 @@
#include "llframetimer.h"
#include "lleventtimer.h"
class LLLiveLSLFile;
class LLMessageSystem;
class LLTextEditor;
class LLButton;
@@ -72,6 +72,8 @@ public:
void (*save_callback)(void* userdata, BOOL close_after_save),
void (*search_replace_callback)(void* userdata),
void* userdata,
LLUUID objectUUID,
LLUUID itemUUID,
S32 bottom_pad = 0); // pad below bottom row of buttons
~LLScriptEdCore();
@@ -82,6 +84,12 @@ public:
BOOL canClose();
void setScriptText(const std::string& text, BOOL is_valid);
bool loadScriptText(const std::string& filename);
bool writeToFile(const std::string& filename);
void sync();
std::string getTmpFileName();
static void openInExternalEditor(void* userdata);
bool onExternalChange(const std::string& filename);
bool handleSaveChangesDialog(const LLSD& notification, const LLSD& response);
bool handleReloadFromServerDialog(const LLSD& notification, const LLSD& response);
@@ -95,7 +103,7 @@ public:
static void onClickForward(void* userdata);
static void onBtnInsertSample(void*);
static void onBtnInsertFunction(LLUICtrl*, void*);
static void doSave( void* userdata, BOOL close_after_save );
static void doSave( void* userdata, BOOL close_after_save, BOOL sync_external_editor = TRUE );
static void onBtnSave(void*);
static void onBtnUndoChanges(void*);
static void onSearchMenu(void* userdata);
@@ -158,6 +166,9 @@ private:
S32 mLiveHelpHistorySize;
BOOL mEnableSave;
BOOL mHasScriptData;
LLLiveLSLFile* mLiveFile;
LLUUID mObjectUUID;
LLUUID mItemUUID;
};

5
indra/newview/llstartup.cpp
View File

@@ -2766,6 +2766,11 @@ bool idle_startup()
LL_DEBUGS("AppInit") << "Initialization complete" << LL_ENDL;
gRenderStartTime.reset();
// We're not allowed to call reset() when paused, and we might or might not be paused depending on
// whether or not the main window lost focus before we get here (see LLViewerWindow::handleFocusLost).
// The simplest, legal way to make sure we're unpaused is to just pause/unpause here.
gForegroundTime.pause();
gForegroundTime.unpause();
gForegroundTime.reset();
if (gSavedSettings.getBOOL("FetchInventoryOnLogin")

2
indra/newview/lltexlayer.cpp
View File

@@ -402,7 +402,7 @@ void LLTexLayerSetBuffer::readBackAndUpload()
BOOL valid = FALSE;
LLPointer<LLImageJ2C> integrity_test = new LLImageJ2C;
S32 file_size = 0;
U8* data = LLVFile::readFile(gVFS, asset_id, LLAssetType::AT_TEXTURE, &file_size);
U8* data = LLVFile::readFile(gVFS, LLImageBase::getPrivatePool(), asset_id, LLAssetType::AT_TEXTURE, &file_size);
if (data)
{
valid = integrity_test->validate(data, file_size); // integrity_test will delete 'data'

2
indra/newview/lltexturecache.cpp
View File

@@ -885,7 +885,7 @@ BOOL LLTextureCache::isInLocal(const LLUUID& id)
//static
const S32 MAX_REASONABLE_FILE_SIZE = 512*1024*1024; // 512 MB
F32 LLTextureCache::sHeaderCacheVersion = 1.4f;
F32 LLTextureCache::sHeaderCacheVersion = 1.5f;
U32 LLTextureCache::sCacheMaxEntries = MAX_REASONABLE_FILE_SIZE / TEXTURE_CACHE_ENTRY_SIZE;
S64 LLTextureCache::sCacheMaxTexturesSize = 0; // no limit
const char* entries_filename = "texture.entries";

54
indra/newview/llvoavatar.cpp
View File

@@ -3258,6 +3258,29 @@ void LLVOAvatar::getClientInfo(std::string& client, LLColor4& color, BOOL useCom
return;
std::string uuid_str = getTE(TEX_HEAD_BODYPAINT)->getID().asString(); //UUID of the head texture
if(isFullyLoaded())
{
//Zwagoth's new client identification - HgB
// Overwrite the current tag/color settings if new method
// exists -- charbl.
const LLTextureEntry* texentry = getTE(0);
if(texentry->getGlow() > 0.0)
{
///llinfos << "Using new client identifier." << llendl;
U8 tag_buffer[UUID_BYTES+1];
memset(&tag_buffer, 0, UUID_BYTES);
memcpy(&tag_buffer[0], &texentry->getID().mData, UUID_BYTES);
tag_buffer[UUID_BYTES] = 0;
U32 tag_len = strlen((const char*)&tag_buffer[0]);
tag_len = (tag_len>UUID_BYTES) ? (UUID_BYTES) : tag_len;
client = std::string((char*)&tag_buffer[0], tag_len);
LLStringFn::replace_ascii_controlchars(mClientTag, LL_UNKNOWN_CHAR);
mNameString.clear();
color = texentry->getColor();
return;
}
}
static const LLCachedControl<LLColor4> avatar_name_color(gColors,"AvatarNameColor",LLColor4(LLColor4U(251, 175, 93, 255)) );
if (isSelf())
{
@@ -3553,38 +3576,15 @@ void LLVOAvatar::idleUpdateNameTag(const LLVector3& root_pos_last)
static const LLCachedControl<LLColor4> avatar_name_color(gColors, "AvatarNameColor" );
//As pointed out by Zwagoth, we really shouldn't be doing this per-frame. Skip if we already have the data. -HgB
if (mClientTag == "")
{
mClientColor = avatar_name_color;
if(isFullyLoaded())
getClientInfo(mClientTag,mClientColor);
if(mClientTag == "")
{
//Zwagoth's new client identification - HgB
// Overwrite the current tag/color settings if new method
// exists -- charbl.
const LLTextureEntry* texentry = getTE(0);
if(texentry->getGlow() > 0.0)
{
llinfos << "Using new client identifier." << llendl;
U8 tag_buffer[UUID_BYTES+1];
memset(&tag_buffer, 0, UUID_BYTES);
memcpy(&tag_buffer[0], &texentry->getID().mData, UUID_BYTES);
tag_buffer[UUID_BYTES] = 0;
U32 tag_len = strlen((const char*)&tag_buffer[0]);
tag_len = (tag_len>UUID_BYTES) ? (UUID_BYTES) : tag_len;
mClientTag = std::string((char*)&tag_buffer[0], tag_len);
LLStringFn::replace_ascii_controlchars(mClientTag, LL_UNKNOWN_CHAR);
mNameString.clear();
mClientColor = texentry->getColor();
}
else
{
//llinfos << "Using Emerald-style client identifier." << llendl;
//The old client identification. Used only if the new method doesn't exist, so that it isn't automatically overwritten. -HgB
getClientInfo(mClientTag,mClientColor);
if(mClientTag == "")
client = "?"; //prevent console spam..
}
client = "?"; //prevent console spam..
}
// Overwrite the tag/color shit yet again if we want to see

20
indra/newview/skins/default/xui/en-us/floater_chat_history.xml
View File

@@ -69,38 +69,38 @@
orientation="horizontal" width="430" name="panels">
<layout_panel border="false" bottom="0" default_tab_group="1" height="135" left="0"
min_width="275" name="im_contents_panel" width="305">
<combo_box follows="left|top" height="20" label="Gestures" left="5" name="Gesture"
<combo_box follows="left|top" height="18" label="Gestures" left="5" name="Gesture"
width="120">
<combo_item name="Gestures">
Gestures
</combo_item>
</combo_box>
<check_box bottom_delta="7" enabled="true" follows="left|top" font="SansSerifSmall"
<check_box bottom_delta="0" enabled="true" follows="left|top" font="SansSerifSmall"
height="20" initial_value="false" label="Show Muted Text" left_delta="125"
name="show mutes" radio_style="false" width="116" />
<check_box bottom_delta="-15" enabled="true" follows="left|top" font="SansSerifSmall"
<!--check_box bottom_delta="-15" enabled="true" follows="left|top" font="SansSerifSmall"
height="20" initial_value="false" label="Translate Chat (powered by Google)" left_delta="0"
name="translate chat" radio_style="false" width="100" />
name="translate chat" radio_style="false" width="100" /-->
<button bottom_delta="8" left_delta="250" follows="left|top" font="SansSerifSmall"
<button bottom_delta="0" left_delta="150" follows="left|top" font="SansSerifSmall"
height="20" width="100" label="Open History" name="chat_history_open"
tool_top="Click here to open chat history in external editor." />
<button bottom_delta="7" follows="right|top" height="20" label="&lt; &lt;"
<button bottom_delta="0" follows="right|top" height="20" label="&lt; &lt;"
label_selected="&gt; &gt;" left="272" name="toggle_active_speakers_btn"
right="305"
tool_tip="Click here to show list of active participants in this IM session."
width="70" />
<text_editor type="string" length="1" bg_readonly_color="ChatHistoryBgColor" bg_writeable_color="ChatHistoryBgColor"
<text_editor type="string" length="1" bg_readonly_color="ChatHistoryBgColor" bg_writeable_color="ChatHistoryBgColor"
bottom="28" embedded_items="false" enabled="false"
follows="left|top|right|bottom" font="SansSerif" height="74" left="5"
follows="left|top|right|bottom" font="SansSerif" height="79" left="5"
max_length="2147483647" mouse_opaque="true" name="Chat History Editor"
track_bottom="true"
track_bottom="true"
text_color="ChatHistoryTextColor"
text_readonly_color="ChatHistoryTextColor" width="299" word_wrap="true" spell_check="true" />
<text_editor type="string" length="1" bg_readonly_color="ChatHistoryBgColor" bg_writeable_color="ChatHistoryBgColor"
bottom="28" embedded_items="false" enabled="false"
follows="left|top|right|bottom" font="SansSerif" height="74" left="5"
follows="left|top|right|bottom" font="SansSerif" height="79" left="5"
max_length="2147483647" mouse_opaque="true"
name="Chat History Editor with mute" text_color="ChatHistoryTextColor"
track_bottom="true"

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

@@ -26,7 +26,7 @@
<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.
(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>

8
indra/newview/skins/default/xui/en-us/floater_instant_message.xml
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater border="true" bottom="-298" can_close="true" can_drag_on_left="false"
can_minimize="true" can_resize="true" default_tab_group="1"
follows="left|top|right|bottom" height="297" label="(unknown)" left="1"
follows="left|top|right|bottom" height="296" label="(unknown)" left="1"
min_height="155" min_width="345" mouse_opaque="true" name="im_floater"
rect_control="" title="(unknown)" width="501">
<string name="ringing">
@@ -64,18 +64,18 @@
</panel>
<text_editor type="string" length="1" bg_readonly_color="ChatHistoryBgColor" bg_writeable_color="ChatHistoryBgColor"
bottom="30" embedded_items="false" enabled="false"
follows="left|top|right|bottom" font="SansSerif" height="221" left="5"
follows="left|top|right|bottom" font="SansSerif" height="221" left="7"
max_length="2147483647" mouse_opaque="true" name="im_history"
text_color="ChatHistoryTextColor"
track_bottom="true"
text_readonly_color="ChatHistoryTextColor" width="487" word_wrap="true" />
<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="7"
follows="left|right|bottom" font="SansSerif" height="20"
label="Click here to instant message" left="5" max_length="2147483647"
label="Click here to instant message" left="7" max_length="2147483647"
mouse_opaque="true" name="chat_editor" select_all_on_focus_received="false"
select_on_focus="false" tab_group="1" width="423" spell_check="true" />
<button bottom="7" follows="right|bottom" font="SansSerif" halign="center" height="20"
label="Send" left="433" mouse_opaque="true" name="send_btn"
label="Send" left="435" mouse_opaque="true" name="send_btn"
scale_image="true" width="60" />
<string name="live_help_dialog">
*** Welcome to Help Request ***

6
indra/newview/skins/default/xui/en-us/floater_instant_message_ad_hoc.xml
View File

@@ -46,7 +46,7 @@
visible="true" width="80" />
<text_editor type="string" length="1" bg_readonly_color="ChatHistoryBgColor" bg_writeable_color="ChatHistoryBgColor"
bottom="-265" embedded_items="false" enabled="false"
follows="left|top|right|bottom" font="SansSerif" height="239" left="5"
follows="left|top|right|bottom" font="SansSerif" height="239" left="7"
max_length="2147483647" mouse_opaque="true" name="im_history"
track_bottom="true"
text_color="ChatHistoryTextColor"
@@ -54,11 +54,11 @@
<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="7"
enabled="true" follows="left|right|bottom" font="SansSerif"
handle_edit_keys_directly="false" height="20"
label="Click here to instant message" left="5" max_length="1022"
label="Click here to instant message" left="7" max_length="1022"
mouse_opaque="true" name="chat_editor" select_all_on_focus_received="false"
select_on_focus="false" tab_group="1" width="426" spell_check="true" />
<button bottom_delta="0" enabled="true" follows="right|bottom" font="SansSerif"
halign="center" height="20" label="Send" left="436" mouse_opaque="true"
halign="center" height="20" label="Send" left="438" mouse_opaque="true"
name="send_btn" scale_image="true" width="60" />
</layout_panel>
<layout_panel auto_resize="false" bottom="0" can_resize="true"

17
indra/newview/skins/default/xui/en-us/floater_instant_message_group.xml
View File

@@ -41,7 +41,7 @@
Your text chat has been disabled by a Group Moderator.
</string>
<layout_stack border="false" bottom="0" follows="left|top|right|bottom" height="276" left="0"
orientation="horizontal" tab_group="1" width="495" name="panels">
orientation="horizontal" tab_group="1" width="496" name="panels">
<layout_panel border="false" bottom="0" default_tab_group="1" follows="left|top|bottom|right"
height="130" left="0" min_width="210" name="im_contents_panel" width="175">
<button bottom="-20" follows="left|top" height="20" label="Group Info" left="5"
@@ -55,25 +55,24 @@
label="End Call" left_delta="0" name="end_call_btn" pad_right="12"
visible="false" width="80" />
<button bottom_delta="0" follows="right|top" height="20" label="&lt; &lt;"
label_selected="&gt; &gt;" left="143" name="toggle_active_speakers_btn"
right="176"
label_selected="&gt; &gt;" left="145" name="toggle_active_speakers_btn"
tool_tip="Click here to toggle a list of active participants in this IM session."
visible="true" width="30" />
visible="true" width="33" />
<text_editor type="string" length="1" bg_readonly_color="ChatHistoryBgColor" bg_writeable_color="ChatHistoryBgColor"
bottom="30" embedded_items="false" enabled="false"
follows="left|top|right|bottom" font="SansSerif" left="4"
follows="left|top|right|bottom" font="SansSerif" left="7"
max_length="2147483647" mouse_opaque="true" name="im_history"
text_color="ChatHistoryTextColor"
track_bottom="true"
text_readonly_color="ChatHistoryTextColor" top="104" width="170"
track_bottom="true"
text_readonly_color="ChatHistoryTextColor" top="104" width="170"
word_wrap="true" />
<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="7"
enabled="true" follows="left|right|bottom" font="SansSerif" height="20"
left="5" max_length="1022" mouse_opaque="true" name="chat_editor"
left="7" max_length="1022" mouse_opaque="true" name="chat_editor"
select_all_on_focus_received="false" select_on_focus="false" tab_group="1"
width="106" spell_check="true" />
<button bottom="7" enabled="true" follows="right|bottom" font="SansSerif"
halign="center" height="20" label="Send" left="116" mouse_opaque="true"
halign="center" height="20" label="Send" left="118" mouse_opaque="true"
name="send_btn" scale_image="true" width="60" />
</layout_panel>
<layout_panel auto_resize="false" bottom="0" can_resize="true"

217
indra/newview/skins/default/xui/en-us/floater_joystick.xml
View File

@@ -1,128 +1,99 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater bottom="0" can_minimize="true" can_resize="false" height="500" left="0"
name="Joystick" title="Joystick Configuration" width="550">
<check_box name="enable_joystick" bottom="-38" left="14" width="60" halign="left" border_drop_shadow_visible="true" control_name="JoystickEnabled">Enable Joystick:</check_box>
<text name="joystick_type" bottom="-32" left="120" width="380" halign="left"></text>
<spinner bottom="-48" left="20" width="140" label_width="100" control_name="JoystickAxis1" name="JoystickAxis1" label="X Axis Mapping" decimal_digits="0" increment="1" min_val="-1" max_val="5"/>
<spinner bottom="-48" left="190" width="140" label_width="100" control_name="JoystickAxis2" name="JoystickAxis2" label="Y Axis Mapping" decimal_digits="0" increment="1" min_val="-1" max_val="5"/>
<spinner bottom="-48" left="360" width="140" label_width="100" control_name="JoystickAxis0" name="JoystickAxis0" label="Z Axis Mapping" decimal_digits="0" increment="1" min_val="-1" max_val="5"/>
<spinner bottom="-68" left="20" width="140" label_width="100" control_name="JoystickAxis4" name="JoystickAxis4" label="Pitch Mapping" decimal_digits="0" increment="1" min_val="-1" max_val="5"/>
<spinner bottom="-68" left="190" width="140" label_width="100" control_name="JoystickAxis5" name="JoystickAxis5" label="Yaw Mapping" decimal_digits="0" increment="1" min_val="-1" max_val="5"/>
<spinner bottom="-68" left="360" width="140" label_width="100" control_name="JoystickAxis3" name="JoystickAxis3" label="Roll Mapping" decimal_digits="0" increment="1" min_val="-1" max_val="5"/>
<spinner bottom="-88" left="20" width="140" label_width="100" control_name="JoystickAxis6" name="JoystickAxis6" label="Zoom Mapping" decimal_digits="0" increment="1" min_val="-1" max_val="5"/>
<check_box bottom="-96" left="185" control_name="ZoomDirect" label="Direct Zoom" name="ZoomDirect" />
<check_box bottom="-96" left="310" control_name="Cursor3D" label="3D Cursor" name="Cursor3D" />
<check_box bottom="-96" left="420" control_name="AutoLeveling" label="Auto Level" name="AutoLeveling" />
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="-120" drop_shadow_visible="true" enabled="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="right" height="10" hidden="false"
left="12" mouse_opaque="false" v_pad="0" width="102" name="Control Modes:">
Control Modes:
</text>
<check_box bottom="-127" left="125" width="60" halign="center" border_drop_shadow_visible="true" control_name="JoystickAvatarEnabled" name="JoystickAvatarEnabled">Avatar</check_box>
<check_box bottom="-127" left="194" width="60" halign="center" border_drop_shadow_visible="true" control_name="JoystickBuildEnabled" name="JoystickBuildEnabled">Build</check_box>
<check_box bottom="-127" left="262" width="60" halign="center" border_drop_shadow_visible="true" control_name="JoystickFlycamEnabled" name="JoystickFlycamEnabled">Flycam</check_box>
<text bottom="-144" left="20" width="94" halign="right" name="XScale">X Scale</text>
<spinner bottom="-144" left="125" width="56" label_width="0" control_name="AvatarAxisScale1" name="AvatarAxisScale1" decimal_digits="2" increment="0.1" min_val="-50" max_val="50"/>
<spinner bottom="-144" left="195" width="56" label_width="0" control_name="BuildAxisScale1" name="BuildAxisScale1" decimal_digits="2" increment="0.1" min_val="-1024" max_val="1024"/>
<spinner bottom="-144" left="265" width="56" label_width="0" control_name="FlycamAxisScale1" name="FlycamAxisScale1" decimal_digits="2" increment="0.1" min_val="-1024" max_val="1024"/>
<text bottom="-164" left="20" width="94" halign="right" name="YScale">Y Scale</text>
<spinner bottom="-164" left="125" width="56" label_width="0" control_name="AvatarAxisScale2" name="AvatarAxisScale2" decimal_digits="2" increment="0.1" min_val="-50" max_val="50"/>
<spinner bottom="-164" left="195" width="56" label_width="0" control_name="BuildAxisScale2" name="BuildAxisScale2" decimal_digits="2" increment="0.1" min_val="-1024" max_val="1024"/>
<spinner bottom="-164" left="265" width="56" label_width="0" control_name="FlycamAxisScale2" name="FlycamAxisScale2" decimal_digits="2" increment="0.1" min_val="-1024" max_val="1024"/>
<text bottom="-184" left="20" width="94" halign="right" name="ZScale">Z Scale</text>
<spinner bottom="-184" left="125" width="56" label_width="0" control_name="AvatarAxisScale0" name="AvatarAxisScale0" decimal_digits="2" increment="0.1" min_val="-50" max_val="50"/>
<spinner bottom="-184" left="195" width="56" label_width="0" control_name="BuildAxisScale0" name="BuildAxisScale0" decimal_digits="2" increment="0.1" min_val="-1024" max_val="1024"/>
<spinner bottom="-184" left="265" width="56" label_width="0" control_name="FlycamAxisScale0" name="FlycamAxisScale0" decimal_digits="2" increment="0.1" min_val="-1024" max_val="1024"/>
<text bottom="-204" left="20" width="94" halign="right" name="PitchScale">Pitch Scale</text>
<spinner bottom="-204" left="125" width="56" label_width="0" control_name="AvatarAxisScale4" name="AvatarAxisScale4" decimal_digits="2" increment="0.1" min_val="-1024" max_val="1024"/>
<spinner bottom="-204" left="195" width="56" label_width="0" control_name="BuildAxisScale4" name="BuildAxisScale4" decimal_digits="2" increment="0.1" min_val="-1024" max_val="1024"/>
<spinner bottom="-204" left="265" width="56" label_width="0" control_name="FlycamAxisScale4" name="FlycamAxisScale4" decimal_digits="2" increment="0.1" min_val="-1024" max_val="1024"/>
<text bottom="-224" left="20" width="94" halign="right" name="YawScale">Yaw Scale</text>
<spinner bottom="-224" left="125" width="56" label_width="0" control_name="AvatarAxisScale5" name="AvatarAxisScale5" decimal_digits="2" increment="0.1" min_val="-1024" max_val="1024"/>
<spinner bottom="-224" left="195" width="56" label_width="0" control_name="BuildAxisScale5" name="BuildAxisScale5" decimal_digits="2" increment="0.1" min_val="-1024" max_val="1024"/>
<spinner bottom="-224" left="265" width="56" label_width="0" control_name="FlycamAxisScale5" name="FlycamAxisScale5" decimal_digits="2" increment="0.1" min_val="-1024" max_val="1024"/>
<text bottom="-244" left="20" width="94" halign="right" name="RollScale">Roll Scale</text>
<spinner bottom="-244" left="195" width="56" label_width="0" control_name="BuildAxisScale3" name="BuildAxisScale3" decimal_digits="2" increment="0.1" min_val="-1024" max_val="1024"/>
<spinner bottom="-244" left="265" width="56" label_width="0" control_name="FlycamAxisScale3" name="FlycamAxisScale3" decimal_digits="2" increment="0.1" min_val="-1024" max_val="1024"/>
<text bottom="-274" left="20" width="94" halign="right" name="XDeadZone">X Dead Zone</text>
<spinner bottom="-274" left="125" width="56" label_width="0" control_name="AvatarAxisDeadZone1" name="AvatarAxisDeadZone1" decimal_digits="2" increment="0.01" min_val="0" max_val="1"/>
<spinner bottom="-274" left="195" width="56" label_width="0" control_name="BuildAxisDeadZone1" name="BuildAxisDeadZone1" decimal_digits="2" increment="0.01" min_val="0" max_val="1"/>
<spinner bottom="-274" left="265" width="56" label_width="0" control_name="FlycamAxisDeadZone1" name="FlycamAxisDeadZone1" decimal_digits="2" increment="0.01" min_val="0" max_val="1"/>
<text bottom="-294" left="20" width="94" halign="right" name="YDeadZone">Y Dead Zone</text>
<spinner bottom="-294" left="125" width="56" label_width="0" control_name="AvatarAxisDeadZone2" name="AvatarAxisDeadZone2" decimal_digits="2" increment="0.01" min_val="0" max_val="1"/>
<spinner bottom="-294" left="195" width="56" label_width="0" control_name="BuildAxisDeadZone2" name="BuildAxisDeadZone2" decimal_digits="2" increment="0.01" min_val="0" max_val="1"/>
<spinner bottom="-294" left="265" width="56" label_width="0" control_name="FlycamAxisDeadZone2" name="FlycamAxisDeadZone2" decimal_digits="2" increment="0.01" min_val="0" max_val="1"/>
<text bottom="-314" left="20" width="94" halign="right" name="ZDeadZone">Z Dead Zone</text>
<spinner bottom="-314" left="125" width="56" label_width="0" control_name="AvatarAxisDeadZone0" name="AvatarAxisDeadZone0" decimal_digits="2" increment="0.01" min_val="0" max_val="1"/>
<spinner bottom="-314" left="195" width="56" label_width="0" control_name="BuildAxisDeadZone0" name="BuildAxisDeadZone0" decimal_digits="2" increment="0.01" min_val="0" max_val="1"/>
<spinner bottom="-314" left="265" width="56" label_width="0" control_name="FlycamAxisDeadZone0" name="FlycamAxisDeadZone0" decimal_digits="2" increment="0.01" min_val="0" max_val="1"/>
<text bottom="-334" left="20" width="94" halign="right" name="PitchDeadZone">Pitch Dead Zone</text>
<spinner bottom="-334" left="125" width="56" label_width="0" control_name="AvatarAxisDeadZone4" name="AvatarAxisDeadZone4" decimal_digits="2" increment="0.01" min_val="0" max_val="1"/>
<spinner bottom="-334" left="195" width="56" label_width="0" control_name="BuildAxisDeadZone4" name="BuildAxisDeadZone4" decimal_digits="2" increment="0.01" min_val="0" max_val="1"/>
<spinner bottom="-334" left="265" width="56" label_width="0" control_name="FlycamAxisDeadZone4" name="FlycamAxisDeadZone4" decimal_digits="2" increment="0.01" min_val="0" max_val="1"/>
<text bottom="-354" left="20" width="94" halign="right" name="YawDeadZone">Yaw Dead Zone</text>
<spinner bottom="-354" left="125" width="56" label_width="0" control_name="AvatarAxisDeadZone5" name="AvatarAxisDeadZone5" decimal_digits="2" increment="0.01" min_val="0" max_val="1"/>
<spinner bottom="-354" left="195" width="56" label_width="0" control_name="BuildAxisDeadZone5" name="BuildAxisDeadZone5" decimal_digits="2" increment="0.01" min_val="0" max_val="1"/>
<spinner bottom="-354" left="265" width="56" label_width="0" control_name="FlycamAxisDeadZone5" name="FlycamAxisDeadZone5" decimal_digits="2" increment="0.01" min_val="0" max_val="1"/>
<text bottom="-374" left="20" width="94" halign="right" name="RollDeadZone">Roll Dead Zone</text>
<spinner bottom="-374" left="195" width="56" label_width="0" control_name="BuildAxisDeadZone3" name="BuildAxisDeadZone3" decimal_digits="2" increment="0.01" min_val="0" max_val="1"/>
<spinner bottom="-374" left="265" width="56" label_width="0" control_name="FlycamAxisDeadZone3" name="FlycamAxisDeadZone3" decimal_digits="2" increment="0.01" min_val="0" max_val="1"/>
<text bottom="-402" left="20" width="94" halign="right" name="Feathering">Feathering</text>
<slider bottom="-408" left="116" can_edit_text="false" control_name="AvatarFeathering"
decimal_digits="0" follows="left|top" height="16" increment="1"
initial_val="0.7" label="" max_val="32" min_val="1"
mouse_opaque="true" name="AvatarFeathering" show_text="false" value="0.7"
width="73" />
<slider bottom="-408" left="186" can_edit_text="false" control_name="BuildFeathering"
decimal_digits="0" follows="left|top" height="16" increment="1"
initial_val="0.7" label="" max_val="32" min_val="1"
mouse_opaque="true" name="BuildFeathering" show_text="false" value="0.7"
width="73" />
<slider bottom="-408" left="256" can_edit_text="false" control_name="FlycamFeathering"
decimal_digits="0" follows="left|top" height="16" increment="1"
initial_val="0.7" label="" max_val="32" min_val="1"
mouse_opaque="true" name="FlycamFeathering" show_text="false" value="0.7"
width="73" />
<text bottom="-430" left="20" width="94" halign="right" name="ZoomScale2">Zoom Scale</text>
<spinner bottom="-430" left="265" width="56" label_width="0" control_name="FlycamAxisScale6" name="FlycamAxisScale6" label="" decimal_digits="2" increment="0.1" min_val="-1024" max_val="1024"/>
<text bottom="-450" left="20" width="94" halign="right" name="ZoomDeadZone">Zoom Dead Zone</text>
<spinner bottom="-450" left="265" width="56" label_width="0" control_name="FlycamAxisDeadZone6" name="FlycamAxisDeadZone6" label="" decimal_digits="2" increment="0.01" min_val="0" max_val="1"/>
<button bottom="-451" left="340" enabled="true" follows="left|top" font="SansSerif"
halign="center" height="22" hidden="false"
label="SpaceNavigator Defaults" mouse_opaque="true"
name="SpaceNavigatorDefaults" scale_image="true" width="184" />
<button bottom="-480" follows="right|bottom" font="SansSerif" halign="center"
height="20" label="OK" label_selected="OK" left="340"
mouse_opaque="true" name="ok_btn" width="90" />
<button bottom="-480" follows="right|bottom" font="SansSerif" halign="center"
height="20" label="Cancel" label_selected="Cancel" left_delta="94"
mouse_opaque="true" name="cancel_btn" width="90" />
<floater height="500" name="Joystick" title="Joystick Configuration" width="550">
<check_box name="enable_joystick" bottom="-38" left="14" control_name="JoystickEnabled">Enable Joystick:</check_box>
<text name="joystick_type" bottom="-32" left="120" halign="left"></text>
<string name="JoystickMonitor">Joystick Monitor</string>
<string name="Axis">Axis [NUM]</string>
<string name="NoDevice">no device detected</string>
<spinner bottom="-48" left="20" width="140" label_width="100" control_name="JoystickAxis1" name="JoystickAxis1" label="X Axis Mapping" decimal_digits="0" increment="1" min_val="-1" max_val="5"/>
<spinner bottom="-68" width="140" label_width="100" control_name="JoystickAxis4" name="JoystickAxis4" label="Pitch Mapping" decimal_digits="0" increment="1" min_val="-1" max_val="5"/>
<spinner bottom="-88" width="140" label_width="100" control_name="JoystickAxis6" name="JoystickAxis6" label="Zoom Mapping" decimal_digits="0" increment="1" min_val="-1" max_val="5"/>
<spinner bottom="-48" left="190" width="140" label_width="100" control_name="JoystickAxis2" name="JoystickAxis2" label="Y Axis Mapping" decimal_digits="0" increment="1" min_val="-1" max_val="5"/>
<spinner bottom="-68" width="140" label_width="100" control_name="JoystickAxis5" name="JoystickAxis5" label="Yaw Mapping" decimal_digits="0" increment="1" min_val="-1" max_val="5"/>
<spinner bottom="-48" left="360" width="140" label_width="100" control_name="JoystickAxis0" name="JoystickAxis0" label="Z Axis Mapping" decimal_digits="0" increment="1" min_val="-1" max_val="5"/>
<spinner bottom="-68" width="140" label_width="100" control_name="JoystickAxis3" name="JoystickAxis3" label="Roll Mapping" decimal_digits="0" increment="1" min_val="-1" max_val="5"/>
<check_box bottom="-96" left="185" control_name="ZoomDirect" label="Direct Zoom" name="ZoomDirect"/>
<check_box bottom="-96" left="310" control_name="Cursor3D" label="3D Cursor" name="Cursor3D"/>
<check_box bottom="-96" left="420" control_name="AutoLeveling" label="Auto Level" name="AutoLeveling"/>
<text bottom="-120" follows="top" height="10" left="12" name="Control Modes:">Control Modes:</text>
<check_box bottom="-127" left="125" control_name="JoystickAvatarEnabled" name="JoystickAvatarEnabled">Avatar</check_box>
<check_box bottom="-127" left="194" control_name="JoystickBuildEnabled" name="JoystickBuildEnabled">Build</check_box>
<check_box bottom="-127" left="262" control_name="JoystickFlycamEnabled" name="JoystickFlycamEnabled">Flycam</check_box>
<text bottom="-144" left="20" width="94" halign="right" name="XScale">X Scale</text>
<spinner bottom="-144" left="125" width="56" control_name="AvatarAxisScale1" name="AvatarAxisScale1" decimal_digits="2" increment="0.1" min_val="-50" max_val="50"/>
<spinner bottom="-144" left="195" width="56" control_name="BuildAxisScale1" name="BuildAxisScale1" decimal_digits="2" increment="0.1" min_val="-1024" max_val="1024"/>
<spinner bottom="-144" left="265" width="56" control_name="FlycamAxisScale1" name="FlycamAxisScale1" decimal_digits="2" increment="0.1" min_val="-1024" max_val="1024"/>
<text bottom="-164" left="20" width="94" halign="right" name="YScale">Y Scale</text>
<spinner bottom="-164" left="125" width="56" control_name="AvatarAxisScale2" name="AvatarAxisScale2" decimal_digits="2" increment="0.1" min_val="-50" max_val="50"/>
<spinner bottom="-164" left="195" width="56" control_name="BuildAxisScale2" name="BuildAxisScale2" decimal_digits="2" increment="0.1" min_val="-1024" max_val="1024"/>
<spinner bottom="-164" left="265" width="56" control_name="FlycamAxisScale2" name="FlycamAxisScale2" decimal_digits="2" increment="0.1" min_val="-1024" max_val="1024"/>
<text bottom="-184" left="20" width="94" halign="right" name="ZScale">Z Scale</text>
<spinner bottom="-184" left="125" width="56" control_name="AvatarAxisScale0" name="AvatarAxisScale0" decimal_digits="2" increment="0.1" min_val="-50" max_val="50"/>
<spinner bottom="-184" left="195" width="56" control_name="BuildAxisScale0" name="BuildAxisScale0" decimal_digits="2" increment="0.1" min_val="-1024" max_val="1024"/>
<spinner bottom="-184" left="265" width="56" control_name="FlycamAxisScale0" name="FlycamAxisScale0" decimal_digits="2" increment="0.1" min_val="-1024" max_val="1024"/>
<text bottom="-204" left="20" width="94" halign="right" name="PitchScale">Pitch Scale</text>
<spinner bottom="-204" left="125" width="56" control_name="AvatarAxisScale4" name="AvatarAxisScale4" decimal_digits="2" increment="0.1" min_val="-1024" max_val="1024"/>
<spinner bottom="-204" left="195" width="56" control_name="BuildAxisScale4" name="BuildAxisScale4" decimal_digits="2" increment="0.1" min_val="-1024" max_val="1024"/>
<spinner bottom="-204" left="265" width="56" control_name="FlycamAxisScale4" name="FlycamAxisScale4" decimal_digits="2" increment="0.1" min_val="-1024" max_val="1024"/>
<text bottom="-224" left="20" width="94" halign="right" name="YawScale">Yaw Scale</text>
<spinner bottom="-224" left="125" width="56" control_name="AvatarAxisScale5" name="AvatarAxisScale5" decimal_digits="2" increment="0.1" min_val="-1024" max_val="1024"/>
<spinner bottom="-224" left="195" width="56" control_name="BuildAxisScale5" name="BuildAxisScale5" decimal_digits="2" increment="0.1" min_val="-1024" max_val="1024"/>
<spinner bottom="-224" left="265" width="56" control_name="FlycamAxisScale5" name="FlycamAxisScale5" decimal_digits="2" increment="0.1" min_val="-1024" max_val="1024"/>
<text bottom="-244" left="20" width="94" halign="right" name="RollScale">Roll Scale</text>
<spinner bottom="-244" left="195" width="56" control_name="BuildAxisScale3" name="BuildAxisScale3" decimal_digits="2" increment="0.1" min_val="-1024" max_val="1024"/>
<spinner bottom="-244" left="265" width="56" control_name="FlycamAxisScale3" name="FlycamAxisScale3" decimal_digits="2" increment="0.1" min_val="-1024" max_val="1024"/>
<text bottom="-274" left="20" width="94" halign="right" name="XDeadZone">X Dead Zone</text>
<spinner bottom="-274" left="125" width="56" control_name="AvatarAxisDeadZone1" name="AvatarAxisDeadZone1" decimal_digits="2" increment="0.01" min_val="0" max_val="1"/>
<spinner bottom="-274" left="195" width="56" control_name="BuildAxisDeadZone1" name="BuildAxisDeadZone1" decimal_digits="2" increment="0.01" min_val="0" max_val="1"/>
<spinner bottom="-274" left="265" width="56" control_name="FlycamAxisDeadZone1" name="FlycamAxisDeadZone1" decimal_digits="2" increment="0.01" min_val="0" max_val="1"/>
<text bottom="-294" left="20" width="94" halign="right" name="YDeadZone">Y Dead Zone</text>
<spinner bottom="-294" left="125" width="56" control_name="AvatarAxisDeadZone2" name="AvatarAxisDeadZone2" decimal_digits="2" increment="0.01" min_val="0" max_val="1"/>
<spinner bottom="-294" left="195" width="56" control_name="BuildAxisDeadZone2" name="BuildAxisDeadZone2" decimal_digits="2" increment="0.01" min_val="0" max_val="1"/>
<spinner bottom="-294" left="265" width="56" control_name="FlycamAxisDeadZone2" name="FlycamAxisDeadZone2" decimal_digits="2" increment="0.01" min_val="0" max_val="1"/>
<text bottom="-314" left="20" width="94" halign="right" name="ZDeadZone">Z Dead Zone</text>
<spinner bottom="-314" left="125" width="56" control_name="AvatarAxisDeadZone0" name="AvatarAxisDeadZone0" decimal_digits="2" increment="0.01" min_val="0" max_val="1"/>
<spinner bottom="-314" left="195" width="56" control_name="BuildAxisDeadZone0" name="BuildAxisDeadZone0" decimal_digits="2" increment="0.01" min_val="0" max_val="1"/>
<spinner bottom="-314" left="265" width="56" control_name="FlycamAxisDeadZone0" name="FlycamAxisDeadZone0" decimal_digits="2" increment="0.01" min_val="0" max_val="1"/>
<text bottom="-334" left="20" width="94" halign="right" name="PitchDeadZone">Pitch Dead Zone</text>
<spinner bottom="-334" left="125" width="56" control_name="AvatarAxisDeadZone4" name="AvatarAxisDeadZone4" decimal_digits="2" increment="0.01" min_val="0" max_val="1"/>
<spinner bottom="-334" left="195" width="56" control_name="BuildAxisDeadZone4" name="BuildAxisDeadZone4" decimal_digits="2" increment="0.01" min_val="0" max_val="1"/>
<spinner bottom="-334" left="265" width="56" control_name="FlycamAxisDeadZone4" name="FlycamAxisDeadZone4" decimal_digits="2" increment="0.01" min_val="0" max_val="1"/>
<text bottom="-354" left="20" width="94" halign="right" name="YawDeadZone">Yaw Dead Zone</text>
<spinner bottom="-354" left="125" width="56" control_name="AvatarAxisDeadZone5" name="AvatarAxisDeadZone5" decimal_digits="2" increment="0.01" min_val="0" max_val="1"/>
<spinner bottom="-354" left="195" width="56" control_name="BuildAxisDeadZone5" name="BuildAxisDeadZone5" decimal_digits="2" increment="0.01" min_val="0" max_val="1"/>
<spinner bottom="-354" left="265" width="56" control_name="FlycamAxisDeadZone5" name="FlycamAxisDeadZone5" decimal_digits="2" increment="0.01" min_val="0" max_val="1"/>
<text bottom="-374" left="20" width="94" halign="right" name="RollDeadZone">Roll Dead Zone</text>
<spinner bottom="-374" left="195" width="56" control_name="BuildAxisDeadZone3" name="BuildAxisDeadZone3" decimal_digits="2" increment="0.01" min_val="0" max_val="1"/>
<spinner bottom="-374" left="265" width="56" control_name="FlycamAxisDeadZone3" name="FlycamAxisDeadZone3" decimal_digits="2" increment="0.01" min_val="0" max_val="1"/>
<text bottom="-402" left="20" width="94" halign="right" name="Feathering">Feathering</text>
<spinner bottom="-402" left="125" width="56" control_name="AvatarFeathering" name="AvatarFeathering" decimal_digits="0" increment="1" initial_val="0.7" max_val="32" min_val="1"/>
<spinner bottom="-402" left="195" width="56" control_name="BuildFeathering" name="BuildFeathering" decimal_digits="0" increment="1" initial_val="0.7" max_val="32" min_val="1" value="0.7"/>
<spinner bottom="-402" left="265" width="56" control_name="FlycamFeathering" name="FlycamFeathering" decimal_digits="0" increment="1" initial_val="0.7" max_val="32" min_val="1" value="0.7"/>
<text bottom="-430" left="20" width="94" halign="right" name="ZoomScale2">Zoom Scale</text>
<spinner bottom="-430" left="265" width="56" label_width="0" control_name="FlycamAxisScale6" name="FlycamAxisScale6" decimal_digits="2" increment="0.1" min_val="-1024" max_val="1024"/>
<text bottom="-450" left="20" width="94" halign="right" name="ZoomDeadZone">Zoom Dead Zone</text>
<spinner bottom="-450" left="265" width="56" label_width="0" control_name="FlycamAxisDeadZone6" name="FlycamAxisDeadZone6" decimal_digits="2" increment="0.01" min_val="0" max_val="1"/>
<button bottom="-451" left="340" height="22" label="SpaceNavigator Defaults" name="SpaceNavigatorDefaults" scale_image="true" width="184"/>
<button bottom="-480" left="340" height="20" label="OK" label_selected="OK" name="ok_btn" width="90"/>
<button bottom="-480" left_delta="94" height="20" label="Cancel" label_selected="Cancel" name="cancel_btn" width="90"/>
</floater>

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

@@ -8,7 +8,10 @@
word_wrap="true" show_line_numbers="true">
Loading...
</text_editor>
<button bottom="-499" enabled="true" follows="right|bottom" font="SansSerif"
<button bottom="-499" enabled="true" follows="right|bottom" font="SansSerif"
halign="center" height="20" label="Edit..." label_selected="Edit..." left="230"
mouse_opaque="true" name="Edit_btn" width="128" />
<button bottom="-499" enabled="true" follows="right|bottom" font="SansSerif"
halign="center" height="20" label="Save" label_selected="Save" left="360"
mouse_opaque="true" name="Save_btn" width="128" />
<scroll_list background_visible="true" bottom="-457" column_padding="5" draw_border="true"

37
indra/newview/skins/default/xui/en-us/floater_tools.xml
View File

@@ -1412,42 +1412,25 @@
mouse_opaque="true" name="tex offset" v_pad="0" width="160">
Offset
</text>
<spinner bottom="-308" decimal_digits="4" follows="left|top" height="16" increment="0.05"
initial_val="0" label="Horizontal (U)" label_width="90" left="20"
max_val="1" min_val="-1" mouse_opaque="true" name="TexOffsetU" width="160" />
<spinner bottom_delta="-18" decimal_digits="4" follows="left|top" height="16"
increment="0.05" initial_val="0" label="Vertical (V)" label_width="90"
left="20" max_val="1" min_val="-1" mouse_opaque="true" name="TexOffsetV"
width="160" />
<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="-352" drop_shadow_visible="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="20" left="10"
mouse_opaque="true" name="textbox autofix" v_pad="0" width="160">
Align media texture
(must load first)
</text>
<spinner bottom="-308" decimal_digits="4" follows="top" height="16" increment="0.01" initial_val="0" label="Horizontal (U)" label_width="90" left="20"
max_val="1" min_val="-1" mouse_opaque="true" name="TexOffsetU" width="160"/>
<spinner bottom_delta="-18" decimal_digits="4" follows="top" height="16" increment="0.01" initial_val="0" label="Vertical (V)" label_width="90"
left="20" max_val="1" min_val="-1" name="TexOffsetV"
width="160"/>
<text bottom="-352" height="20" left="10" name="textbox autofix" v_pad="0" width="160">Align media texture
(must load first)</text>
<button bottom="-360" follows="left|top" font="SansSerifSmall" halign="center"
height="20" label="Align" label_selected="Align" left="112"
mouse_opaque="true" name="button align" scale_image="TRUE" width="68" />
<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="-322" drop_shadow_visible="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="20" left="185"
mouse_opaque="true" name="textbox params" v_pad="0" width="160">
Texture Params
</text>
<text bottom="-322" drop_shadow_visible="true" follows="left|top" height="20" left="185" name="textbox params">Texture Params</text>
<button bottom_delta="-18" follows="top|right" font="SansSerifSmall" halign="center"
height="20" label="Copy" left_delta="5" mouse_opaque="true" name="copytextures" enabled="true"
tool_tip="Copy Testure Params from Clipboard" width="68" />
<button bottom_delta="-20" follows="top|right" font="SansSerifSmall" halign="center"
height="20" label="Paste" left_delta="0" mouse_opaque="true" name="pastetextures" enabled="true"
tool_tip="Paste Texture Params from Clipboard" width="68" />
<button bottom_delta="-20" follows="top" height="20" label="Paste" name="pastetextures" tool_tip="Paste Texture Params from Clipboard" width="68" />
</panel>
<panel border="true" bottom="-383" follows="left|top|right|bottom" height="367"
label="Content" left="1" mouse_opaque="false" name="Contents" width="270">
<button bottom="-30" follows="left|top" font="SansSerif" halign="center" height="20"
label="New Script" label_selected="New Script"
left="10" mouse_opaque="true" name="button new script" scale_image="TRUE"
width="100" />
<button bottom="-30" follows="left|top" font="SansSerif" halign="center" height="20" label="New Script" label_selected="New Script" left="10" name="button new script" scale_image="TRUE" width="100"/>
<button bottom_delta="0" left_delta="110" width="100" height="20" follows="left|top"
label="Permissions..." name="button permissions" font="SansSerif" halign="center"
mouse_opaque="true" scale_image="TRUE" />

73
indra/newview/skins/default/xui/en-us/panel_audio.xml
View File

@@ -1,60 +1,17 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel border="false" follows="left|top|right|bottom" height="160"
label="Audio &amp; Video" name="Media panel" width="175">
<slider bottom_delta="-20" control_name="AudioLevelMaster" follows="left|top|right"
height="15" increment="0.05" initial_val="0.5" label="Master"
label_width="55" left="10" max_val="1" min_val="0" mouse_opaque="true"
name="System Volume" show_text="false" volume="true" width="180" />
<button bottom_delta="0" control_name="MuteAudio" follows="top|right" height="16"
image_selected="icn_speaker-muted_dark.tga"
image_unselected="icn_speaker_dark.tga" label="" label_width="55"
left="150" name="mute_audio" tab_stop="false" toggle="true" width="25" />
<slider bottom_delta="-30" control_name="AudioLevelMusic" follows="left|top|right"
height="15" increment="0.05" initial_val="0.5" label="Music"
label_width="55" left="10" max_val="1" min_val="0" name="Music Volume"
show_text="false" volume="true" width="180" />
<button bottom_delta="0" control_name="MuteMusic" follows="top|right" height="16"
image_selected="icn_speaker-muted_dark.tga"
image_unselected="icn_speaker_dark.tga" label="" label_width="55"
left="150" name="mute_music" tab_stop="false" toggle="true" width="25" />
<slider bottom_delta="-20" control_name="AudioLevelMedia" follows="left|top|right"
height="15" increment="0.05" initial_val="0.5" label="Media"
label_width="55" left="10" max_val="1" min_val="0" name="Media Volume"
show_text="false" volume="true" width="180" />
<button bottom_delta="0" control_name="MuteMedia" follows="top|right" height="16"
image_selected="icn_speaker-muted_dark.tga"
image_unselected="icn_speaker_dark.tga" label="" label_width="55"
left="150" name="mute_media" tab_stop="false" toggle="true" width="25" />
<slider bottom_delta="-20" control_name="AudioLevelVoice" follows="left|top|right"
height="15" increment="0.05" initial_val="0.5" label="Voice"
label_width="55" left="10" max_val="1" min_val="0" name="Voice Volume"
show_text="false" volume="true" width="180" />
<button bottom_delta="0" control_name="MuteVoice" follows="top|right" height="16"
image_selected="icn_speaker-muted_dark.tga"
image_unselected="icn_speaker_dark.tga" label="" label_width="55"
left="150" name="mute_voice" tab_stop="false" toggle="true" width="25" />
<slider bottom_delta="-20" control_name="AudioLevelSFX" follows="left|top|right"
height="15" increment="0.05" initial_val="0.5" label="Sounds"
label_width="55" left="10" max_val="1" min_val="0" name="SFX Volume"
show_text="false" volume="true" width="180" />
<button bottom_delta="0" control_name="MuteSounds" follows="top|right" height="16"
image_selected="icn_speaker-muted_dark.tga"
image_unselected="icn_speaker_dark.tga" label="" label_width="55"
left="150" name="mute_sfx" tab_stop="false" toggle="true" width="25" />
<slider bottom_delta="-20" control_name="AudioLevelAmbient" follows="left|top|right"
height="15" increment="0.05" initial_val="0.5" label="Ambient"
label_width="55" left="10" max_val="1" min_val="0" name="Wind Volume"
show_text="false" volume="true" width="180" />
<button bottom_delta="0" control_name="MuteAmbient" follows="top|right" height="16"
image_selected="icn_speaker-muted_dark.tga"
image_unselected="icn_speaker_dark.tga" label="" label_width="55"
left="150" name="mute_wind" tab_stop="false" toggle="true" width="25" />
<slider bottom_delta="-20" control_name="AudioLevelUI" follows="left|top|right"
height="15" increment="0.05" initial_val="0.5" label="UI" label_width="55"
left="10" max_val="1" min_val="0" name="UI Volume" show_text="false"
volume="true" width="180" />
<button bottom_delta="0" control_name="MuteUI" follows="top|right" height="16"
image_selected="icn_speaker-muted_dark.tga"
image_unselected="icn_speaker_dark.tga" label="" label_width="55"
left="150" name="mute_ui" tab_stop="false" toggle="true" width="25" />
<panel border="false" height="160" label="Audio &amp; Video" name="Media panel" width="175">
<slider bottom_delta="-20" control_name="AudioLevelMaster" follows="top" height="15" increment="0.05" initial_val="0.5" label="Master" label_width="55" left="10" max_val="1" min_val="0" name="System Volume" can_edit_text="true" volume="true" width="218"/>
<button bottom_delta="0" control_name="MuteAudio" follows="top|right" height="16" image_selected="icn_speaker-muted_dark.tga" image_unselected="icn_speaker_dark.tga" label="" label_width="55" left="150" name="mute_audio" toggle="true" width="25"/>
<slider bottom_delta="-30" control_name="AudioLevelMusic" follows="top" height="15" increment="0.05" initial_val="0.5" label="Music" label_width="55" left="10" max_val="1" min_val="0" name="Music Volume" can_edit_text="true" volume="true" width="218"/>
<button bottom_delta="0" control_name="MuteMusic" follows="top|right" height="16" image_selected="icn_speaker-muted_dark.tga" image_unselected="icn_speaker_dark.tga" label="" label_width="55" left="150" name="mute_music" toggle="true" width="25"/>
<slider bottom_delta="-20" control_name="AudioLevelMedia" follows="top" height="15" increment="0.05" initial_val="0.5" label="Media" label_width="55" left="10" max_val="1" min_val="0" name="Media Volume" can_edit_text="true" volume="true" width="218"/>
<button bottom_delta="0" control_name="MuteMedia" follows="top|right" height="16" image_selected="icn_speaker-muted_dark.tga" image_unselected="icn_speaker_dark.tga" label="" label_width="55" left="150" name="mute_media" toggle="true" width="25"/>
<slider bottom_delta="-20" control_name="AudioLevelVoice" follows="top" height="15" increment="0.05" initial_val="0.5" label="Voice" label_width="55" left="10" max_val="1" min_val="0" name="Voice Volume" can_edit_text="true" volume="true" width="218"/>
<button bottom_delta="0" control_name="MuteVoice" follows="top|right" height="16" image_selected="icn_speaker-muted_dark.tga" image_unselected="icn_speaker_dark.tga" label="" label_width="55" left="150" name="mute_voice" tab_stop="false" toggle="true" width="25"/>
<slider bottom_delta="-20" control_name="AudioLevelSFX" follows="top" height="15" increment="0.05" initial_val="0.5" label="Sounds" label_width="55" left="10" max_val="1" min_val="0" name="SFX Volume" can_edit_text="true" volume="true" width="218"/>
<button bottom_delta="0" control_name="MuteSounds" follows="top|right" height="16" image_selected="icn_speaker-muted_dark.tga" image_unselected="icn_speaker_dark.tga" label="" label_width="55" left="150" name="mute_sfx" tab_stop="false" toggle="true" width="25"/>
<slider bottom_delta="-20" control_name="AudioLevelAmbient" follows="top" height="15" increment="0.05" initial_val="0.5" label="Ambient" label_width="55" left="10" max_val="1" min_val="0" name="Wind Volume" can_edit_text="true" volume="true" width="218"/>
<button bottom_delta="0" control_name="MuteAmbient" follows="top|right" height="16" image_selected="icn_speaker-muted_dark.tga" image_unselected="icn_speaker_dark.tga" label="" label_width="55" left="150" name="mute_wind" toggle="true" width="25"/>
<slider bottom_delta="-20" control_name="AudioLevelUI" follows="top" height="15" increment="0.05" initial_val="0.5" label="UI" label_width="55" left="10" max_val="1" min_val="0" name="UI Volume" can_edit_text="true" volume="true" width="218"/>
<button bottom_delta="0" control_name="MuteUI" follows="top|right" height="16" image_selected="icn_speaker-muted_dark.tga" image_unselected="icn_speaker_dark.tga" label="" label_width="55" left="150" name="mute_ui" toggle="true" width="25"/>
</panel>

243
indra/newview/skins/default/xui/en-us/panel_preferences_ascent_vanity.xml
View File

@@ -1,209 +1,54 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel top="20" left="10" height="400" width="512" follows="left|top|right|bottom"
border="true" label="Vanity" name="ascvan" enabled="true" mouse_opaque="true">
<tab_container label="Singularity Vanity" bottom="0" height="440" width="497" left="0"
name="Ascent Vanity" tab_min_width="90" tab_position="top">
<panel border="true" left="1" bottom="-190" height="180" width="500" mouse_opaque="true"
follows="left|top|right|bottom" label="General" name="General">
<check_box bottom_delta="-25" control_name="AscentStoreSettingsPerAccount" enabled="true"
follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
label="Where applicable, save Vanity settings per-account." left="10"
tool_tip="Saves settings per-account, allowing easier customization for alts."
mouse_opaque="true" name="use_account_settings_check" radio_style="false"
width="400" />
<check_box bottom_delta="-20" control_name="AscentDisableTeleportScreens" enabled="true"
follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
label="Hide the Teleport progress screens" left="10"
tool_tip="If checked, the viewer will hide the teleport progress screen, allowing you to continue to read IMs."
mouse_opaque="true" name="disable_tp_screen_check" radio_style="false"
width="400" />
<check_box bottom_delta="-20" control_name="OptionPlayTpSound" enabled="true"
follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
label="Play the Teleport sound when moving between sims" left="10"
tool_tip="Viewer will play the wooshing TP noise on teleport."
mouse_opaque="true" name="tp_sound_check" radio_style="false"
width="400" />
<check_box bottom_delta="-20" control_name="AscentDisableLogoutScreens" enabled="true"
follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
label="Hide the Login/Logout progress screens" left="10"
tool_tip="If checked, the viewer will hide the login/logout progress screen."
mouse_opaque="true" name="disable_logout_screen_check" radio_style="false"
width="400" />
<panel top="20" left="10" height="400" width="512" border="true" label="Vanity" name="ascvan">
<tab_container label="Singularity Vanity" bottom="0" height="440" width="497" name="Ascent Vanity" tab_min_width="90">
<panel border="true" left="1" bottom="-190" height="180" width="500" label="Main (General)" name="General">
<check_box bottom_delta="-25" control_name="AscentStoreSettingsPerAccount" follows="top" height="16" initial_value="true" label="Where applicable, save Vanity settings per-account." left="10" tool_tip="Saves settings per-account, allowing easier customization for alts." name="use_account_settings_check"/>
<check_box bottom_delta="-20" control_name="AscentDisableTeleportScreens" follows="top" height="16" initial_value="true" label="Hide the Teleport progress screens" tool_tip="If checked, the viewer will hide the teleport progress screen, allowing you to continue to read IMs." name="disable_tp_screen_check"/>
<check_box bottom_delta="-20" control_name="OptionPlayTpSound" follows="top" height="16" initial_value="true" label="Play the Teleport sound when moving between sims" tool_tip="Viewer will play the wooshing TP noise on teleport." name="tp_sound_check"/>
<check_box bottom_delta="-20" control_name="AscentDisableLogoutScreens" follows="top" height="16" initial_value="true" label="Hide the Login/Logout progress screens" tool_tip="If checked, the viewer will hide the login/logout progress screen." name="disable_logout_screen_check"/>
</panel>
<panel border="true" left="1" bottom="-190" height="180" width="500" mouse_opaque="true"
follows="left|top|right|bottom" label="Tags/Colors" name="TagsColors">
<panel border="true" left="1" bottom="-190" height="180" width="500" label="Tags/Colors" name="TagsColors">
<!-- Client tag options -->
<check_box bottom_delta="-25" control_name="AscentUseTag" enabled="true"
follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
label="Use Client Tag:" left="10"
tool_tip="Enabling this will show your client tag on your avatar name locally."
mouse_opaque="true" name="show_my_tag_check" radio_style="false"
width="400" />
<combo_box allow_text_entry="false" enabled="true" follows="left|top"
bottom_delta="-24" height="18" hidden="false" left_delta="24" max_chars="20" mouse_opaque="true"
tool_tip="The client tag (And subsequent color) to broadcast. Overridden locally by Custom Tag/Color."
name="tag_spoofing_combobox" width="130">
<combo_item type="string" length="1" enabled="true" name="Ascent"
value="f25263b7-6167-4f34-a4ef-af65213b2e39">
Singularity
</combo_item>
<check_box bottom_delta="-25" control_name="AscentUseTag" follows="top" height="16" initial_value="true" label="Use Client Tag:" left="10" tool_tip="Enabling this will show your client tag on your avatar name locally." name="show_my_tag_check"/>
<combo_box follows="top" bottom_delta="-24" height="18" left_delta="24" max_chars="32" tool_tip="The client tag (And subsequent color) to broadcast. Overridden locally by Custom Tag/Color." name="tag_spoofing_combobox" width="130">
<combo_item name="Singularity" value="f25263b7-6167-4f34-a4ef-af65213b2e39">Singularity</combo_item>
</combo_box>
<check_box bottom_delta="-23" control_name="AscentShowSelfTag" enabled="true"
follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
label="Display client tag to self" left_delta="-24"
tool_tip="Choose whether others see that you enjoy Singularity."
mouse_opaque="true" name="show_self_tag_check" radio_style="false"
width="400" />
<check_box bottom_delta="-20" control_name="AscentShowSelfTagColor" enabled="true"
follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
label="Display client tag color to self" left_delta="0"
tool_tip="Enabling this set your avatar name color to your client tag color or custom set color."
mouse_opaque="true" name="show_self_tag_color_check" radio_style="false"
width="400" />
<check_box bottom_delta="-20" control_name="AscentShowFriendsTag" enabled="true"
follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
label="Display friend client tags as (Friend)" left_delta="0"
tool_tip="Enabling this changes your friends' client tags to (Friend)."
mouse_opaque="true" name="show_friend_tag_check" radio_style="false"
width="400" />
<check_box bottom_delta="-23" control_name="AscentShowSelfTag" follows="top" height="16" initial_value="true" label="Display client tag to self" left_delta="-24" tool_tip="Choose whether others see that you enjoy Singularity." name="show_self_tag_check"/>
<check_box bottom_delta="-20" control_name="AscentShowSelfTagColor" follows="top" height="16" initial_value="true" label="Display client tag color to self" tool_tip="Enabling this set your avatar name color to your client tag color or custom set color." name="show_self_tag_color_check"/>
<check_box bottom_delta="-20" control_name="AscentShowFriendsTag" follows="top" height="16" initial_value="true" label="Display friend client tags as (Friend)" tool_tip="Enabling this changes your friends' client tags to (Friend)." name="show_friend_tag_check"/>
<!-- End of Left Side -->
<check_box bottom_delta="87" control_name="AscentUseCustomTag" enabled="true"
follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
label="Use a custom color and label (Local only)" left_delta="230"
tool_tip="Enabling this will let you set your own name tag to show up with your custom client and tag color. This only shows up to yourself."
mouse_opaque="true" name="customize_own_tag_check" radio_style="false"
width="400" />
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom_delta="-17" left_delta="25" drop_shadow_visible="true" enabled="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="10"
mouse_opaque="true" name="custom_tag_label_text" v_pad="0" width="394">
Label:
</text>
<line_editor bottom_delta="-6" enabled="true" follows="left|top" font="SansSerif"
height="18" left_delta="35" name="custom_tag_label_box"
tool_tip="The custom string you would like to replace your client tag with (Local only)"
width="100" />
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom_delta="6" left_delta="110" drop_shadow_visible="true" enabled="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="10"
mouse_opaque="true" name="custom_tag_color_text" v_pad="0" width="394">
Color:
</text>
<color_swatch border_color="0.45098 0.517647 0.607843 1" bottom_delta="-22"
can_apply_immediately="false" color="1 1 1 1"
enabled="true" follows="left|top" height="34" label="" left_delta="35"
mouse_opaque="true" name="custom_tag_color_swatch" control_name="AscentCustomTagColor"
tool_tip="The custom color you would like to replace your client color with (Local only)" width="30" />
<check_box bottom_delta="-8" control_name="AscentShowOthersTag" enabled="true"
follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
label="Display client tag for others" left_delta="-205"
tool_tip="Enabling this will show client tag names on others' avatar names."
mouse_opaque="true" name="show_other_tag_check" radio_style="false"
width="400" />
<check_box bottom_delta="-20" control_name="AscentShowOthersTagColor" enabled="true"
follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
label="Display client tag color for others" left_delta="0"
tool_tip="Enabling this sets others' avatar name color to their client's color."
mouse_opaque="true" name="show_client_tag_color_check" radio_style="false"
width="400" />
<check_box bottom_delta="-20" control_name="AscentShowIdleTime" enabled="true"
follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
label="Show Idle Time" left_delta="0"
tool_tip="Enabling this will show the amount of time an avatar has been idle."
mouse_opaque="true" name="show_idle_time_check" radio_style="false"
width="400" />
<check_box bottom_delta="-20" control_name="AscentUpdateTagsOnLoad" enabled="true"
follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
label="Automatically check website for updates to client definitions" left_delta="-230"
tool_tip="Enabling this will allow Singularity to download fresh definitions when needed."
mouse_opaque="true" name="update_tags_check" radio_style="false"
width="400" />
<button bottom_delta="0" control_name="ManualUpdate" name="update_clientdefs" follows="left|top"
label="Manual Update" height="18" left_delta="340" width="110"/>
<check_box bottom_delta="87" control_name="AscentUseCustomTag" follows="top" height="16" initial_value="true" label="Use a custom color and label (Local only)" left_delta="230" tool_tip="Enabling this will let you set your own name tag to show up with your custom client and tag color. This only shows up to yourself." name="customize_own_tag_check"/>
<text bottom_delta="-17" left_delta="25" follows="top" height="10" name="custom_tag_label_text">Label:</text>
<line_editor bottom_delta="-6" follows="top" font="SansSerif" height="18" left_delta="35" name="custom_tag_label_box" tool_tip="The custom string you would like to replace your client tag with (Local only)" width="100"/>
<text bottom_delta="6" left_delta="110" follows="top" height="10" name="custom_tag_color_text">Color:</text>
<color_swatch border_color="0.45098 0.517647 0.607843 1" bottom_delta="-22" can_apply_immediately="false" color="1 1 1 1" follows="top" height="34" left_delta="35" name="custom_tag_color_swatch" control_name="AscentCustomTagColor" tool_tip="The custom color you would like to replace your client color with (Local only)" width="30" />
<check_box bottom_delta="-8" control_name="AscentShowOthersTag" follows="top" height="16" initial_value="true" label="Display client tag for others" left_delta="-205" tool_tip="Enabling this will show client tag names on others' avatar names." name="show_other_tag_check"/>
<check_box bottom_delta="-20" control_name="AscentShowOthersTagColor" follows="top" height="16" initial_value="true" label="Display client tag color for others" left_delta="0" tool_tip="Enabling this sets others' avatar name color to their client's color." name="show_client_tag_color_check"/>
<check_box bottom_delta="-20" control_name="AscentShowIdleTime" follows="top" height="16" initial_value="true" label="Show Idle Time" tool_tip="Enabling this will show the amount of time an avatar has been idle." name="show_idle_time_check"/>
<check_box bottom_delta="-20" control_name="AscentUpdateTagsOnLoad" follows="top" height="16" initial_value="true" label="Automatically check website for updates to client definitions" left_delta="-230" tool_tip="Enabling this will allow Singularity to download fresh definitions when needed." name="update_tags_check"/>
<button bottom_delta="0" control_name="ManualUpdate" name="update_clientdefs" follows="top" label="Manual Update" height="18" left_delta="340" width="110"/>
<!-- End of Client Tag settings -->
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom_delta="-25" drop_shadow_visible="true" enabled="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="10" left="20"
mouse_opaque="true" name="effects_color_textbox" v_pad="0" width="394">
Color For My Effects:
</text>
<color_swatch border_color="0.45098 0.517647 0.607843 1" bottom_delta="-34"
can_apply_immediately="true" color="1 1 1 1" control_name="EffectColor"
enabled="true" follows="left|top" height="47" label="Effects" left_delta="138"
mouse_opaque="true" name="effect_color_swatch" width="44" />
<check_box bottom_delta="-20" control_name="AscentUseStatusColors" enabled="true"
follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
label="Use user status colors (Friend, Linden, etcetera below)" left="10"
tool_tip="Enabling this will show people who match specific criteria (Lindens, Estate owners, friends, muted people) with the color you've set below."
mouse_opaque="true" name="use_status_check" radio_style="false"
width="400" />
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom_delta="-20" drop_shadow_visible="true" enabled="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="10" left_delta="10"
mouse_opaque="true" name="friends_color_textbox" v_pad="0" width="394">
Color For:
(Radar, Tag, Minimap)
</text>
<color_swatch border_color="0.45098 0.517647 0.607843 1" bottom_delta="-34"
can_apply_immediately="true" color="1 1 1 1" control_name="AscentFriendColor"
enabled="true" follows="left|top" height="47" label="Friends" left_delta="138"
mouse_opaque="true" name="friend_color_swatch" width="44" tool_tip="Color of Friends" />
<color_swatch border_color="0.45098 0.517647 0.607843 1" bottom_delta="0"
can_apply_immediately="true" color="1 1 1 1" control_name="AscentEstateOwnerColor"
enabled="true" follows="left|top" height="47" label="Estate" left_delta="54"
mouse_opaque="true" name="estate_owner_color_swatch" width="44" tool_tip="Color of Estate Managers" />
<color_swatch border_color="0.45098 0.517647 0.607843 1" bottom_delta="0"
can_apply_immediately="true" color="0.6 0.6 1 1" control_name="AscentLindenColor"
enabled="true" follows="left|top" height="47" label="Lindens" left_delta="54"
mouse_opaque="true" name="linden_color_swatch" width="44" tool_tip="Color of Lindens" />
<color_swatch border_color="0.45098 0.517647 0.607843 1" bottom_delta="0"
can_apply_immediately="true" color="0.8 1 1 1" control_name="AscentMutedColor"
enabled="true" follows="left|top" height="47" label="Muted" left_delta="54"
mouse_opaque="true" name="muted_color_swatch" width="44" tool_tip="Color of Muted" />
<text bottom_delta="-25" follows="top" height="10" left="20" name="effects_color_textbox">Color For My Effects:</text>
<color_swatch border_color="0.45098 0.517647 0.607843 1" bottom_delta="-34" can_apply_immediately="true" color="1 1 1 1" control_name="EffectColor" follows="top" height="47" label="Effects" left_delta="138" name="effect_color_swatch" width="44"/>
<check_box bottom_delta="-20" control_name="AscentUseStatusColors" follows="top" height="16" initial_value="true" label="Use user status colors (Friend, Linden, etcetera below)" left="10" tool_tip="Enabling this will show people who match specific criteria (Lindens, Estate owners, friends, muted people) with the color you've set below." name="use_status_check"/>
<text bottom_delta="-20" follows="top" height="10" left_delta="10" name="friends_color_textbox">Color For:
(Radar, Tag, Minimap)</text>
<color_swatch border_color="0.45098 0.517647 0.607843 1" bottom_delta="-34" can_apply_immediately="true" color="1 1 1 1" control_name="AscentFriendColor" follows="top" height="47" label="Friends" left_delta="138" name="friend_color_swatch" width="44" tool_tip="Color of Friends"/>
<color_swatch border_color="0.45098 0.517647 0.607843 1" bottom_delta="0" can_apply_immediately="true" color="1 1 1 1" control_name="AscentEstateOwnerColor" follows="top" height="47" label="Estate" left_delta="54" name="estate_owner_color_swatch" width="44" tool_tip="Color of Estate Managers"/>
<color_swatch border_color="0.45098 0.517647 0.607843 1" bottom_delta="0" can_apply_immediately="true" color="0.6 0.6 1 1" control_name="AscentLindenColor" follows="top" height="47" label="Lindens" left_delta="54" name="linden_color_swatch" width="44" tool_tip="Color of Lindens"/>
<color_swatch border_color="0.45098 0.517647 0.607843 1" bottom_delta="0" can_apply_immediately="true" color="0.8 1 1 1" control_name="AscentMutedColor" follows="top" height="47" label="Muted" left_delta="54" name="muted_color_swatch" width="44" tool_tip="Color of Muted"/>
</panel>
<panel border="true" left="1" bottom="-190" height="180" width="500" mouse_opaque="true"
follows="left|top|right|bottom" label="Body Dynamics" name="Body Dynamics">
<check_box bottom_delta="-25" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
label="Enable enhanced physics on avatar breasts" left="10" mouse_opaque="true" name="EmBreastsToggle"
control_name="EmeraldBreastPhysicsToggle" width="126"/>
<slider bottom_delta="-20" left="10" name="EmeraldBoobMass" control_name="EmeraldBoobMass"
decimal_digits="0" enabled="true" follows="left|top" height="18" increment="1"
label="Breast mass:" label_width="100" max_val="100" min_val="1" mouse_opaque="true"
show_text="true" width="250" auto_resize="false" tool_tip=""/>
<slider bottom_delta="-20" left_delta="0" name="EmeraldBoobHardness" control_name="EmeraldBoobHardness"
decimal_di:wqgits="0" enabled="true" follows="left|top" height="18" increment="1"
label="Breast rebound:" label_width="100" max_val="100" min_val="1" mouse_opaque="true"
show_text="true" width="250" auto_resize="false" tool_tip=""/>
<slider bottom_delta="-20" left_delta="0" name="EmeraldBoobVelMax" control_name="EmeraldBoobVelMax"
decimal_digits="0" enabled="true" follows="left|top" height="18" increment="1"
label="Breast max vel:" label_width="100" max_val="100" min_val="1" mouse_opaque="true"
show_text="true" width="250" auto_resize="false" tool_tip=""/>
<slider bottom_delta="-20" left_delta="0" name="EmeraldBoobFriction" control_name="EmeraldBoobFriction"
decimal_digits="0" enabled="true" follows="left|top" height="18" increment="1"
label="Breast friction:" label_width="100" max_val="100" min_val="1" mouse_opaque="true"
show_text="true" width="250" auto_resize="false" tool_tip=""/>
<slider bottom_delta="-20" left_delta="0" name="EmeraldBoobVelMin" control_name="EmeraldBoobVelMin"
decimal_digits="0" enabled="true" follows="left|top" height="18" increment="1"
label="Breast min vel:" label_width="100" max_val="100" min_val="1" mouse_opaque="true"
show_text="true" width="250" auto_resize="false" tool_tip=""/>
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom_delta="-20" drop_shadow_visible="true" enabled="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="15" left="10"
mouse_opaque="true" name="av_mod_textbox" v_pad="0" width="394">
Avatar Offset Modifiers
</text>
<spinner bottom_delta="-20" decimal_digits="5" follows="left|top" height="16" increment="0.05"
label="X Modifier" label_width="65" left_delta="5" max_val="0.15" min_val="-0.15"
mouse_opaque="true" name="X Modifier" width="128" control_name="AscentAvatarXModifier"
tool_tip="Use this to manipulate, to a degree, your avatar bounding box. This can be used to distort orbiters, or to raise you up or down without altering your shape."/>
<spinner bottom_delta="-20" decimal_digits="5" follows="left|top" height="16" increment="0.05"
label="Y Modifier" label_width="65" left_delta="0" max_val="0.20" min_val="-0.20"
mouse_opaque="true" name="Y Modifier" width="128" control_name="AscentAvatarYModifier"
tool_tip="Use this to manipulate, to a degree, your avatar bounding box. This can be used to distort orbiters, or to raise you up or down without altering your shape."/>
<spinner bottom_delta="-20" decimal_digits="5" follows="left|top" height="16" increment="0.1"
label="Z Modifier" label_width="65" left_delta="0" max_val="5.0" min_val="-5.0"
mouse_opaque="true" name="Z Modifier" width="128" control_name="AscentAvatarZModifier"
tool_tip="Use this to manipulate, to a degree, your avatar bounding box. This can be used to distort orbiters, or to raise you up or down without altering your shape."/>
<panel border="true" left="1" bottom="-190" height="180" width="500" label="Body Dynamics" name="Body Dynamics">
<check_box bottom_delta="-25" follows="top" height="16" label="Enable enhanced physics on avatar breasts" left="10" name="EmBreastsToggle" control_name="EmeraldBreastPhysicsToggle" tool_tip="You must hit apply before these controls will activate or deactivate"/>
<slider bottom_delta="-20" left="10" name="EmeraldBoobMass" control_name="EmeraldBoobMass" decimal_digits="0" follows="top" height="18" increment="1" label="Breast mass:" label_width="100" max_val="100" min_val="1" can_edit_text="true" width="250"/>
<slider bottom_delta="-20" left_delta="0" name="EmeraldBoobHardness" control_name="EmeraldBoobHardness" decimal_digits="0" follows="top" height="18" increment="1" label="Breast rebound:" label_width="100" max_val="100" min_val="1" can_edit_text="true" width="250"/>
<slider bottom_delta="-20" name="EmeraldBoobVelMax" control_name="EmeraldBoobVelMax" decimal_digits="0" follows="top" height="18" increment="1" label="Breast max vel:" label_width="100" max_val="100" min_val="1" can_edit_text="true" width="250"/>
<slider bottom_delta="-20" name="EmeraldBoobFriction" control_name="EmeraldBoobFriction" decimal_digits="0" follows="top" height="18" increment="1" label="Breast friction:" label_width="100" max_val="100" min_val="1" can_edit_text="true" width="250"/>
<slider bottom_delta="-20" name="EmeraldBoobVelMin" control_name="EmeraldBoobVelMin" decimal_digits="0" follows="top" height="18" increment="1" label="Breast min vel:" label_width="100" max_val="100" min_val="1" can_edit_text="true" width="250"/>
<text bottom_delta="-20" height="15" left="10" name="av_mod_textbox" follows="top">Avatar Offset Modifiers</text>
<spinner bottom_delta="-20" decimal_digits="5" follows="top" height="16" increment="0.05" label="X Modifier" label_width="65" left_delta="5" max_val="0.15" min_val="-0.15" name="X Modifier" width="128" control_name="AscentAvatarXModifier" tool_tip="Use this to manipulate, to a degree, your avatar bounding box. This can be used to distort orbiters, or to raise you up or down without altering your shape."/>
<spinner bottom_delta="-20" decimal_digits="5" follows="top" height="16" increment="0.05" label="Y Modifier" label_width="65" max_val="0.20" min_val="-0.20" name="Y Modifier" width="128" control_name="AscentAvatarYModifier" tool_tip="Use this to manipulate, to a degree, your avatar bounding box. This can be used to distort orbiters, or to raise you up or down without altering your shape."/>
<spinner bottom_delta="-20" decimal_digits="5" follows="top" height="16" increment="0.1" label="Z Modifier" label_width="65" max_val="5.0" min_val="-5.0" name="Z Modifier" width="128" control_name="AscentAvatarZModifier" tool_tip="Use this to manipulate, to a degree, your avatar bounding box. This can be used to distort orbiters, or to raise you up or down without altering your shape."/>
</panel>
</tab_container>
</panel>

82
indra/newview/skins/default/xui/en-us/panel_preferences_audio.xml
View File

@@ -1,70 +1,16 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel border="true" bottom="-409" enabled="true" follows="left|top|right|bottom"
height="408" label="Audio &amp; Video" left="102" mouse_opaque="true"
name="Media panel" width="517">
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="-22" drop_shadow_visible="true" enabled="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="12" left="10"
mouse_opaque="true" name="muting_text" v_pad="0" width="128">
Volume:
</text>
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="-215" drop_shadow_visible="true" enabled="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="12" left="10"
mouse_opaque="true" name="streaming_prefs_text" v_pad="0" width="128">
Streaming Preferences:
</text>
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="-300" drop_shadow_visible="true" enabled="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="12" left="10"
mouse_opaque="true" name="audio_prefs_text" v_pad="0" width="128">
Audio Preferences:
</text>
<panel border="true" bottom="-195" enabled="true" filename="panel_audio.xml"
follows="left|top|right|bottom" height="180" label="Volume" left="148"
mouse_opaque="true" name="Volume Panel" width="260" />
<check_box bottom="-220" control_name="AudioStreamingMusic" enabled="true"
follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
label="Play Streaming Music When Available (uses more bandwidth)"
left="142" mouse_opaque="true" name="streaming_music" radio_style="false"
width="339" />
<check_box bottom_delta="-20" control_name="AudioStreamingVideo" enabled="true"
follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
label="Play Streaming Media When Available (uses more bandwidth)"
left="142" mouse_opaque="true" name="streaming_video" radio_style="false"
width="338" />
<check_box bottom_delta="-20" control_name="ParcelMediaAutoPlayEnable" enabled="true"
follows="left|top" font="SansSerifSmall" height="16"
initial_value="true" label="Automatically play media" left="162"
mouse_opaque="true" name="auto_streaming_video" radio_style="false"
width="338" />
<check_box bottom_delta="-20" control_name="MediaEnableFilter" enabled="true"
follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
label="Ask for permission (enables filtering)"
left="162" mouse_opaque="true" name="streaming_video" radio_style="false"
width="338" />
<check_box bottom_delta="-25" control_name="MuteWhenMinimized" enabled="true"
follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
label="Mute Audio When Window Minimized" left="142" mouse_opaque="true"
name="mute_when_minimized" radio_style="false" width="215" />
<slider bottom_delta="-20" control_name="AudioLevelDoppler" edit_text="true"
enabled="true" follows="left|top" height="15" increment="0.1"
initial_val="1" label="Doppler Effect" label_width="100" left="148"
max_val="2" min_val="0" mouse_opaque="true" name="Doppler Effect"
show_text="true" width="250" />
<slider bottom_delta="-20" control_name="AudioLevelRolloff" edit_text="true"
enabled="true" follows="left|top" height="15" increment="0.1"
initial_val="1" label="Rolloff Factor" label_width="100" left="148"
max_val="2" min_val="0" mouse_opaque="true" name="Rolloff Factor"
show_text="true" width="250" />
<spinner bottom_delta="-20" control_name="UISndMoneyChangeThreshold" decimal_digits="0"
enabled="true" follows="left|top" height="16" increment="10"
initial_val="10" label="[CURRENCY] change threshold:" label_width="128" left="148"
max_val="10000" min_val="0" mouse_opaque="true" name="currency_change_threshold"
width="192" />
<spinner bottom_delta="-20" control_name="UISndHealthReductionThreshold"
decimal_digits="0" enabled="true" follows="left|top" height="16"
increment="10" initial_val="20" label="Health Change Threshold"
label_width="128" left="148" max_val="10000" min_val="0"
mouse_opaque="true" name="Health Change Threshold" width="192" />
<panel border="true" bottom="-409" height="408" label="Audio &amp; Video" left="102" name="Media panel" width="517">
<text bottom="-22" height="12" left="10" name="muting_text">Volume:</text>
<text bottom="-215" name="streaming_prefs_text">Streaming Preferences:</text>
<text bottom="-300" height="12" name="audio_prefs_text">Audio Preferences:</text>
<panel border="true" bottom="-195" filename="panel_audio.xml" height="180" label="Volume" left="148" name="Volume Panel" width="260"/>
<check_box bottom="-220" control_name="AudioStreamingMusic" height="16" initial_value="true" label="Play Streaming Music When Available (uses more bandwidth)" left="142" name="streaming_music"/>
<check_box bottom_delta="-20" control_name="AudioStreamingVideo" follows="top" height="16" initial_value="true" label="Play Streaming Media When Available (uses more bandwidth)" name="streaming_video"/>
<check_box bottom_delta="-20" control_name="ParcelMediaAutoPlayEnable" follows="top" height="16" initial_value="true" label="Automatically play media" left="162" name="auto_streaming_video"/>
<check_box bottom_delta="-20" control_name="MediaEnableFilter" follows="top" height="16" initial_value="true" label="Ask for permission (enables filtering)" name="streaming_video"/>
<check_box bottom_delta="-25" control_name="MuteWhenMinimized" follows="top" height="16" initial_value="true" label="Mute Audio When Window Minimized" left="142" name="mute_when_minimized"/>
<slider bottom_delta="-20" control_name="AudioLevelDoppler" edit_text="true" follows="top" height="15" increment="0.1" initial_val="1" label="Doppler Effect" label_width="100" left="148" max_val="2" min_val="0" name="Doppler Effect" show_text="true" width="250" />
<slider bottom_delta="-20" control_name="AudioLevelRolloff" edit_text="true" follows="top" height="15" increment="0.1" initial_val="1" label="Rolloff Factor" label_width="100" max_val="2" min_val="0" name="Rolloff Factor" width="250"/>
<spinner bottom_delta="-20" control_name="UISndMoneyChangeThreshold" decimal_digits="0" follows="top" height="16" increment="10" initial_val="10" label="[CURRENCY] change threshold:" label_width="128" max_val="10000" min_val="0" name="currency_change_threshold" width="192"/>
<spinner bottom_delta="-20" control_name="UISndHealthReductionThreshold" decimal_digits="0" follows="top" height="16" increment="10" initial_val="20" label="Health Change Threshold" label_width="128" max_val="10000" min_val="0" name="Health Change Threshold" width="192" />
</panel>

284
indra/newview/skins/default/xui/en-us/panel_preferences_chat.xml
View File

@@ -1,232 +1,60 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel border="true" bottom="-499" enabled="true" follows="left|top|right|bottom"
height="548" label="Text Chat" left="102" mouse_opaque="true" name="chat"
width="517">
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="-20" drop_shadow_visible="true" enabled="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="10" left="12"
mouse_opaque="false" name="text_box" v_pad="0" width="128">
Chat Font Size:
</text>
<radio_group bottom="-40" draw_border="true" enabled="true"
follows="left|top" height="30" left="148" mouse_opaque="true"
name="chat_font_size" width="331">
<radio_item type="string" length="1" bottom="-24" enabled="true" height="16" left="0" mouse_opaque="true"
name="radio" width="98">
Small
</radio_item>
<radio_item type="string" length="1" bottom="-24" enabled="true" height="16" left="110" mouse_opaque="true"
name="radio2" width="98">
Medium
</radio_item>
<radio_item type="string" length="1" bottom="-24" enabled="true" height="16" left="220" mouse_opaque="true"
name="radio3" width="98">
Large
</radio_item>
<panel border="true" bottom="-499" height="548" label="Text Chat" left="102" name="chat" width="517">
<text bottom="-20" height="10" left="12" name="text_box">Chat Font Size:</text>
<radio_group bottom="-40" draw_border="true" height="30" left="148" name="chat_font_size" width="290">
<radio_item bottom="-24" height="16" left="0" name="radio" width="98">Small</radio_item>
<radio_item bottom="-24" height="16" left="110" name="radio2" width="98">Medium</radio_item>
<radio_item bottom="-24" height="16" left="220" name="radio3" width="98">Large</radio_item>
</radio_group>
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="-64" drop_shadow_visible="true" enabled="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="10" left="12"
mouse_opaque="false" name="text_box2" v_pad="0" width="128">
Chat Color:
</text>
<color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-100"
can_apply_immediately="true" color="1 1 1 1" control_name="UserChatColor"
enabled="true" follows="left|top" height="47" label="You" left="148"
mouse_opaque="true" name="user" width="44" />
<color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-100"
can_apply_immediately="true" color="1 1 1 1" control_name="AgentChatColor"
enabled="true" follows="left|top" height="47" label="Others" left_delta="54"
mouse_opaque="true" name="agent" width="44" />
<color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-100"
can_apply_immediately="true" color="0.6 0.6 1 1"
enabled="true" follows="left|top" height="47" label="IM" left_delta="54"
mouse_opaque="true" name="im" width="44" />
<color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-100"
can_apply_immediately="true" color="0.8 1 1 1"
enabled="true" follows="left|top" height="47" label="System" left_delta="54"
mouse_opaque="true"
name="system" width="44" />
<color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-100"
can_apply_immediately="true" color="0.82 0.82 0.99 1"
control_name="ScriptErrorColor" enabled="true" follows="left|top"
height="47" label="Errors" left_delta="54" mouse_opaque="true"
name="script_error" width="44" />
<color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-150"
can_apply_immediately="true" color="0.7 0.9 0.7 1"
control_name="ObjectChatColor" enabled="true" follows="left|top"
height="47" label="Objects" left="148" mouse_opaque="true"
name="objects" width="44" />
<color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-150"
can_apply_immediately="true" color="0.7 0.9 0.7 1"
enabled="true" follows="left|top"
height="47" label="Owner" left_delta="54" mouse_opaque="true" name="owner"
width="44" />
<color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-150"
can_apply_immediately="true" color="0 0 0 1"
enabled="true" follows="left|top"
height="47" label="Bubble" left_delta="54" mouse_opaque="true"
name="background" width="44" />
<color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-150"
can_apply_immediately="true" color="0.6 0.6 1 1"
enabled="true" follows="left|top" height="47"
label="URLs" left_delta="54" mouse_opaque="true" name="links" width="44" />
<text bottom="-64" height="10" left="12" name="text_box2">Chat Color:</text>
<color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-100" can_apply_immediately="true" color="1 1 1 1" control_name="UserChatColor" follows="top" height="47" label="You" left="148" name="user" width="44"/>
<color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-100" can_apply_immediately="true" color="1 1 1 1" control_name="AgentChatColor" follows="top" height="47" label="Others" left_delta="54" name="agent" width="44"/>
<color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-100" can_apply_immediately="true" color="0.6 0.6 1 1" follows="top" height="47" label="IM" left_delta="54" name="im" width="44"/>
<color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-100" can_apply_immediately="true" color="0.8 1 1 1" follows="top" height="47" label="System" left_delta="54" name="system" width="44"/>
<color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-100" can_apply_immediately="true" color="0.82 0.82 0.99 1" control_name="ScriptErrorColor" enabled="true" follows="top" height="47" label="Errors" left_delta="54" name="script_error" width="44"/>
<color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-150" can_apply_immediately="true" color="0.7 0.9 0.7 1" control_name="ObjectChatColor" height="47" label="Objects" left="148" mouse_opaque="true" name="objects" width="44"/>
<color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-150" can_apply_immediately="true" color="0.7 0.9 0.7 1" follows="top" height="47" label="Owner" left_delta="54" name="owner" width="44"/>
<color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-150" can_apply_immediately="true" color="0 0 0 1" follows="top" height="47" label="Bubble" left_delta="54" name="background" width="44"/>
<color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-150" can_apply_immediately="true" color="0.6 0.6 1 1" follows="top" height="47" label="URLs" left_delta="54" name="links" width="44"/>
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom_delta="-26" drop_shadow_visible="true" enabled="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="10" left="12"
mouse_opaque="false" name="text_box3" v_pad="0" width="135">
Chat Console:
</text>
<spinner bottom_delta="-8" control_name="ChatPersistTime" decimal_digits="0"
enabled="true" follows="left|top" height="16" increment="1"
initial_val="10" label="Fade chat after" label_width="80" left="148"
max_val="60" min_val="2" mouse_opaque="true" name="fade_chat_time"
width="130" />
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom_delta="6" drop_shadow_visible="true" enabled="true"
follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
height="10" left="282" mouse_opaque="false" name="text_box4" v_pad="0"
width="80">
(seconds)
</text>
<spinner bottom_delta="-6" decimal_digits="0"
enabled="true" follows="left|top" height="16" increment="1"
initial_val="10" left="340" max_val="50" min_val="1" mouse_opaque="true"
name="max_chat_count" width="60" />
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom_delta="6" drop_shadow_visible="true" enabled="true"
follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
height="10" left="405" mouse_opaque="false" name="text_box5" v_pad="0"
width="60">
(# lines)
</text>
<slider bottom_delta="-25" can_edit_text="false" control_name="ConsoleBackgroundOpacity"
decimal_digits="3" enabled="true" follows="left|top" height="12"
increment="0.05" initial_val="1" label="Opacity" left="148" max_val="1"
min_val="0" mouse_opaque="true" name="console_opacity" show_text="true"
value="0.4" width="200" />
<check_box bottom_delta="-25" control_name="ChatFullWidth" enabled="true"
follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
label="Use full screen width (Requires restart)" left="148"
mouse_opaque="true" name="chat_full_width_check" radio_style="false"
width="239" />
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom_delta="-22" drop_shadow_visible="true" enabled="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="10" left="12"
mouse_opaque="false" name="text_box6" v_pad="0" width="135">
Chat Options:
</text>
<check_box bottom_delta="-8" enabled="true"
follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
label="Close chat bar after hitting return" left="148" mouse_opaque="true"
name="close_chat_on_return_check" radio_style="false" width="237" />
<check_box bottom_delta="-20" enabled="true"
follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
label="Arrow keys always move avatar when chatting" left="148"
mouse_opaque="true" name="arrow_keys_move_avatar_check" radio_style="false"
width="237" />
<check_box bottom_delta="-20" enabled="true"
follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
label="Show timestamps in Local Chat" left="148" mouse_opaque="true"
name="show_timestamps_check" radio_style="false" width="237" />
<check_box bottom_delta="-20" control_name="ScriptErrorsAsChat" enabled="true"
follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
label="Show script errors and warnings as regular chat" left="148"
mouse_opaque="true" name="script_errors_as_chat" radio_style="false"
width="275" />
<check_box bottom_delta="-20" enabled="true" control_name="PlayTypingAnim"
follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
label="Play typing animation when chatting" left="148" mouse_opaque="true"
name="play_typing_animation" radio_style="false" width="237" />
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="-365" drop_shadow_visible="true" enabled="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="10" left="12"
mouse_opaque="false" name="text_box7" v_pad="0" width="128">
Bubble Chat:
</text>
<check_box bottom="-370" control_name="UseChatBubbles" enabled="true" follows="left|top"
font="SansSerifSmall" height="16" initial_value="false"
label="Show chat bubbles" left="148" mouse_opaque="true"
name="bubble_text_chat" radio_style="false" width="237" />
<slider bottom="-386" can_edit_text="false" control_name="ChatBubbleOpacity"
decimal_digits="3" enabled="true" follows="left|top" height="12"
increment="0.05" initial_val="1" label="Opacity" left="148" max_val="1"
min_val="0" mouse_opaque="true" name="bubble_chat_opacity" show_text="true"
value="0.5" width="200" />
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="-410" drop_shadow_visible="true" enabled="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="10" left="12"
mouse_opaque="false" name="text_translate_chat" v_pad="0" width="128">
Translate Chat:
</text>
<check_box bottom="-417" control_name="TranslateChat" enabled="true" follows="left|top"
font="SansSerifSmall" height="16" initial_value="false"
label="Use machine translation while chatting (powered by Google)" left="148" mouse_opaque="true"
name="translate_chat" radio_style="false" width="237" />
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="-432" drop_shadow_visible="true" enabled="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="10" left="149"
mouse_opaque="false" name="text_translate_chat" v_pad="0" width="160">
Translate into this language:
</text>
<combo_box allow_text_entry="true" bottom="-438" enabled="true"
follows="left|top" height="16" left_delta="183" max_chars="135"
mouse_opaque="true" name="translate_language_combobox" width="146">
<combo_item type="string" length="1" enabled="true" name="System Default Language" value="default">
System Default
</combo_item>
<combo_item type="string" length="1" enabled="true" name="English" value="en">
English
</combo_item>
<!-- After "System Default" and "English", please keep the rest of these combo_items in alphabetical order by the first character in the string. -->
<combo_item type="string" length="1" enabled="true" name="Danish" value="da">
Dansk (Danish)
</combo_item>
<combo_item type="string" length="1" enabled="true" name="Deutsch(German)" value="de">
Deutsch (German)
</combo_item>
<combo_item type="string" length="1" enabled="true" name="Spanish" value="es">
Español (Spanish)
</combo_item>
<combo_item type="string" length="1" enabled="true" name="French" value="fr">
Français (French)
</combo_item>
<combo_item type="string" length="1" enabled="true" name="Italian" value="it">
Italiano (Italian)
</combo_item>
<combo_item type="string" length="1" enabled="true" name="Hungarian" value="hu">
Magyar (Hungarian)
</combo_item>
<combo_item type="string" length="1" enabled="true" name="Dutch" value="nl">
Nederlands (Dutch)
</combo_item>
<combo_item type="string" length="1" enabled="true" name="Polish" value="pl">
Polski (Polish)
</combo_item>
<combo_item type="string" length="1" enabled="true" name="Portugese" value="pt">
Portugués (Portuguese)
</combo_item>
<combo_item type="string" length="1" enabled="true" name="Russian" value="ru">
Русский (Russian)
</combo_item>
<combo_item type="string" length="1" enabled="true" name="Turkish" value="tr">
Türkçe (Turkish)
</combo_item>
<combo_item type="string" length="1" enabled="true" name="Ukrainian" value="uk">
Українська (Ukrainian)
</combo_item>
<combo_item type="string" length="1" enabled="true" name="Chinese" value="zh">
中文 (简体) (Chinese)
</combo_item>
<combo_item type="string" length="1" enabled="true" name="(Japanese)" value="ja">
日本語 (Japanese)
</combo_item>
<combo_item type="string" length="1" enabled="true" name="(Korean)" value="ko">
한국어 (Korean)
</combo_item>
</combo_box>
<text bottom_delta="-26" follows="top" height="10" left="12" name="text_box3">Chat Console:</text>
<spinner bottom_delta="-8" control_name="ChatPersistTime" decimal_digits="0" follows="top" height="16" increment="1" initial_val="10" label="Fade chat after" label_width="80" left="148" max_val="60" min_val="2" name="fade_chat_time" width="130"/>
<text bottom_delta="6" follows="top" height="10" left="282" name="text_box4">(seconds)</text>
<spinner bottom_delta="-6" decimal_digits="0" follows="top" height="16" increment="1" initial_val="10" left="340" max_val="50" min_val="1" name="max_chat_count" width="60"/>
<text bottom_delta="6" follows="left|top" height="10" left="405" name="text_box5">(# lines)</text>
<slider bottom_delta="-25" control_name="ConsoleBackgroundOpacity" follows="top" height="12" increment="0.05" initial_val="1" label="Opacity" left="148" max_val="1" min_val="0" name="console_opacity" value="0.4" width="200"/>
<check_box bottom_delta="-25" control_name="ChatFullWidth" follows="top" height="16" initial_value="false" label="Use full screen width (Requires restart)" name="chat_full_width_check"/>
<text bottom_delta="-22" height="10" left="12" mouse_opaque="false" name="text_box6" v_pad="0" width="135">Chat Options:</text>
<check_box bottom_delta="-8" follows="top" height="16" initial_value="false" label="Close chat bar after hitting return" left="148" name="close_chat_on_return_check"/>
<check_box bottom_delta="-20" follows="top" height="16" initial_value="false" label="Arrow keys always move avatar when chatting" name="arrow_keys_move_avatar_check"/>
<check_box bottom_delta="-20" follows="top" height="16" initial_value="false" label="Show timestamps in Local Chat" name="show_timestamps_check"/>
<check_box bottom_delta="-20" control_name="ScriptErrorsAsChat" follows="top" height="16" initial_value="false" label="Show script errors and warnings as regular chat" name="script_errors_as_chat"/>
<check_box bottom_delta="-20" control_name="PlayTypingAnim" follows="top" height="16" initial_value="true" label="Play typing animation when chatting" name="play_typing_animation"/>
<text bottom="-365" height="10" left="12" name="text_box7">Bubble Chat:</text>
<check_box bottom="-370" control_name="UseChatBubbles" height="16" initial_value="false" label="Show chat bubbles" left="148" name="bubble_text_chat"/>
<slider bottom="-386" can_edit_text="false" control_name="ChatBubbleOpacity" height="12" increment="0.05" initial_val="1" label="Opacity" max_val="1" min_val="0" name="bubble_chat_opacity" value="0.5" width="200"/>
<!--
<text bottom="-410" height="10" left="12" name="text_translate_chat">Translate Chat:</text>
<check_box bottom="-417" control_name="TranslateChat" height="16" initial_value="false" label="Use machine translation while chatting (powered by Google)" left="148" name="translate_chat"/>
<text bottom="-432" height="10" left="149" name="text_translate_chat">Translate into this language:</text>
<combo_box allow_text_entry="true" bottom="-438" follows="top" height="16" left_delta="183" max_chars="135" name="translate_language_combobox" width="146">
<combo_item name="System Default Language" value="default">System Default</combo_item>
<combo_item name="English" value="en">English</combo_item>
<!- After "System Default" and "English", please keep the rest of these combo_items in alphabetical order by the first character in the string. ->
<combo_item name="Danish" value="da">Dansk (Danish)</combo_item>
<combo_item name="Deutsch(German)" value="de">Deutsch (German)</combo_item>
<combo_item name="Spanish" value="es">Español (Spanish)</combo_item>
<combo_item name="French" value="fr">Français (French)</combo_item>
<combo_item name="Italian" value="it">Italiano (Italian)</combo_item>
<combo_item name="Hungarian" value="hu">Magyar (Hungarian)</combo_item>
<combo_item name="Dutch" value="nl">Nederlands (Dutch)</combo_item>
<combo_item name="Polish" value="pl">Polski (Polish)</combo_item>
<combo_item name="Portugese" value="pt">Portugués (Portuguese)</combo_item>
<combo_item name="Russian" value="ru">Русский (Russian)</combo_item>
<combo_item name="Turkish" value="tr">Türkçe (Turkish)</combo_item>
<combo_item name="Ukrainian" value="uk">Українська (Ukrainian)</combo_item>
<combo_item name="Chinese" value="zh">中文 (简体) (Chinese)</combo_item>
<combo_item name="(Japanese)" value="ja">日本語 (Japanese)</combo_item>
<combo_item name="(Korean)" value="ko">한국어 (Korean)</combo_item>
</combo_box>-->
</panel>

304
indra/newview/skins/default/xui/en-us/panel_preferences_general.xml
View File

@@ -1,249 +1,71 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel border="true" bottom="-409" enabled="true" follows="left|top|right|bottom"
height="408" label="General" left="102" mouse_opaque="true"
name="general_panel" width="517">
<radio_group bottom="-45" draw_border="false" follows="left|top" height="40" left="151"
name="default_start_location" width="220">
<radio_item bottom="-20" height="20" left="0" name="MyHome" width="50"
tool_tip="Log into my home location by default.">
My Home
</radio_item>
<radio_item bottom="-20" height="20" left="100" name="MyLastLocation" width="50"
tool_tip="Log into my last location by default.">
My Last Location
</radio_item>
<panel border="true" bottom="-409" height="408" label="General" left="102" name="general_panel" width="517">
<radio_group bottom="-44" height="40" left="109" name="default_start_location" width="199">
<radio_item bottom="-20" height="20" name="MyHome" tool_tip="Log into my home location by default.">My Home</radio_item>
<radio_item bottom="-20" height="20" left="93" name="MyLastLocation" tool_tip="Log into my last location by default.">My Last Location</radio_item>
</radio_group>
<check_box bottom="-44" enabled="true" follows="left|top"
font="SansSerifSmall" height="16" initial_value="true"
label="Show Start Location on Login Screen" left="151" mouse_opaque="true"
name="show_location_checkbox" radio_style="false" width="256" />
<combo_box bottom_delta="-25" follows="left|top" height="18" left="155"
mouse_opaque="true" name="fade_out_combobox" width="146">
<combo_item name="Never" value="Never">
Never
</combo_item>
<combo_item name="Show Temporarily" value="Show Temporarily">
Show Temporarily
</combo_item>
<combo_item name="Always" value="Always">
Always
</combo_item>
<check_box bottom="-42" height="16" initial_value="true" label="Show Start Location on Login Screen" name="show_location_checkbox"/>
<combo_box bottom_delta="-27" follows="top" height="18" left="103" name="fade_out_combobox" width="111">
<combo_item name="Never" value="Never">Never</combo_item>
<combo_item name="Show Temporarily" value="Show Temporarily">Show Temporarily</combo_item>
<combo_item name="Always" value="Always">Always</combo_item>
</combo_box>
<combo_box bottom_delta="0" follows="left|top" height="18" left="330"
mouse_opaque="true" name="namesystem_combobox" width="146">
<combo_item name="Old Names" value="Old Names">
Old Names
</combo_item>
<combo_item name="Display Names (with Username)" value="Display Names (with Username)">
Display Names (with Username)
</combo_item>
<combo_item name="Display Names only" value="Display Names only">
Display Names only
</combo_item>
<combo_box bottom_delta="0" follows="top" height="18" left="220" name="namesystem_combobox" width="166">
<combo_item name="Old Names" value="Old Names">Old Names</combo_item>
<combo_item name="Display Names (with Username)" value="Display Names (with Username)">Display Names(w/Username)</combo_item>
<combo_item name="Display Names only" value="Display Names only">Display Names only</combo_item>
</combo_box>
<check_box bottom_delta="-25" follows="left|top"
font="SansSerifSmall" height="16" initial_value="true"
label="Small Avatar Names" left="151" name="small_avatar_names_checkbox"
width="200" />
<check_box bottom_delta="-18" follows="left|top"
font="SansSerifSmall" height="16" initial_value="false"
label="Hide My Name On My Screen" left="151" name="show_my_name_checkbox"
width="200" />
<text type="string" length="1" bottom_delta="-24" follows="left|top" font="SansSerifSmall" h_pad="0"
halign="left" height="16" left="10" name="group_titles_textbox" v_pad="0"
width="394">
Group Titles:
</text>
<check_box bottom_delta="0" follows="left|top"
font="SansSerifSmall" height="16" initial_value="false"
label="Hide All Group Titles" left="151" mouse_opaque="true"
name="show_all_title_checkbox" radio_style="false" width="256" />
<check_box bottom_delta="-18" follows="left|top"
font="SansSerifSmall" height="16" initial_value="false"
label="Hide My Group Title" left="151" name="show_my_title_checkbox"
radio_style="false" width="256" />
<!--text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="-184" drop_shadow_visible="true" enabled="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="10" left="153"
mouse_opaque="true" name="effects_color_textbox" v_pad="0" width="394">
Moved to Vanity Settings.
</text-->
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="-180" drop_shadow_visible="true" enabled="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="12" left="10"
mouse_opaque="true" name="UI Size:" v_pad="0" width="128">
UI Size:
</text>
<slider bottom="-180" can_edit_text="true"
decimal_digits="3" enabled="true" height="16" increment="0.025"
initial_val="1" left="148" max_val="1.4" min_val="0.75" mouse_opaque="true"
name="ui_scale_slider" show_text="true" value="1" width="256" />
<check_box bottom="-195" enabled="true" follows="left|top"
font="SansSerifSmall" height="16" initial_value="false"
label="Use resolution independent scale" left="151" mouse_opaque="true"
name="ui_auto_scale" radio_style="false" width="256" />
<spinner bottom="-229" decimal_digits="0" enabled="true"
follows="left|top" height="16" increment="1" initial_val="300"
label="Away Timeout:" label_width="141" left="10" max_val="600"
min_val="0" mouse_opaque="true" name="afk_timeout_spinner" width="202" />
<check_box bottom="-265" enabled="true"
follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
label="Notify when in-world currency is spent or received" left="151"
mouse_opaque="true" name="notify_money_change_checkbox" radio_style="false"
width="256" />
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="-291" drop_shadow_visible="true" enabled="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
mouse_opaque="true" name="maturity_desired_label" v_pad="0" width="394">
Rating:
</text>
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="-291" drop_shadow_visible="true" enabled="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="10" left="151"
mouse_opaque="true" name="maturity_desired_prompt" v_pad="0" width="394">
I want to access content rated:
</text>
<combo_box bottom="-297" follows="left|top" height="18" left="315"
mouse_opaque="true" name="maturity_desired_combobox" width="150" control_name="PreferredMaturity">
<combo_item name="Desired_Adult" value="42">
PG, Mature and Adult
</combo_item>
<combo_item name="Desired_Mature" value="21">
PG and Mature
</combo_item>
<combo_item name="Desired_PG" value="13">
PG only
</combo_item>
<check_box bottom_delta="-25" follows="top" height="16" initial_value="true" label="Small Avatar Names" left="101" name="small_avatar_names_checkbox"/>
<check_box bottom_delta="-18" follows="top" height="16" initial_value="false" label="Hide My Name On My Screen" name="show_my_name_checkbox"/>
<text bottom_delta="-24" follows="top" height="16" left="10" name="group_titles_textbox">Group Titles:</text>
<check_box bottom_delta="0" follows="top" height="16" initial_value="false" label="Hide All Group Titles" left="101" name="show_all_title_checkbox"/>
<check_box bottom_delta="-18" follows="top" height="16" initial_value="false" label="Hide My Group Title" left="101" name="show_my_title_checkbox"/>
<text bottom="-180" height="12" left="10" name="UI Size:">UI Size:</text>
<slider bottom="-180" can_edit_text="true" height="16" increment="0.025" initial_val="1" left="98" max_val="1.4" min_val="0.75" name="ui_scale_slider" value="1" width="227" />
<check_box bottom="-195" height="16" initial_value="false" label="Use resolution independent scale" left="101" name="ui_auto_scale"/>
<spinner bottom="-220" decimal_digits="0" height="16" increment="1" initial_val="300" label="Away Timeout:" label_width="91" left="10" max_val="600" min_val="0" name="afk_timeout_spinner" width="137"/>
<check_box bottom="-257" height="16" initial_value="false" label="Notify when in-world currency is spent or received" left="10" name="notify_money_change_checkbox"/>
<text bottom="-291" height="10" left="10" name="maturity_desired_label">Rating:</text>
<text bottom="-291" height="10" left="101" name="maturity_desired_prompt">I want to access content rated:</text>
<combo_box bottom="-297" follows="left|top" height="18" left="267" name="maturity_desired_combobox" width="120" control_name="PreferredMaturity">
<combo_item name="Desired_Adult" value="42">PG, Mature &amp; Adult</combo_item>
<combo_item name="Desired_Mature" value="21">PG &amp; Mature</combo_item>
<combo_item name="Desired_PG" value="13">PG only</combo_item>
</combo_box>
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="-291" drop_shadow_visible="true" enabled="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="10" left="315"
mouse_opaque="true" name="maturity_desired_textbox" v_pad="0" width="150">
PG only
</text>
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="-20" drop_shadow_visible="true" enabled="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
mouse_opaque="true" name="start_location_textbox" v_pad="0" width="394">
Start Location:
</text>
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="-64" drop_shadow_visible="true" enabled="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
mouse_opaque="true" name="show_names_textbox" v_pad="0" width="394">
Show Names:
</text>
<!--text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="-184" drop_shadow_visible="true" enabled="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
mouse_opaque="true" name="effects_color_textbox" v_pad="0" width="394">
Color For My Effects:
</text-->
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="-224" drop_shadow_visible="true" enabled="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="10" left="220"
mouse_opaque="true" name="seconds_textbox" v_pad="0" width="128">
seconds
</text>
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="-331" drop_shadow_visible="true" enabled="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="18" left="10"
mouse_opaque="true" name="crash_report_textbox" v_pad="0" width="394">
Crash reports:
</text>
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="-363" drop_shadow_visible="true" enabled="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="18" left="10"
mouse_opaque="true" name="language_textbox" v_pad="0" width="394">
Language:
</text>
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom_delta="-1" drop_shadow_visible="true" enabled="true"
follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
height="18" left_delta="293" mouse_opaque="true" name="language_textbox2"
v_pad="0" width="400">
(Requires restart for full effect)
</text>
<combo_box allow_text_entry="true" bottom="-361" enabled="true"
follows="left|top" height="16" left="153" max_chars="135"
mouse_opaque="true" name="language_combobox" width="146">
<combo_item type="string" length="1" enabled="true" name="System Default Language" value="default">
System Default
</combo_item>
<combo_item type="string" length="1" enabled="true" name="English" value="en-us">
English
</combo_item>
<!-- After "System Default" and "English", please keep the rest of these combo_items in alphabetical order by the first character in the string. -->
<combo_item type="string" length="1" enabled="true" name="Danish" value="da">
Dansk (Danish) - Beta
</combo_item>
<combo_item type="string" length="1" enabled="true" name="Deutsch(German)" value="de">
Deutsch (German) - Beta
</combo_item>
<combo_item type="string" length="1" enabled="true" name="Spanish" value="es">
Español (Spanish) - Beta
</combo_item>
<combo_item type="string" length="1" enabled="true" name="French" value="fr">
Français (French) - Beta
</combo_item>
<combo_item type="string" length="1" enabled="true" name="Italian" value="it">
Italiano (Italian) - Beta
</combo_item>
<combo_item type="string" length="1" enabled="true" name="Hungarian" value="hu">
Magyar (Hungarian) - Beta
</combo_item>
<combo_item type="string" length="1" enabled="true" name="Dutch" value="nl">
Nederlands (Dutch) - Beta
</combo_item>
<combo_item type="string" length="1" enabled="true" name="Polish" value="pl">
Polski (Polish) - Beta
</combo_item>
<combo_item type="string" length="1" enabled="true" name="Portugese" value="pt">
Portugués (Portuguese) - Beta
</combo_item>
<combo_item type="string" length="1" enabled="true" name="Russian" value="ru">
Русский (Russian) - Beta
</combo_item>
<combo_item type="string" length="1" enabled="true" name="Turkish" value="tr">
Türkçe (Turkish) - Beta
</combo_item>
<combo_item type="string" length="1" enabled="true" name="Ukrainian" value="uk">
Українська (Ukrainian) - Beta
</combo_item>
<combo_item type="string" length="1" enabled="true" name="Chinese" value="zh">
中文 (简体) (Chinese) - Beta
</combo_item>
<combo_item type="string" length="1" enabled="true" name="(Japanese)" value="ja">
日本語 (Japanese) - Beta
</combo_item>
<combo_item type="string" length="1" enabled="true" name="(Korean)" value="ko">
한국어 (Korean) - Beta
</combo_item>
<text bottom="-291" height="10" left="265" name="maturity_desired_textbox">PG only</text>
<text bottom="-20" height="10" left="10" name="start_location_textbox">Start Location:</text>
<text bottom="-64" height="10" name="show_names_textbox">Show Names:</text>
<text bottom="-214" height="10" left="150" name="seconds_textbox">seconds</text>
<text bottom="-331" height="18" left="10" name="crash_report_textbox">Crash reports:</text>
<text bottom="-363" height="18" name="language_textbox">Language:</text>
<text bottom_delta="6" follows="top" height="18" left_delta="243" name="language_textbox2">(Requires restart for full effect)
*Uses English UI</text>
<combo_box allow_text_entry="true" bottom="-361" follows="top" height="16" left="103" name="language_combobox" max_chars="32" width="140">
<combo_item name="System Default Language" value="default">System Default</combo_item>
<combo_item name="English" value="en-us">English</combo_item>
<!-- After "System Default" and "English", please keep the rest of these combo_items in alphabetical order by the first character in the string.-->
<combo_item name="French" value="fr">Français(French)</combo_item>
<!-- Also, with the above advice in mind, keep completed UI translations above this line.-->
<combo_item name="Danish" value="da">Dansk(Danish)*</combo_item>
<combo_item name="Deutsch(German)" value="de">Deutsch(German)*</combo_item>
<combo_item name="Spanish" value="es">Español(Spanish)*</combo_item>
<combo_item name="Italian" value="it">Italiano(Italian)*</combo_item>
<combo_item name="Hungarian" value="hu">Magyar(Hungarian)*</combo_item>
<combo_item name="Dutch" value="nl">Nederlands(Dutch)*</combo_item>
<combo_item name="Polish" value="pl">Polski(Polish)*</combo_item>
<combo_item name="Portugese" value="pt">Portugués(Portuguese)*</combo_item>
<combo_item name="Russian" value="ru">Русский(Russian)*</combo_item>
<combo_item name="Turkish" value="tr">Türkçe(Turkish)*</combo_item>
<combo_item name="Ukrainian" value="uk">Українська(Ukrainian)*</combo_item>
<combo_item name="Chinese" value="zh">中文(简体)(Chinese)*</combo_item>
<combo_item name="(Japanese)" value="ja">日本語(Japanese)*</combo_item>
<combo_item name="(Korean)" value="ko">한국어(Korean)*</combo_item>
</combo_box>
<string name="region_name_prompt">
&lt;Type region name&gt;
</string>
<combo_box allow_text_entry="false" bottom="-331" enabled="true" follows="left|top"
height="18" left="153" max_chars="20" mouse_opaque="true"
name="crash_behavior_combobox" width="146">
<combo_item type="string" length="1" enabled="true" name="Askbeforesending" value="Ask before sending">
Ask before sending
</combo_item>
<combo_item type="string" length="1" enabled="true" name="Alwayssend" value="Always send">
Always send
</combo_item>
<combo_item type="string" length="1" enabled="true" name="Neversend" value="Never send">
Never send
</combo_item>
<string name="region_name_prompt">&lt;Type region name&gt;</string>
<combo_box bottom="-328" height="18" left="103" name="crash_behavior_combobox" width="115">
<combo_item name="Askbeforesending" value="Ask before sending">Ask before sending</combo_item>
<combo_item name="Alwayssend" value="Always send">Always send</combo_item>
<combo_item name="Neversend" value="Never send">Never send</combo_item>
</combo_box>
<check_box bottom="-385" enabled="true"
follows="left|top" font="SansSerifSmall" height="16" hidden="false"
initial_value="false" label="Share language with objects" left="151"
mouse_opaque="true" name="language_is_public"
radio_style="false"
tool_tip="This lets in-world objects know your preferred language."
width="256" />
<check_box bottom="-385" height="16" initial_value="false" label="Share language with objects" left="101" name="language_is_public" tool_tip="This lets in-world objects know your preferred language."/>
</panel>

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

@@ -36,8 +36,8 @@
<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" name="CustomSettings"/>
<view_border bevel_style="none" bottom="-395" height="280" left="5" width="485"/>
<check_box bottom="-96" 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="RenderObjectBump" height="16" initial_value="true" label="Bump Mapping and Shiny" left="10" name="BumpShiny"/>
<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."/>
@@ -59,13 +59,13 @@
<combo_item name="2" value="2">Sun and spotlight shadows</combo_item>
</combo_box>
<text bottom="-317" height="12" left="10">Avatar Rendering:</text>
<text bottom="-317" height="12" left="10" name="AvatarRenderingText">Avatar Rendering:</text>
<check_box bottom_delta="-18" control_name="RenderUseImpostors" initial_value="true" label="Avatar Impostors" left_delta="0" name="AvatarImpostors"/>
<slider bottom_delta="-12" control_name="RenderAvatarMaxVisible" decimal_digits="0" increment="1" initial_val="35" label="Max non-impostors" label_width="100" left_delta="8" max_val="50" min_val="1" name="AvatarMaxVisible" width="195"/>
<check_box bottom_delta="-22" control_name="RenderAvatarVP" initial_value="true" label="Hardware Skinning" left="10" name="AvatarVertexProgram"/>
<check_box bottom_delta="-17" control_name="RenderAvatarCloth" initial_value="true" label="Avatar Cloth" left_delta="0" name="AvatarCloth"/>
<!--text bottom="-131" height="12" left="464">m</text-->
<text bottom="-131" height="12" left="470">m</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="-16" control_name="RenderMaxPartCount" decimal_digits="0" height="16" increment="256" initial_val="4096" label="Max. Particle Count:" label_width="101" left_delta="0" max_val="8192" min_val="0" name="MaxParticleCount" width="262"/>
<slider bottom_delta="-20" control_name="RenderGlowResolutionPow" decimal_digits="0" height="16" increment="1" initial_val="8" label="Post Process Quality:" label_width="101" left_delta="0" max_val="9" min_val="8" name="RenderPostProcess" show_text="false" width="226"/>
@@ -90,7 +90,7 @@
<radio_item bottom="-15" height="16" left="3" name="SunMoon" width="156">Sun and moon only</radio_item>
<radio_item bottom="-31" height="16" left="3" name="LocalLights" width="156">Nearby local lights</radio_item>
</radio_group>
<text bottom="-354" height="12" left="370">Terrain Detail:</text>
<text bottom="-354" height="12" left="370" name="TerrainDetailText">Terrain Detail:</text>
<radio_group bottom_delta="-40" control_name="RenderTerrainDetail" draw_border="false" height="38" left_delta="0" 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" left="3" name="2" width="315">High</radio_item>

118
indra/newview/skins/default/xui/en-us/panel_preferences_im.xml
View File

@@ -1,98 +1,24 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel border="true" bottom="-409" enabled="true" follows="left|top|right|bottom"
height="408" label="Communication" left="102" mouse_opaque="true" name="im"
width="517">
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="-20" drop_shadow_visible="true" enabled="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="10" left="12"
mouse_opaque="false" name="text_box" v_pad="0" width="128">
My Online Status:
</text>
<check_box bottom="-25" enabled="true" follows="left|top" font="SansSerifSmall"
height="16" initial_value="false"
label="Only my Friends and Groups can see when I am online"
left="148" mouse_opaque="true" name="online_visibility" radio_style="false"
width="350" />
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="-40" drop_shadow_visible="true" enabled="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="10" left="12"
mouse_opaque="false" name="text_box2" v_pad="0" width="128">
IM Options:
</text>
<string name="log_in_to_change">
log in to change
</string>
<check_box bottom="-45" enabled="true" follows="left|top" font="SansSerifSmall"
height="16" initial_value="false" label="Send IM to Email ([EMAIL])"
left="148" mouse_opaque="true" name="send_im_to_email" radio_style="false"
width="350" />
<check_box bottom="-65" enabled="true" follows="left|top"
font="SansSerifSmall" height="16" initial_value="false"
label="Include IM in chat console" left="148" mouse_opaque="true"
name="include_im_in_chat_console" radio_style="false" width="237" />
<check_box bottom="-85" enabled="true" follows="left|top"
font="SansSerifSmall" height="16" initial_value="false"
label="Show timestamps in IM" left="148" mouse_opaque="true"
name="show_timestamps_check" radio_style="false" width="237" />
<check_box bottom="-105" enabled="true"
follows="left|top" font="SansSerifSmall" height="16"
initial_value="false" label="Show online Friend notifications" left="148"
mouse_opaque="true" name="friends_online_notify_checkbox"
radio_style="false" width="256" />
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="-125" drop_shadow_visible="true" enabled="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="10" left="12"
mouse_opaque="false" name="text_box3" v_pad="0" width="128">
Busy Mode Response:
</text>
<text_editor type="string" length="1" bottom="-185" embedded_items="false" enabled="true" follows="left|top"
font="SansSerifSmall" height="70" left="148" max_length="255"
mouse_opaque="true" name="busy_response" width="330" word_wrap="true" spell_check="true" />
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="-218" drop_shadow_visible="true" enabled="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="10" left="12"
mouse_opaque="false" name="text_box4" v_pad="0" width="128">
Logging Options:
</text>
<check_box bottom="-225" enabled="true"
follows="left|top" font="SansSerifSmall" height="16"
initial_value="false" label="Save a log of IM on my computer" left="148"
mouse_opaque="true" name="log_instant_messages" radio_style="false"
width="237" />
<check_box bottom="-245" enabled="true"
follows="left|top" font="SansSerifSmall" height="16"
initial_value="false" label="Show timestamps in IM log" left="168"
mouse_opaque="true" name="log_instant_messages_timestamp" radio_style="false"
width="217" />
<check_box bottom="-265" enabled="true" follows="left|top"
font="SansSerifSmall" height="16" initial_value="false"
label="Show the end of last IM conversation" left="168" mouse_opaque="true"
name="log_show_history" radio_style="false" width="217" />
<check_box bottom="-285" enabled="true" follows="left|top"
font="SansSerifSmall" height="16" initial_value="false" label="Save a log of Local Chat on my computer"
left="148" mouse_opaque="true" name="log_chat" radio_style="false"
width="237" />
<check_box bottom="-305" enabled="true" follows="left|top"
font="SansSerifSmall" height="16" initial_value="false"
label="Show timestamps in Local Chat log" left="168" mouse_opaque="true"
name="log_chat_timestamp" radio_style="false" width="217" />
<check_box bottom="-325" enabled="true" follows="left|top"
font="SansSerifSmall" height="16" initial_value="false"
label="Show incoming IM in Local Chat log" left="168" mouse_opaque="true"
name="log_chat_IM" radio_style="false" width="217" />
<check_box bottom="-345" enabled="true" follows="left|top"
font="SansSerifSmall" height="16" initial_value="false"
label="Include date with timestamps" left="148" mouse_opaque="true"
name="log_date_timestamp" radio_style="false" width="237" />
<check_box bottom="-365" enabled="true" follows="left|top"
font="SansSerifSmall" height="16" initial_value="false"
label="Append date to log filename" left="148" mouse_opaque="true"
name="logfile_name_datestamp" radio_style="false" width="237" />
<button bottom="-353" follows="right|bottom" font="SansSerif" halign="center"
height="20" label="Change Path" label_selected="Change Path" left="70"
mouse_opaque="true" name="log_path_button" width="90" />
<line_editor border_drop_shadow_visible="false" border_visible="false" bottom="-386"
drop_shadow_visible="true" enabled="false" follows="top|left|right"
font="SansSerifSmall" halign="right" height="19" left="148"
max_length="254" mouse_opaque="false" name="log_path_string" right="-20" />
<panel border="true" bottom="-409" height="408" label="Communication" left="102" name="im" width="517">
<text bottom="-20" left="12" name="text_box">My Online Status:</text>
<check_box bottom="-25" height="16" initial_value="false" label="Only my Friends and Groups can see when I am online" left="148" name="online_visibility"/>
<text bottom="-40" height="10" left="12" name="text_box2">IM Options:</text>
<string name="log_in_to_change">log in to change</string>
<check_box bottom="-45" height="16" initial_value="false" label="Send IM to Email ([EMAIL])" left="148" name="send_im_to_email"/>
<check_box bottom="-65" height="16" initial_value="false" label="Include IM in chat console" name="include_im_in_chat_console"/>
<check_box bottom="-85" height="16" initial_value="false" label="Show timestamps in IM" name="show_timestamps_check"/>
<check_box bottom="-105" height="16" initial_value="false" label="Show online Friend notifications" name="friends_online_notify_checkbox"/>
<text bottom="-125" height="10" left="12" name="text_box3">Busy Mode Response:</text>
<text_editor font="SansSerifSmall" bottom="-185" follows="top" height="70" left="148" max_length="255" name="busy_response" width="330" word_wrap="true" spell_check="true"/>
<text bottom="-218" height="10" left="12" name="text_box4">Logging Options:</text>
<check_box bottom="-225" height="16" initial_value="false" label="Save a log of IM on my computer" left="148" name="log_instant_messages" />
<check_box bottom="-245" height="16" initial_value="false" label="Show timestamps in IM log" left="168" name="log_instant_messages_timestamp"/>
<check_box bottom="-265" height="16" initial_value="false" label="Show the end of last IM conversation" name="log_show_history"/>
<check_box bottom="-285" height="16" initial_value="false" label="Save a log of Local Chat on my computer" left="148" name="log_chat"/>
<check_box bottom="-305" height="16" initial_value="false" label="Show timestamps in Local Chat log" left="168" name="log_chat_timestamp"/>
<check_box bottom="-325" height="16" initial_value="false" label="Show incoming IM in Local Chat log" name="log_chat_IM"/>
<check_box bottom="-345" height="16" initial_value="false" label="Include date with timestamps" left="148" name="log_date_timestamp"/>
<check_box bottom="-365" height="16" initial_value="false" label="Append date to log filename" name="logfile_name_datestamp"/>
<button bottom="-353" follows="right|bottom" height="20" label="Change Path" label_selected="Change Path" left="70" name="log_path_button" width="90" />
<line_editor border_drop_shadow_visible="false" border_visible="false" bottom="-386" drop_shadow_visible="true" follows="top|left|right" height="19" left="148" max_length="254" mouse_opaque="false" name="log_path_string" right="-20" />
</panel>

98
indra/newview/skins/default/xui/en-us/panel_preferences_input.xml
View File

@@ -1,83 +1,19 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel border="true" bottom="-409" enabled="true" follows="left|top|right|bottom"
height="408" label="Input &amp; Camera" left="102" mouse_opaque="true"
name="Input panel" width="517">
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="-20" drop_shadow_visible="true" enabled="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
mouse_opaque="true" name=" Mouselook Options:" v_pad="0" width="266">
Mouselook Options:
</text>
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="-20" drop_shadow_visible="true" enabled="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="10" left="148"
mouse_opaque="true" name=" Mouse Sensitivity:" v_pad="0" width="128">
Mouse Sensitivity:
</text>
<slider_bar bottom="-26" enabled="true" follows="left|top"
height="16" increment="0.25" initial_val="2" left="276" max_val="15"
min_val="0" mouse_opaque="true" name="mouse_sensitivity" width="128" />
<check_box bottom_delta="-18" enabled="true" follows="left|top"
font="SansSerifSmall" height="16" label="Invert Mouse" left="148"
mouse_opaque="true" name="invert_mouse" radio_style="false" width="128" />
<check_box bottom_delta="-20" enabled="true"
follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
label="Show Avatar in Mouselook" left="148" mouse_opaque="true" name="first_person_avatar_visible"
radio_style="false" width="256" />
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom_delta="-30" drop_shadow_visible="true" enabled="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
mouse_opaque="true" name=" Auto Fly Options:" v_pad="0" width="266">
Auto Fly Options:
</text>
<check_box bottom_delta="-6" enabled="true" follows="left|top"
font="SansSerifSmall" height="16" label="Fly/land on holding up/down"
left="148" mouse_opaque="true" name="automatic_fly" radio_style="false"
width="178" />
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom_delta="-30" drop_shadow_visible="true" enabled="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
mouse_opaque="true" name=" Camera Options:" v_pad="0" width="266">
Camera Options:
</text>
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom_delta="0" drop_shadow_visible="true" enabled="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="10" left="148"
mouse_opaque="true" name="camera_fov_label" v_pad="0" width="128">
Camera View Angle:
</text>
<slider bottom_delta="-6" can_edit_text="true"
decimal_digits="2" enabled="true" follows="left|top" width="128" height="16"
increment=".025" initial_val="1.57" left="276" max_val="2.97" min_val=".17"
mouse_opaque="true" name="camera_fov" show_text="false" value="60" />
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom_delta="-14" drop_shadow_visible="true" enabled="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="10" left="148"
mouse_opaque="true" name="Camera Follow Distance:" v_pad="0" width="128">
Camera Follow Distance:
</text>
<slider bottom_delta="-6" can_edit_text="true" control_name="CameraOffsetScale"
decimal_digits="2" enabled="true" follows="left|top" height="16"
increment=".025" initial_val="1" left="276" min_val=".5" max_val="3"
mouse_opaque="true" name="camera_offset_scale" show_text="false" value="1"
width="128" />
<check_box bottom_delta="-24" enabled="true"
follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
label="Automatic Edit Camera Movement" left="148" mouse_opaque="true"
name="edit_camera_movement" radio_style="false"
tool_tip="Use automatic camera positioning when entering and exiting edit mode"
width="201" />
<check_box bottom_delta="-18" enabled="true"
follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
label="Automatic Appearance Camera Movement" left="148" mouse_opaque="true"
name="appearance_camera_movement" radio_style="false"
tool_tip="Use automatic camera positioning while in edit mode" width="242" />
<check_box bottom_delta="-18" enabled="true"
follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
label="Unsit Avatar on Camera Reset" left="148" mouse_opaque="true"
name="unsit_on_camera_reset" radio_style="false"
tool_tip="Stand up automatically when you press Esc and the camera switches to third person mode" width="242" />
<button bottom_delta="-30" follows="left|top" font="SansSerif" height="20"
label="Joystick Setup" left_delta="0" mouse_opaque="true"
name="joystick_setup_button" width="155" />
<panel border="true" bottom="-409" height="408" label="Input &amp; Camera" left="102" name="Input panel" width="517">
<text bottom="-20" follows="top" height="10" left="10" name=" Mouselook Options:">Mouselook Options:</text>
<text bottom="-20" follows="top" height="10" left="148" name=" Mouse Sensitivity:">Mouse Sensitivity:</text>
<slider_bar bottom="-26" follows="top" height="16" increment="0.25" initial_val="2" left="276" max_val="15" min_val="0" name="mouse_sensitivity" width="128"/>
<check_box bottom_delta="-18" follows="top" height="16" label="Invert Mouse" left="148" name="invert_mouse"/>
<check_box bottom_delta="-20" follows="top" height="16" initial_value="false" label="Show Avatar in Mouselook" name="first_person_avatar_visible"/>
<text bottom_delta="-30" follows="top" height="10" left="10" name=" Auto Fly Options:">Auto Fly Options:</text>
<check_box bottom_delta="-6" follows="top" height="16" label="Fly/land on holding up/down" left="148" name="automatic_fly"/>
<text bottom_delta="-30" follows="top" height="10" left="10" name=" Camera Options:">Camera Options:</text>
<text bottom_delta="0" follows="top" height="10" left="148" name="camera_fov_label">Camera View Angle:</text>
<slider bottom_delta="-6" can_edit_text="true" decimal_digits="2" follows="top" width="128" height="16" increment=".025" initial_val="1.57" left="276" max_val="2.97" min_val=".17" name="camera_fov" value="60"/>
<text bottom_delta="-14" follows="top" height="10" left="148" name="Camera Follow Distance:" width="128">Camera Follow Distance:</text>
<slider bottom_delta="-6" can_edit_text="true" control_name="CameraOffsetScale" decimal_digits="2" follows="top" height="16" increment=".025" initial_val="1" left="276" min_val=".5" max_val="3" name="camera_offset_scale" value="1" width="128"/>
<check_box bottom_delta="-24" follows="top" initial_value="false" label="Automatic Edit Camera Movement" left="148" name="edit_camera_movement" tool_tip="Use automatic camera positioning when entering and exiting edit mode"/>
<check_box bottom_delta="-18" follows="top" height="16" initial_value="false" label="Automatic Appearance Camera Movement" left="148" name="appearance_camera_movement" tool_tip="Use automatic camera positioning while in edit mode"/>
<check_box bottom_delta="-18" follows="top" height="16" initial_value="false" label="Unsit Avatar on Camera Reset" left="148" name="unsit_on_camera_reset" tool_tip="Stand up automatically when you press Esc and the camera switches to third person mode"/>
<button bottom_delta="-30" follows="top" font="SansSerif" height="20" label="Joystick Setup" name="joystick_setup_button" width="155"/>
</panel>

183
indra/newview/skins/default/xui/en-us/panel_preferences_network.xml
View File

@@ -1,157 +1,36 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel border="true" bottom="-409" enabled="true" follows="left|top|right|bottom"
height="408" label="Network" left="102" mouse_opaque="true" name="network"
width="517">
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="-20" drop_shadow_visible="true" enabled="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="10" left="12"
mouse_opaque="false" name="text_box" v_pad="0" width="200">
Maximum Bandwidth:
</text>
<slider bottom_delta="-25" can_edit_text="true"
decimal_digits="0" enabled="true" follows="left|top" height="15"
increment="10" initial_val="50" left_delta="0" max_val="5000" min_val="50"
mouse_opaque="true" name="max_bandwidth" show_text="true" value="500"
width="180" />
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom_delta="4" drop_shadow_visible="true" enabled="true"
follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
height="10" left_delta="186" mouse_opaque="false" name="text_box2"
v_pad="0" width="200">
kbps (kilobits per second)
</text>
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom_delta="-25" drop_shadow_visible="true" enabled="true"
follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
height="10" left="12" mouse_opaque="false" name="cache_size_label_l"
v_pad="0" width="200">
Disk Cache Size (MB):
</text>
<slider bottom_delta="-25" can_edit_text="true"
decimal_digits="0" enabled="true" follows="left|top" height="15"
increment="64" initial_val="1024" left_delta="0" max_val="2048" min_val="64"
mouse_opaque="true" name="cache_size" show_text="true" width="180" />
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom_delta="4" drop_shadow_visible="true" enabled="true"
follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
height="10" left_delta="186" mouse_opaque="false" name="text_box5"
v_pad="0" width="40">
MB
</text>
<button bottom="-55" bottom_delta="-8" enabled="true" follows="left|top"
font="SansSerif" halign="center" height="22" label="Clear Cache" left="340"
left_delta="30" mouse_opaque="true" name="clear_cache" scale_image="true"
width="100" />
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="-70" bottom_delta="-17" drop_shadow_visible="true" enabled="true"
follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
height="10" left="12" mouse_opaque="false" name="cache_location_label"
v_pad="0" width="200">
Disk Cache Location:
</text>
<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-28"
enabled="false" follows="left|top" font="SansSerif"
handle_edit_keys_directly="true" height="20" left_delta="7"
max_length="4096" mouse_opaque="true" name="cache_location"
select_all_on_focus_received="false" width="470" word_wrap="false" />
<button bottom_delta="-25" enabled="true" follows="left|top" font="SansSerif"
halign="center" height="22" label="Set" label_selected="Set" left_delta="0"
mouse_opaque="true" name="set_cache" scale_image="true" width="100" />
<button bottom="-105" bottom_delta="0" enabled="true" follows="left|top"
font="SansSerif" halign="center" height="22" label="Reset"
label_selected="Set" left_delta="103" mouse_opaque="true"
name="reset_cache" scale_image="true" width="100" />
<check_box bottom="-173" bottom_delta="-35"
enabled="true" follows="left|top" font="SansSerifSmall" height="16"
initial_value="false" label="Custom Port Connection" left="12"
mouse_opaque="true" name="connection_port_enabled" radio_style="false"
width="256" />
<spinner bottom="-193" bottom_delta="-20"
decimal_digits="0" enabled="true" follows="left|top" height="16"
increment="1" initial_val="13000" label="Port Number:" label_width="75"
left_delta="20" max_val="13050" min_val="13000" mouse_opaque="true"
name="connection_port" width="150" />
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom_delta="-24" drop_shadow_visible="true" enabled="true"
follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
height="10" left="12" mouse_opaque="false" name="socks5_auth_label"
v_pad="0" width="128">
Http Proxy:
</text>
<panel border="true" bottom="-409" height="408" label="Network" left="102" name="network" width="517">
<text bottom="-20" follows="top" height="10" left="12" name="text_box">Maximum Bandwidth:</text>
<slider bottom_delta="-25" can_edit_text="true" decimal_digits="0" follows="top" height="15" increment="10" initial_val="50" max_val="5000" min_val="50" name="max_bandwidth" show_text="true" value="500" width="180"/>
<text bottom_delta="4" follows="top" height="10" left_delta="186" name="text_box2">kbps (kilobits per second)</text>
<text bottom_delta="-25" follows="top" height="10" left="12" name="cache_size_label_l">Disk Cache Size (MB):</text>
<slider bottom_delta="-25" can_edit_text="true" decimal_digits="0" follows="top" height="15" increment="64" initial_val="1024" max_val="2048" min_val="64" name="cache_size" show_text="true" width="180"/>
<text bottom_delta="4" follows="top" height="10" left_delta="186" name="text_box5">MB</text>
<button bottom_delta="-8" follows="top" height="22" label="Clear Cache" left_delta="30" name="clear_cache" scale_image="true" width="100"/>
<text bottom_delta="-17" follows="top" height="10" left="12" name="cache_location_label">Disk Cache Location:</text>
<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-28" follows="top" handle_edit_keys_directly="true" height="20" left_delta="7" max_length="4096" name="cache_location" width="470"/>
<button bottom_delta="-25" follows="top" height="22" label="Set" label_selected="Set" name="set_cache" scale_image="true" width="100"/>
<button bottom_delta="0" follows="top" height="22" label="Reset" label_selected="Set" left_delta="103" name="reset_cache" scale_image="true" width="100"/>
<check_box bottom_delta="-35" follows="top" height="16" initial_value="false" label="Custom Port Connection" left="12" name="connection_port_enabled"/>
<spinner bottom_delta="-20" decimal_digits="0" follows="top" height="16" increment="1" initial_val="13000" label="Port Number:" label_width="75" left_delta="20" max_val="65535" min_val="0" name="connection_port" width="150"/>
<text bottom_delta="-24" follows="top" height="10" left="12" name="socks5_auth_label">Http Proxy:</text>
<radio_group bottom_delta="-8" draw_border="false" follows="left|top" height="20" left="12"
name="socks5_http_proxy_type" width="380" >
<radio_item height="20" bottom="0" left="100" name="None" width="50"
tool_tip="No Http Proxy">
None
</radio_item>
<radio_item height="20" bottom="0" left="170" name="Socks" width="50"
tool_tip="Use Socks for Http Proxy">
Socks
</radio_item>
<radio_item height="20" bottom="0" left="250" name="Web" width="50"
tool_tip="Use web proxy for Http Proxy">
Web
</radio_item>
<radio_item height="20" bottom="0" left="100" name="None" width="50" tool_tip="No Http Proxy">None</radio_item>
<radio_item height="20" bottom="0" left="170" name="Socks" width="50" tool_tip="Use Socks for Http Proxy">Socks</radio_item>
<radio_item height="20" bottom="0" left="250" name="Web" width="50" tool_tip="Use web proxy for Http Proxy">Web</radio_item>
</radio_group>
<check_box bottom_delta="-24" enabled="true"
follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
label="Enable SOCKS 5 Proxy" left="6" mouse_opaque="true"
name="socks5_proxy_enabled" radio_style="false" width="256" />
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom_delta="-26" drop_shadow_visible="true" enabled="true"
follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
height="10" left="12" mouse_opaque="false" name="socks5_host_label"
v_pad="0" width="128">
Socks 5 Host:
</text>
<line_editor bottom_delta="-6" enabled="true" follows="left|top" font="SansSerif"
height="20" left="90" name="socks5_proxy_host"
tool_tip="The name or IP address of the SOCKS5 proxy you would like to use"
width="200" />
<spinner bottom_delta="-30" decimal_digits="0"
enabled="true" follows="left|top" height="16" increment="1"
initial_val="80" label="Port Number:" label_width="75" left="12"
max_val="12000" min_val="10" mouse_opaque="true" name="socks5_proxy_port"
width="140" />
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom_delta="-20" drop_shadow_visible="true" enabled="true"
follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
height="10" left="12" mouse_opaque="false" name="socks5_auth_label"
v_pad="0" width="128">
Socks5 Authentication:
</text>
<radio_group bottom_delta="-6" draw_border="false" follows="left|top" height="20" left="12"
name="socks5_auth" width="420">
<radio_item bottom="0" height="20" left_delta="80" name="None" width="50"
tool_tip="No authentication">
None
</radio_item>
<radio_item bottom="0" height="20" left_delta="50" name="UserPass" width="50"
tool_tip="Username / Password authentication">
Username/Password
</radio_item>
</radio_group>
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom_delta="-22" drop_shadow_visible="true" enabled="true"
follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
height="10" left="12" mouse_opaque="false" name="socks5_username_label"
v_pad="0" width="128">
Username:
</text>
<line_editor bottom_delta="-8" enabled="true" follows="left|top" font="SansSerif"
height="20" left="90" name="socks5_proxy_username"
tool_tip="Username for the Socks5 proxy"
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" enabled="true"
follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
height="10" left="12" mouse_opaque="false" name="socks5_password_label"
v_pad="0" width="128">
Password:
</text>
<line_editor bottom_delta="-8" enabled="true" follows="left|top" font="SansSerif"
height="20" left="90" name="socks5_proxy_password"
tool_tip="Password for the Socks5 proxy"
width="200" />
<check_box bottom_delta="-24" follows="top" height="16" initial_value="false" label="Enable SOCKS 5 Proxy" left="6" mouse_opaque="true" name="socks5_proxy_enabled" radio_style="false" width="256" />
<text bottom_delta="-26" follows="top" height="10" left="12" name="socks5_host_label">Socks 5 Host:</text>
<line_editor bottom_delta="-6" follows="top" font="SansSerif" height="20" left="90" name="socks5_proxy_host" tool_tip="The name or IP address of the SOCKS5 proxy you would like to use" width="311"/>
<spinner bottom_delta="-30" decimal_digits="0" follows="top" height="16" increment="1" initial_val="80" label="Port Number:" label_width="75" max_val="65535" min_val="0" name="socks5_proxy_port" width="140"/>
<text bottom_delta="-20" follows="top" height="10" left="12" name="socks5_auth_label">Socks5 Authentication:</text>
<radio_group bottom_delta="-6" draw_border="false" follows="top" height="20" name="socks5_auth" width="420">
<radio_item bottom="0" height="20" left_delta="80" name="None" tool_tip="No authentication">None</radio_item>
<radio_item bottom="0" height="20" left_delta="50" name="UserPass" tool_tip="Username / Password authentication">Username/Password</radio_item>
</radio_group>
<text bottom_delta="-22" follows="top" height="10" left="12" name="socks5_username_label">Username:</text>
<line_editor bottom_delta="-8" follows="top" font="SansSerif" height="20" left="90" name="socks5_proxy_username" tool_tip="Username for the Socks5 proxy" width="311"/>
<text bottom_delta="-20" follows="top" height="10" left="12" name="socks5_password_label">Password:</text>
<line_editor bottom_delta="-8" follows="top" font="SansSerif" height="20" left="90" name="socks5_proxy_password" tool_tip="Password for the Socks5 proxy" width="311"/>
</panel>

57
indra/newview/skins/default/xui/en-us/panel_preferences_popups.xml
View File

@@ -1,46 +1,15 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel border="true" bottom="0" height="500" label="Popups" left="0" name="popups"
title="Popups" width="400">
<text bottom="-20" follows="top|left" left="15" width="300" name="dont_show_label">
Do not show these popups:
</text>
<scroll_list follows="top|left" height="88" left="15" name="disabled_popups" width="480" />
<button follows="top|left" height="20" label="Enable this popup" left="15"
name="enable_popup" width="175" />
<button follows="top|left" height="20" label="Enable all popups..." left="200"
name="reset_dialogs_btn"
tool_tip="Enable all of the optional popups and &apos;first time use&apos; notifications."
width="175" bottom_delta="0" />
<text follows="top|left" left="15" width="128" name="show_label" bottom_delta="-24">
Show these popups:
</text>
<scroll_list follows="top|left" height="88" left="15" name="enabled_popups" width="480" />
<button follows="top|left" height="20" label="Disable first time popups..." left="15"
name="skip_frst_btn"
tool_tip="Disable all of the first time use notifications."
width="175" />
<button bottom_delta="0" follows="top|left" height="20"
label="Disable all these popups..." left="200"
name="skip_dialogs_btn"
tool_tip="Disable all of the optional popups and &apos;first time use&apos; notifications."
width="175" />
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom_delta="-24" drop_shadow_visible="true" enabled="true"
follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
height="10" left="15" mouse_opaque="false" name="text_box2" v_pad="0"
width="270">
Offers of notecards, textures and landmarks:
</text>
<check_box bottom_delta="-25" enabled="true"
follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
label="Automatically accept" left="40" mouse_opaque="true"
name="accept_new_inventory" radio_style="false" width="270" />
<check_box bottom_delta="-20" enabled="true"
follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
label="Automatically view after accepting" left="40" mouse_opaque="true"
name="show_new_inventory" radio_style="false" width="270" />
<check_box bottom_delta="-20" enabled="true"
follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
label="Automatically show newly accepted objects in inventory" left="18" mouse_opaque="true"
name="show_in_inventory" radio_style="false" width="270" />
<panel border="true" bottom="0" height="500" label="Popups" left="0" name="popups" title="Popups" width="400">
<text bottom="-20" follows="top" left="15" name="dont_show_label">Do not show these popups:</text>
<scroll_list follows="top" height="88" name="disabled_popups" width="480"/>
<button follows="top" height="20" label="Enable this popup" name="enable_popup" width="175"/>
<button follows="top" height="20" label="Enable all popups..." left="200" name="reset_dialogs_btn" tool_tip="Enable all of the optional popups and &apos;first time use&apos; notifications." width="175" bottom_delta="0"/>
<text follows="top" left="15" name="show_label" bottom_delta="-24">Show these popups:</text>
<scroll_list follows="top" height="88" left="15" name="enabled_popups" width="480"/>
<button follows="top" height="20" label="Disable first time popups..." name="skip_frst_btn" tool_tip="Disable all of the first time use notifications." width="175"/>
<button bottom_delta="0" follows="top" height="20" label="Disable all these popups..." left="200" name="skip_dialogs_btn" tool_tip="Disable all of the optional popups and &apos;first time use&apos; notifications." width="175"/>
<text bottom_delta="-24" follows="top" height="10" left="15" name="text_box2">Offers of notecards, textures and landmarks:</text>
<check_box bottom_delta="-25" follows="top" height="16" initial_value="false" label="Automatically accept" left="40" name="accept_new_inventory"/>
<check_box bottom_delta="-20" follows="top" height="16" initial_value="true" label="Automatically view after accepting" name="show_new_inventory"/>
<check_box bottom_delta="-20" follows="top" height="16" initial_value="true" label="Automatically show newly accepted objects in inventory" left="18" name="show_in_inventory"/>
</panel>

50
indra/newview/skins/default/xui/en-us/panel_preferences_skins.xml
View File

@@ -1,37 +1,17 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel border="true" bottom="-409" enabled="true" follows="left|top|right|bottom"
height="408" label="Skins" left="102" mouse_opaque="true"
name="Skins panel" width="517">
<text bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16" left="200"
name="Skin_txt1" width="512">Selected Skin</text>
<combo_box allow_text_entry="false" bottom_delta="-20" left_delta="-110" follows="left|top" height="18"
max_chars="200" mouse_opaque="true" name="custom_skin_combo" width="300"
control_name="custom_skin_combo" tool_tip=""/>
<text bottom_delta="-22" follows="left|top" font="SansSerifSmall" height="16" left_delta="20"
name="Skin_txt2" width="512">Primary Author</text>
<view_border blevel_style="in" bottom_delta="-18" follows="left|top" height="16" left_delta="-0"
mouse_opaque="false" name="custom_box1" width="260"/>
<text bottom_delta="-0" follows="left|top" font="SansSerifSmall" height="16" left_delta="3"
name="custom_skin_author" width="512">skin author</text>
<text bottom_delta="-22" follows="left|top" font="SansSerifSmall" height="16" left_delta="-3"
name="Skin_txt3" width="512">Additional Authors</text>
<view_border blevel_style="in" bottom_delta="-18" follows="left|top" height="16" left_delta="-0"
mouse_opaque="false" name="custom_box2" width="260"/>
<text bottom_delta="-0" follows="left|top" font="SansSerifSmall" height="16" left_delta="3"
name="custom_skin_ad_authors" width="512">additional skin authors</text>
<text bottom_delta="-22" follows="left|top" font="SansSerifSmall" height="16" left_delta="-3"
name="Skin_txt4" width="512">Skin folder</text>
<view_border blevel_style="in" bottom_delta="-18" follows="left|top" height="16" left_delta="-0"
mouse_opaque="false" name="custom_box3" width="260"/>
<text bottom_delta="-0" follows="left|top" font="SansSerifSmall" height="16" left_delta="3"
name="custom_skin_folder" width="512">skin folder</text>
<button scale_image="true" image_selected="skin_thumbnail_default.png" image_unselected="skin_thumbnail_default.png" image_hover_selected="skin_thumbnail_default.png" image_hover_unselected="skin_thumbnail_default.png"
bottom_delta="-150" default_image_name="None" follows="left|top" label="" width="300" height="130"
left_delta="-20" mouse_opaque="true" name="custom_skin_preview" tool_tip="Skin Preview" />
<text bottom_delta="-22" follows="left|top" font="SansSerifSmall" height="16" left_delta="110"
name="Skin_txt5" width="512">Additional info</text>
<text_editor bottom_delta="-100" embedded_items="false"
enabled="false" follows="left|top" font="SansSerifSmall" height="100"
is_unicode="false" left_delta="-135" max_length="511" mouse_opaque="true"
name="custom_skin_info" width="350" word_wrap="true" />
<panel border="true" bottom="-409" height="408" label="Skins" left="102" name="Skins panel" width="517">
<text bottom_delta="-20" follows="top" height="16" left="200" name="Skin_txt1">Selected Skin</text>
<combo_box bottom_delta="-20" left_delta="-110" follows="top" height="18" max_chars="200" name="custom_skin_combo" width="300" control_name="custom_skin_combo"/>
<text bottom_delta="-22" follows="top" height="16" left_delta="20" name="Skin_txt2">Primary Author</text>
<view_border blevel_style="in" bottom_delta="-18" follows="top" height="16" name="custom_box1" width="260"/>
<text bottom_delta="-0" follows="top" height="16" left_delta="3" name="custom_skin_author">skin author</text>
<text bottom_delta="-22" follows="top" height="16" left_delta="-3" name="Skin_txt3">Additional Authors</text>
<view_border blevel_style="in" bottom_delta="-18" follows="top" height="16" name="custom_box2" width="260"/>
<text bottom_delta="-0" follows="top" height="16" left_delta="3" name="custom_skin_ad_authors">additional skin authors</text>
<text bottom_delta="-22" follows="top" height="16" left_delta="-3" name="Skin_txt4">Skin folder</text>
<view_border blevel_style="in" bottom_delta="-18" follows="top" height="16" name="custom_box3" width="260"/>
<text bottom_delta="-0" follows="top" height="16" left_delta="3" name="custom_skin_folder">skin folder</text>
<button scale_image="true" image_selected="skin_thumbnail_default.png" image_unselected="skin_thumbnail_default.png" image_hover_selected="skin_thumbnail_default.png" image_hover_unselected="skin_thumbnail_default.png" bottom_delta="-150" default_image_name="None" follows="top" width="300" height="130" left_delta="-20" label="" name="custom_skin_preview" tool_tip="Skin Preview"/>
<text bottom_delta="-22" follows="top" height="16" left_delta="110" name="Skin_txt5">Additional info</text>
<text_editor bottom_delta="-100" follows="top" height="100" left_delta="-135" max_length="511" name="custom_skin_info" width="350" word_wrap="true"/>
</panel>

116
indra/newview/skins/default/xui/en-us/panel_preferences_voice.xml
View File

@@ -1,96 +1,28 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel border="true" bottom="-409" enabled="true" follows="left|top|right|bottom"
height="408" label="Voice Chat" left="102" mouse_opaque="true" name="chat"
width="517">
<text_editor type="string" length="1" allow_html="false" bg_readonly_color="0 0 0 0" bottom_delta="-26"
embedded_items="false" enabled="false" follows="left|top"
font="SansSerifSmall" height="20" hide_border="true" hide_scrollbar="true"
left_delta="8" max_length="65535" mouse_opaque="true"
name="voice_unavailable" tab_stop="false" width="450" word_wrap="true">
Voice Chat Is Not Available
</text_editor>
<check_box bottom_delta="0" enabled="true"
follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
label="Enable voice chat" left="8" mouse_opaque="true"
name="enable_voice_check" radio_style="false" width="200" />
<radio_group bottom_delta="-40" draw_border="false" follows="left|top" height="40"
left_delta="20" name="ear_location" width="364">
<radio_item type="string" length="1" bottom="-19" follows="left|top" height="16" left="3" name="0" width="315">
Hear Voice Chat from camera position.
</radio_item>
<radio_item type="string" length="1" bottom="-35" follows="left|top" height="16" left="3" name="1" width="315">
Hear Voice Chat from avatar position.
</radio_item>
<panel border="true" bottom="-409" height="408" label="Voice Chat" left="102" name="chat" width="517">
<text bottom_delta="-20" follows="left|top" left_delta="12" name="voice_unavailable">Voice Chat Is Not Available</text>
<check_box bottom_delta="0" follows="top" height="16" initial_value="false" label="Enable voice chat" left="8" name="enable_voice_check"/>
<radio_group bottom_delta="-46" draw_border="false" follows="top" height="40" left_delta="20" name="ear_location" width="364">
<radio_item bottom="-19" height="16" left="3" name="0">Hear Voice Chat from camera position.</radio_item>
<radio_item bottom="-35" height="16" name="1">Hear Voice Chat from avatar position.</radio_item>
</radio_group>
<text type="string" length="1" allow_html="false" bg_readonly_color="0 0 0 0" bottom_delta="-20"
embedded_items="false" enabled="true" follows="left|top"
font="SansSerifSmall" height="16" hide_border="true" hide_scrollbar="true"
left_delta="0" max_length="65535" mouse_opaque="true"
name="push_to_talk_heading" width="445" word_wrap="true">
Push To Talk
<text bottom_delta="-20" follows="top" height="16" name="push_to_talk_heading">Push To Talk</text>
<text bottom_delta="-77" follows="top" height="65" left_delta="20" name="voice_chat_description">
Push-to-Talk mode lets you control when your voice is transmitted. When in toggle mode,
press and release the push-to-talk trigger to switch your microphone on and off.
When not in toggle mode, the microphone is active only when the trigger is held down.
</text>
<text_editor type="string" length="1" allow_html="false" bg_readonly_color="0 0 0 0" bottom_delta="-60"
embedded_items="false" enabled="false" follows="left|top"
font="SansSerifSmall" height="65" hide_border="true" hide_scrollbar="true"
left_delta="20" max_length="65535" mouse_opaque="true"
name="voice_chat_description" tab_stop="false" width="465" word_wrap="true">
Push-to-Talk mode lets you control when your voice is transmitted. When in toggle mode, press and release the push-to-talk trigger to switch your microphone on and off. When not in toggle mode, the microphone is active only when the trigger is held down.
</text_editor>
<check_box bottom_delta="-20" enabled="true"
follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
label="Use Push-to-Talk in toggle mode" left_delta="0" mouse_opaque="true"
name="push_to_talk_toggle_check" radio_style="false" width="200" />
<text type="string" length="1" allow_html="false" bg_readonly_color="0 0 0 0" bottom_delta="-20"
embedded_items="false" enabled="true" follows="left|top"
font="SansSerifSmall" height="16" hide_border="true" hide_scrollbar="true"
left_delta="4" max_length="65535" mouse_opaque="true"
name="push_to_talk_label" width="445" word_wrap="true">
Push-to-Talk trigger:
</text>
<line_editor border_drop_shadow_visible="false" border_visible="false" bottom_delta="-20"
drop_shadow_visible="true" enabled="false"
follows="top|left" font="SansSerifSmall" halign="right" height="19"
left_delta="0" max_length="254" mouse_opaque="false" name="modifier_combo"
width="280" />
<button bottom_delta="-25" follows="left|top" font="SansSerif" halign="center"
height="20" label="Set Key" left_delta="0" mouse_opaque="true"
name="set_voice_hotkey_button" width="115" />
<button bottom_delta="0" follows="left|top" font="SansSerif" halign="center" height="20"
label="Middle Mouse Button" left_delta="120" mouse_opaque="true"
name="set_voice_middlemouse_button" width="160" />
<text allow_html="false" bg_readonly_color="0 0 0 0" bottom_delta="-25"
embedded_items="false" enabled="true" follows="left|top" height="16"
left="28" name="lip_sync_heading" width="445">
Lip Sync Mouth Animation
</text>
<check_box bottom_delta="-20" enabled="true"
follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
label="Enable lip sync animation"
left_delta="20" mouse_opaque="true" name="enable_lip_sync_check"
radio_style="false" width="200" />
<text allow_html="false" bg_readonly_color="0 0 0 0" bottom_delta="-25"
embedded_items="false" enabled="true" follows="left|top" height="16"
left="28" name="privacy_heading" width="445">
Privacy Options
</text>
<check_box bottom_delta="-20" enabled="true"
follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
label="Only accept voice calls from people on My Friends list"
left_delta="20" mouse_opaque="true" name="voice_call_friends_only_check"
radio_style="false" width="200" />
<check_box bottom_delta="-18" enabled="true"
follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
label="Switch off microphone when ending IM calls"
mouse_opaque="true" name="auto_disengage_mic_check"
radio_style="false" width="200" />
<button bottom_delta="-40" follows="left|top" font="SansSerif" height="20"
label="Device Settings" left="28" mouse_opaque="true"
name="device_settings_btn" width="155" />
<text_editor type="string" length="1" allow_html="false" bg_readonly_color="0 0 0 0" bottom_delta="-32"
embedded_items="false" enabled="false" follows="left|top"
font="SansSerifSmall" height="35" hide_border="true" hide_scrollbar="true"
left="28" max_length="65535" mouse_opaque="true"
name="device_settings_text" tab_stop="false" width="450" word_wrap="true">
NOTE: Running the Device Settings will temporarily disconnect you from Voice Chat, and changes you make will be immediately applied.
</text_editor>
<check_box bottom_delta="-20" follows="top" height="16" initial_value="false" label="Use Push-to-Talk in toggle mode" name="push_to_talk_toggle_check"/>
<text bottom_delta="-20" follows="top" height="16" left_delta="4" name="push_to_talk_label">Push-to-Talk trigger:</text>
<line_editor bottom_delta="-20" follows="top" height="19" name="modifier_combo" width="280"/>
<button bottom_delta="-25" follows="top" height="20" label="Set Key" name="set_voice_hotkey_button" width="115"/>
<button bottom_delta="0" follows="top" height="20" label="Middle Mouse Button" left_delta="120" name="set_voice_middlemouse_button" width="160"/>
<text bottom_delta="-25" follows="top" height="16" left="28" name="lip_sync_heading" width="445">Lip Sync Mouth Animation</text>
<check_box bottom_delta="-20" follows="top" height="16" initial_value="false" label="Enable lip sync animation" left_delta="20" name="enable_lip_sync_check"/>
<text bottom_delta="-25" follows="top" height="16" left="28" name="privacy_heading">Privacy Options</text>
<check_box bottom_delta="-20" follows="top" height="16" initial_value="false" label="Only accept voice calls from people on My Friends list" left_delta="20" name="voice_call_friends_only_check"/>
<check_box bottom_delta="-18" follows="top" height="16" initial_value="false" label="Switch off microphone when ending IM calls" name="auto_disengage_mic_check"/>
<button bottom_delta="-40" follows="top" height="20" label="Device Settings" left="28" mouse_opaque="true" name="device_settings_btn" width="155"/>
<text bottom_delta="-36" follows="top" height="35" left_delta="6" name="device_settings_text">NOTE: Running the Device Settings will temporarily disconnect you from Voice Chat,
and changes you make will be immediately applied.</text>
</panel>

73
indra/newview/skins/default/xui/en-us/panel_preferences_web.xml
View File

@@ -1,64 +1,17 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel border="true" bottom="-409" enabled="true" follows="left|top|right|bottom"
height="408" label="Web" left="102" mouse_opaque="true" name="web"
width="517">
<radio_group bottom="-45" draw_border="false" follows="top|left" height="40" left="12"
<panel border="true" bottom="-409" height="408" label="Web" left="102" name="web" width="517">
<radio_group bottom="-45" draw_border="false" height="40" left="12"
name="use_external_browser" width="480">
<radio_item bottom="-20" height="20" left="0" name="external" width="480"
tool_tip="Use the default system web browser for help, web links, etc. Not recommended if running full screen.">
Use external web browser (Firefox, Safari, Internet Explorer)
</radio_item>
<radio_item bottom="-40" height="20" left="0" name="internal" width="480"
tool_tip="Use the built-in web browser for help, web links, etc. This browser opens as a new window inside Singularity.">
Use built-in web browser
</radio_item>
<radio_item bottom="-20" height="20" name="external" width="480" tool_tip="Use the default system web browser for help, web links, etc. Not recommended if running full screen.">Use external web browser (Firefox, Safari, Internet Explorer)</radio_item>
<radio_item bottom="-40" height="20" name="internal" width="480" tool_tip="Use the built-in web browser for help, web links, etc. This browser opens as a new window inside Singularity.">Use built-in web browser</radio_item>
</radio_group>
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom_delta="-25" drop_shadow_visible="true" enabled="true"
follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
height="10" left="15" mouse_opaque="false" name="cache_size_label_l"
v_pad="0" width="128">
Browser cache:
</text>
<button bottom_delta="-10" enabled="true" follows="left|top" font="SansSerif"
halign="center" height="22" label="Clear Now" left="140"
mouse_opaque="true" name="clear_cache" scale_image="true" width="85" />
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom_delta="-30" drop_shadow_visible="true" enabled="true"
follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
height="10" left="15" mouse_opaque="false" name="cookie_label" v_pad="0"
width="128">
Cookies:
</text>
<check_box bottom_delta="-7" enabled="true" follows="left|top"
font="SansSerifSmall" height="16" initial_value="false"
label="Accept cookies from sites" left="140" mouse_opaque="true"
name="cookies_enabled" radio_style="false" width="256" />
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom_delta="-24" drop_shadow_visible="true" enabled="true"
follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
height="10" left="15" mouse_opaque="false" name="proxy_label" v_pad="0"
width="128">
Web Proxy:
</text>
<check_box bottom_delta="-7" enabled="true"
follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
label="Enable Web Proxy" left="140" mouse_opaque="true"
name="web_proxy_enabled" radio_style="false" width="256" />
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom_delta="-25" drop_shadow_visible="true" enabled="true"
follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
height="10" left="140" mouse_opaque="false" name="proxy_text_label"
v_pad="0" width="128">
Address:
</text>
<line_editor bottom_delta="-8" enabled="true" follows="left|top" font="SansSerif"
height="20" left="217" name="web_proxy_editor"
tool_tip="The name or IP address of the proxy you would like to use"
width="200" />
<spinner bottom_delta="-25" decimal_digits="0"
enabled="true" follows="left|top" height="16" increment="1"
initial_val="80" label="Port Number:" label_width="75" left="140"
max_val="12000" min_val="10" mouse_opaque="true" name="web_proxy_port"
width="140" />
<text bottom_delta="-25" follows="top" height="10" left="15" name="cache_size_label_l">Browser cache:</text>
<button bottom_delta="-10" follows="top" height="22" label="Clear Now" left="140" name="clear_cache" scale_image="true" width="85"/>
<text bottom_delta="-30" follows="top" height="10" left="15" name="cookie_label">Cookies:</text>
<check_box bottom_delta="-7" follows="top" height="16" initial_value="false" label="Accept cookies from sites" left="140" name="cookies_enabled"/>
<text bottom_delta="-24" follows="top" height="10" left="15" name="proxy_label">Web Proxy:</text>
<check_box bottom_delta="-7" follows="top" height="16" initial_value="false" label="Enable Web Proxy" left="140" name="web_proxy_enabled"/>
<text bottom_delta="-25" follows="top" height="10" left="30" name="proxy_text_label">Address:</text>
<line_editor bottom_delta="-8" follows="top" font="SansSerif" height="20" left="106" name="web_proxy_editor" tool_tip="The name or IP address of the proxy you would like to use" width="300"/>
<spinner bottom_delta="-25" decimal_digits="0" follows="top" height="16" increment="1" initial_val="80" label="Port Number:" label_width="75" left="30" max_val="65535" min_val="0" name="web_proxy_port" width="140"/>
</panel>

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

@@ -4,7 +4,7 @@
height="28" name="toolbar" width="1024">
<string name="Redock Windows">Redock Windows</string>
<!-- panel bottom="0" filename="panel_bg_toolbar.xml" height="28" left="0" width="1024" /-->
<panel bottom="0" filename="panel_bg_toolbar.xml" height="28" left="0" width="1024"/>
<layout_stack name="toolbar_stack" follows="left|right|bottom|top" bottom="2" left="1" width="1022" height="26" min_width="200" min_height="26" orientation="horizontal" border_size="0">
<icon image_name="spacer24.tga" width="2" height="2" follows="left|right" auto_resize="false" color="0,0,0,0" left="0" />
<button bottom="0" font="SansSerif" height="24"