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

added some settings from SLPE

Browse Source
This commit is contained in:
Hazim Gazov
2010-04-23 09:34:47 -03:00
parent fb28246485
commit e204d77d52
8 changed files with 289 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4493,6 +4493,104 @@
<integer>0</integer>
</array>
</map>
<key>FloaterKeyToolRect</key>
<map>
<key>Comment</key>
<string>Rectangle for KeyTool floater.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Rect</string>
<key>Value</key>
<array>
<integer>439</integer>
<integer>759</integer>
<integer>593</integer>
<integer>443</integer>
</array>
</map>
<key>KeyToolAutomaticOpen</key>
<map>
<key>Comment</key>
<string>Automatically open KeyTool results</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>1</integer>
</map>
<key>KeyToolAutomaticClose</key>
<map>
<key>Comment</key>
<string>Automatically close KeyTool floater when a result is found</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>1</integer>
</map>
<key>FloaterSoundsRect</key>
<map>
<key>Comment</key>
<string>Rectangle for sounds log floater.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Rect</string>
<key>Value</key>
<array>
<integer>0</integer>
<integer>0</integer>
<integer>0</integer>
<integer>0</integer>
</array>
</map>
<key>FloaterSoundsLogAvatars</key>
<map>
<key>Comment</key>
<string>Show SoundTriggers/gestures played by agents in the log. Also includes collision sounds if enabled</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>1</integer>
</map>
<key>FloaterSoundsLogObjects</key>
<map>
<key>Comment</key>
<string>Show sounds played by objects in the log. Also includes collision sounds if enabled</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>1</integer>
</map>
<key>FloaterSoundsLogCollisions</key>
<map>
<key>Comment</key>
<string>Don't filter out default collision sounds in the log</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>1</integer>
</map>
<key>FloaterSoundsLogRepeats</key>
<map>
<key>Comment</key>
<string>Only show one entry for each unique asset ID in the log</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>1</integer>
</map>
<key>FlyBtnState</key>
<map>
<key>Comment</key>
@@ -4503,6 +4601,17 @@
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>AlwaysAllowFly</key>
<map>
<key>Comment</key>
<string>Ignore parcel/region setting that blocks flying</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>1</integer>
</map>
<key>FlycamAbsolute</key>
<map>
@@ -6449,6 +6558,17 @@
<string>String</string>
<key>Value</key>
<string />
</map>
<key>Nimble</key>
<map>
<key>Comment</key>
<string>Disables landing and jumping delays.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>NoAudio</key>
<map>
@@ -8169,6 +8289,83 @@
<key>Value</key>
<integer>1</integer>
</map>
<key>SpecifyMAC</key>
<map>
<key>Comment</key>
<string>Send specified mac instead of real mac</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>SpecifyID0</key>
<map>
<key>Comment</key>
<string>Send specified hdd serial instead of real hdd serial</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>SpecifiedChannel</key>
<map>
<key>Comment</key>
<string>What the viewer identifies itself as</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>String</string>
<key>Value</key>
<string>Imprudence</string>
</map>
<key>SpecifiedMAC</key>
<map>
<key>Comment</key>
<string>Custom MAC</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>String</string>
<key>Value</key>
<string>00000000000000000000000000000000</string>
</map>
<key>SpecifiedID0</key>
<map>
<key>Comment</key>
<string>Custom ID0</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>String</string>
<key>Value</key>
<string>00000000000000000000000000000000</string>
</map>
<key>SpoofProtectionLevel</key>
<map>
<key>Comment</key>
<string>Specifies level of protection against IP spoofing attacks. Requires restart. 0 = no protection, 1 = sequence only, 2 = minimal canaries, 3 = canaries all over the place</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>U32</string>
<key>Value</key>
<integer>255</integer>
</map>
<key>SpoofProtectionAlerts</key>
<map>
<key>Comment</key>
<string>Specifies whether you receive an alert when a packet is dropped due to IP spoofing protection settings</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>1</integer>
</map>
<key>RenderReflectionDetail</key>
<map>
<key>Comment</key>
@@ -8542,6 +8739,39 @@
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>RectangleSelectOverlap</key>
<map>
<key>Comment</key>
<string>Selection box works as long as it remotely touches or something</string>
<key>Persist</key>
<integer>0</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>InterceptorAffectYours</key>
<map>
<key>Comment</key>
<string>Controls whether the interceptor stops your own objects too</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>InterceptorRange</key>
<map>
<key>Comment</key>
<string>Controls the range of the interceptor effect</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>F32</string>
<key>Value</key>
<integer>10.0</integer>
</map>
<key>ScaleStretchTextures</key>
<map>
@@ -9193,7 +9423,7 @@
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
<integer>1</integer>
</map>
<key>ShowMovementControls</key>
<map>
@@ -11512,7 +11742,7 @@
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
<integer>1</integer>
</map>
<key>UseDefaultColorPicker</key>
<map>

2
indra/newview/llappviewerlinux.cpp
View File

@@ -734,7 +734,7 @@ std::string LLAppViewerLinux::generateSerialNumber()
serial_md5[0] = 0;
#if LL_SOLARIS
// TODO
#else
#elseif EXPERIMENTAL_SERIAL_NUM
// I'm going to assume this works on everything but solaris
std::string rootDeviceName = "";
std::string rootDeviceUUID = "";

11
indra/newview/llfloaterabout.cpp
View File

@@ -118,7 +118,10 @@ LLFloaterAbout::LLFloaterAbout()
+ llformat(" %d.%d.%d (%d) %s %s (%s)\n",
LL_VERSION_MAJOR, LL_VERSION_MINOR, LL_VERSION_PATCH, LL_VIEWER_BUILD,
__DATE__, __TIME__,
gSavedSettings.getString("VersionChannelName").c_str());
// <edit>
// gSavedSettings.getString("VersionChannelName").c_str());
gSavedSettings.getString("SpecifiedChannel").c_str());
// </edit>
support_widget->appendColoredText(version, FALSE, FALSE, gColors.getColor("TextFgReadOnlyColor"));
support_widget->appendStyledText(LLTrans::getString("ReleaseNotes"), false, false, viewer_link_style);
@@ -289,7 +292,11 @@ static std::string get_viewer_release_notes_url()
<< LL_VERSION_BUILD;
LLSD query;
query["channel"] = gSavedSettings.getString("VersionChannelName");
// <edit>
//query["channel"] = gSavedSettings.getString("VersionChannelName");
query["channel"] = gSavedSettings.getString("SpecifiedChannel");
// I think the version below is only numbers..
// </edit>
query["version"] = version.str();
std::ostringstream url;

26
indra/newview/llpanellogin.cpp
View File

@@ -77,6 +77,9 @@
#include "llglheaders.h"
// <edit>
#include "llappviewer.h"
// </edit>
#define USE_VIEWER_AUTH 0
const S32 BLACK_BORDER_HEIGHT = 160;
@@ -103,7 +106,9 @@ public:
LLLoginRefreshHandler gLoginRefreshHandler;
// <edit>
std::string gFullName;
// </edit>
// helper class that trys to download a URL from a web site and calls a method
// on parent class indicating if the web server is working or not
@@ -296,7 +301,10 @@ LLPanelLogin::LLPanelLogin(const LLRect &rect,
// childSetAction("quit_btn", onClickQuit, this);
std::string channel = gSavedSettings.getString("VersionChannelName");
// <edit>
//std::string channel = gSavedSettings.getString("VersionChannelName");
std::string channel = gSavedSettings.getString("SpecifiedChannel");
// </edit>
std::string version = llformat("%d.%d.%d (%d)",
LL_VERSION_MAJOR,
LL_VERSION_MINOR,
@@ -355,6 +363,11 @@ LLPanelLogin::LLPanelLogin(const LLRect &rect,
refreshLocation( false );
#endif
// <edit>
std::string specified_channel = gSavedSettings.getString("SpecifiedChannel");
getChild<LLLineEditor>("channel_edit")->setText(specified_channel);
// </edit>
}
void LLPanelLogin::setSiteIsAlive( bool alive )
@@ -921,7 +934,10 @@ void LLPanelLogin::loadLoginPage()
std::string version = llformat("%d.%d.%d (%d)",
LL_VERSION_MAJOR, LL_VERSION_MINOR, LL_VERSION_PATCH, LL_VIEWER_BUILD);
char* curl_channel = curl_escape(gSavedSettings.getString("VersionChannelName").c_str(), 0);
// <edit>
//char* curl_channel = curl_escape(gSavedSettings.getString("VersionChannelName").c_str(), 0);
char* curl_channel = curl_escape(gSavedSettings.getString("SpecifiedChannel").c_str(), 0);
// </edit>
char* curl_version = curl_escape(version.c_str(), 0);
oStr << "&channel=" << curl_channel;
@@ -1083,6 +1099,10 @@ void LLPanelLogin::onClickConnect(void *)
{
if (sInstance && sInstance->mCallback)
{
// <edit> save identity settings for login
std::string specified_channel = sInstance->getChild<LLLineEditor>("channel_edit")->getText();
gSavedSettings.setString("SpecifiedChannel", specified_channel);
// </edit>
// tell the responder we're not here anymore
if ( gResponsePtr )
gResponsePtr->setParent( 0 );

16
indra/newview/lluserauth.cpp
View File

@@ -131,8 +131,12 @@ void LLUserAuth::authenticate(
XMLRPC_VectorAppendString(params, "last", lastname.c_str(), 0);
XMLRPC_VectorAppendString(params, "web_login_key", web_login_key.getString().c_str(), 0);
XMLRPC_VectorAppendString(params, "start", start.c_str(), 0);
XMLRPC_VectorAppendString(params, "version", gCurrentVersion.c_str(), 0); // Includes channel name
XMLRPC_VectorAppendString(params, "channel", gSavedSettings.getString("VersionChannelName").c_str(), 0);
// <edit>
//XMLRPC_VectorAppendString(params, "version", gCurrentVersion.c_str(), 0); // Includes channel name
//XMLRPC_VectorAppendString(params, "channel", gSavedSettings.getString("VersionChannelName").c_str(), 0);
XMLRPC_VectorAppendString(params, "version", gSavedSettings.getString("SpecifiedChannel").c_str(), 0); // Includes channel name
XMLRPC_VectorAppendString(params, "channel", gSavedSettings.getString("SpecifiedChannel").c_str(), 0);
// </edit>
XMLRPC_VectorAppendString(params, "platform", PLATFORM_STRING, 0);
XMLRPC_VectorAppendString(params, "mac", hashed_mac.c_str(), 0);
// A bit of security through obscurity: id0 is volume_serial
@@ -217,8 +221,12 @@ void LLUserAuth::authenticate(
XMLRPC_VectorAppendString(params, "last", lastname.c_str(), 0);
XMLRPC_VectorAppendString(params, "passwd", dpasswd.c_str(), 0);
XMLRPC_VectorAppendString(params, "start", start.c_str(), 0);
XMLRPC_VectorAppendString(params, "version", gCurrentVersion.c_str(), 0); // Includes channel name
XMLRPC_VectorAppendString(params, "channel", gSavedSettings.getString("VersionChannelName").c_str(), 0);
// <edit>
//XMLRPC_VectorAppendString(params, "version", gCurrentVersion.c_str(), 0); // Includes channel name
//XMLRPC_VectorAppendString(params, "channel", gSavedSettings.getString("VersionChannelName").c_str(), 0);
XMLRPC_VectorAppendString(params, "version", gSavedSettings.getString("SpecifiedChannel").c_str(), 0); // Includes channel name
XMLRPC_VectorAppendString(params, "channel", gSavedSettings.getString("SpecifiedChannel").c_str(), 0);
// </edit>
XMLRPC_VectorAppendString(params, "platform", PLATFORM_STRING, 0);
XMLRPC_VectorAppendString(params, "mac", hashed_mac.c_str(), 0);
// A bit of security through obscurity: id0 is volume_serial

5
indra/newview/llviewermedia.cpp
View File

@@ -247,7 +247,10 @@ std::string LLViewerMedia::getCurrentUserAgent()
// Just in case we need to check browser differences in A/B test
// builds.
std::string channel = gSavedSettings.getString("VersionChannelName");
// <edit>
//std::string channel = gSavedSettings.getString("VersionChannelName");
std::string channel = gSavedSettings.getString("SpecifiedChannel");
// </edit>
// append our magic version number string to the browser user agent id
// See the HTTP 1.0 and 1.1 specifications for allowed formats:

8
indra/newview/llviewerstats.cpp
View File

@@ -647,6 +647,9 @@ public:
*/
void send_stats()
{
// <edit> Don't want to send ViewerStats
if(1) return;
// </edit>
// IW 9/23/02 I elected not to move this into LLViewerStats
// because it depends on too many viewer.cpp globals.
// Someday we may want to merge all our stats into a central place
@@ -692,7 +695,10 @@ void send_stats()
// send fps only for time app spends in foreground
agent["fps"] = (F32)gForegroundFrameCount / gForegroundTime.getElapsedTimeF32();
agent["version"] = gCurrentVersion;
// <edit>
//agent["version"] = gCurrentVersion;
agent["version"] = gSavedSettings.getString("SpecifiedChannel");
// </edit>
std::string language = LLUI::getLanguage();
agent["language"] = language;

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

@@ -99,6 +99,6 @@
font="SansSerifSmall" h_pad="0" halign="right" height="16"
left="-310" mouse_opaque="true" name="channel_text" v_pad="0" width="300"
hover="true" hover_color="50 115 185">
[VERSION]
[CHANNEL] [VERSION]
</text>
</panel>