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

fixed up the login panel a tiny bit

Browse Source
This commit is contained in:
Hazim Gazov
2010-04-28 16:31:33 -03:00
parent 5c25824144
commit ab2e1c9702
8 changed files with 69 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8426,7 +8426,7 @@
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>S32</string>
<string>U32</string>
<key>Value</key>
<integer>1</integer>
</map>
@@ -8437,7 +8437,7 @@
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>S32</string>
<string>U32</string>
<key>Value</key>
<integer>4</integer>
</map>
@@ -8448,7 +8448,7 @@
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>S32</string>
<string>U32</string>
<key>Value</key>
<integer>0</integer>
</map>
@@ -8459,7 +8459,7 @@
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>S32</string>
<string>U32</string>
<key>Value</key>
<integer>0</integer>
</map>

37
indra/newview/llappviewer.cpp
View File

@@ -595,11 +595,12 @@ bool LLAppViewer::init()
// Build a string representing the current version number.
// <edit> meh
gCurrentVersion = gSavedSettings.getString("SpecifiedChannel") + " " +
gSavedSettings.getInteger("SpecifiedVersionMaj") + "." +
gSavedSettings.getInteger("SpecifiedVersionMin") + "." +
gSavedSettings.getInteger("SpecifiedVersionPatch") + "." +
gSavedSettings.getInteger("SpecifiedVersionBuild");
gCurrentVersion = llformat("%s %d.%d.%d (%d)",
gSavedSettings.getString("SpecifiedChannel").c_str(),
gSavedSettings.getU32("SpecifiedVersionMaj"),
gSavedSettings.getU32("SpecifiedVersionMin"),
gSavedSettings.getU32("SpecifiedVersionPatch"),
gSavedSettings.getU32("SpecifiedVersionBuild") );
// </edit>
//////////////////////////////////////////////////////////////////////////////
@@ -2318,10 +2319,10 @@ void LLAppViewer::writeSystemInfo()
// <edit>
//gDebugInfo["ClientInfo"]["Name"] = gSavedSettings.getString("VersionChannelName");
gDebugInfo["ClientInfo"]["Name"] = gSavedSettings.getString("SpecifiedChannel");
gDebugInfo["ClientInfo"]["MajorVersion"] = gSavedSettings.getInteger("SpecifiedVersionMaj");
gDebugInfo["ClientInfo"]["MinorVersion"] = gSavedSettings.getInteger("SpecifiedVersionMin");
gDebugInfo["ClientInfo"]["PatchVersion"] = gSavedSettings.getInteger("SpecifiedVersionPatch");
gDebugInfo["ClientInfo"]["BuildVersion"] = gSavedSettings.getInteger("SpecifiedVersionBuild");
gDebugInfo["ClientInfo"]["MajorVersion"] = (S32)gSavedSettings.getU32("SpecifiedVersionMaj");
gDebugInfo["ClientInfo"]["MinorVersion"] = (S32)gSavedSettings.getU32("SpecifiedVersionMin");
gDebugInfo["ClientInfo"]["PatchVersion"] = (S32)gSavedSettings.getU32("SpecifiedVersionPatch");
gDebugInfo["ClientInfo"]["BuildVersion"] = (S32)gSavedSettings.getU32("SpecifiedVersionBuild");
// </edit>
gDebugInfo["CAFilename"] = gDirUtilp->getCAFile();
@@ -2357,7 +2358,7 @@ void LLAppViewer::writeSystemInfo()
// Dump some debugging info
LL_INFOS("SystemInfo") << gSecondLife
<< " version " << gSavedSettings.getInteger("SpecifiedVersionMaj") << "." << gSavedSettings.getInteger("SpecifiedVersionMin") << "." << gSavedSettings.getInteger("SpecifiedVersionPatch")
<< " version " << gSavedSettings.getU32("SpecifiedVersionMaj") << "." << gSavedSettings.getU32("SpecifiedVersionMin") << "." << gSavedSettings.getU32("SpecifiedVersionPatch")
<< LL_ENDL;
// Dump the local time and time zone
@@ -2419,10 +2420,10 @@ void LLAppViewer::handleViewerCrash()
//gDebugInfo["ClientInfo"]["Name"] = gSavedSettings.getString("VersionChannelName");
gDebugInfo["ClientInfo"]["Name"] = gSavedSettings.getString("SpecifiedChannel");
gDebugInfo["ClientInfo"]["MajorVersion"] = gSavedSettings.getInteger("SpecifiedVersionMaj");
gDebugInfo["ClientInfo"]["MinorVersion"] = gSavedSettings.getInteger("SpecifiedVersionMin");
gDebugInfo["ClientInfo"]["PatchVersion"] = gSavedSettings.getInteger("SpecifiedVersionPatch");
gDebugInfo["ClientInfo"]["BuildVersion"] = gSavedSettings.getInteger("SpecifiedVersionBuild");
gDebugInfo["ClientInfo"]["MajorVersion"] = (S32)gSavedSettings.getU32("SpecifiedVersionMaj");
gDebugInfo["ClientInfo"]["MinorVersion"] = (S32)gSavedSettings.getU32("SpecifiedVersionMin");
gDebugInfo["ClientInfo"]["PatchVersion"] = (S32)gSavedSettings.getU32("SpecifiedVersionPatch");
gDebugInfo["ClientInfo"]["BuildVersion"] = (S32)gSavedSettings.getU32("SpecifiedVersionBuild");
// </edit>
LLParcel* parcel = LLViewerParcelMgr::getInstance()->getAgentParcel();
@@ -4084,10 +4085,10 @@ void LLAppViewer::handleLoginComplete()
gDebugInfo["ClientInfo"]["Name"] = gSavedSettings.getString("SpecifiedChannel");
// </edit>
gDebugInfo["ClientInfo"]["MajorVersion"] = gSavedSettings.getInteger("SpecifiedVersionMaj");
gDebugInfo["ClientInfo"]["MinorVersion"] = gSavedSettings.getInteger("SpecifiedVersionMin");
gDebugInfo["ClientInfo"]["PatchVersion"] = gSavedSettings.getInteger("SpecifiedVersionPatch");
gDebugInfo["ClientInfo"]["BuildVersion"] = gSavedSettings.getInteger("SpecifiedVersionBuild");
gDebugInfo["ClientInfo"]["MajorVersion"] = (S32)gSavedSettings.getU32("SpecifiedVersionMaj");
gDebugInfo["ClientInfo"]["MinorVersion"] = (S32)gSavedSettings.getU32("SpecifiedVersionMin");
gDebugInfo["ClientInfo"]["PatchVersion"] = (S32)gSavedSettings.getU32("SpecifiedVersionPatch");
gDebugInfo["ClientInfo"]["BuildVersion"] = (S32)gSavedSettings.getU32("SpecifiedVersionBuild");
LLParcel* parcel = LLViewerParcelMgr::getInstance()->getAgentParcel();
if ( parcel && parcel->getMusicURL()[0])

26
indra/newview/llfloaterreporter.cpp
View File

@@ -85,6 +85,10 @@
#include "llassetuploadresponders.h"
// <edit>
#include "llviewercontrol.h"
// </edit>
const U32 INCLUDE_SCREENSHOT = 0x01 << 0;
//-----------------------------------------------------------------------------
@@ -703,10 +707,10 @@ LLSD LLFloaterReporter::gatherReport()
if ( mReportType == BUG_REPORT)
{
summary << short_platform << " V" << gSavedSettings.getInteger("SpecifiedVersionMaj") << "."
<< gSavedSettings.getInteger("SpecifiedVersionMin") << "."
<< gSavedSettings.getInteger("SpecifiedVersionPatch") << "."
<< gSavedSettings.getInteger("SpecifiedVersionBuild")
summary << short_platform << " V" << gSavedSettings.getU32("SpecifiedVersionMaj") << "."
<< gSavedSettings.getU32("SpecifiedVersionMin") << "."
<< gSavedSettings.getU32("SpecifiedVersionPatch") << "."
<< gSavedSettings.getU32("SpecifiedVersionBuild")
<< " (" << regionp->getName() << ")"
<< "[" << category_name << "] "
<< "\"" << childGetValue("summary_edit").asString() << "\"";
@@ -724,10 +728,10 @@ LLSD LLFloaterReporter::gatherReport()
std::ostringstream details;
if (mReportType != BUG_REPORT)
{
details << "V" << gSavedSettings.getInteger("SpecifiedVersionMaj") << "." // client version moved to body of email for abuse reports
<< gSavedSettings.getInteger("SpecifiedVersionMin") << "."
<< gSavedSettings.getInteger("SpecifiedVersionPatch") << "."
<< gSavedSettings.getInteger("SpecifiedVersionBuild") << std::endl << std::endl;
details << "V" << gSavedSettings.getU32("SpecifiedVersionMaj") << "." // client version moved to body of email for abuse reports
<< gSavedSettings.getU32("SpecifiedVersionMin") << "."
<< gSavedSettings.getU32("SpecifiedVersionPatch") << "."
<< gSavedSettings.getU32("SpecifiedVersionBuild") << std::endl << std::endl;
}
std::string object_name = childGetText("object_name");
std::string owner_name = childGetText("owner_name");
@@ -748,9 +752,9 @@ LLSD LLFloaterReporter::gatherReport()
std::string version_string;
version_string = llformat(
"%d.%d.%d %s %s %s %s",
gSavedSettings.getInteger("SpecifiedVersionMaj"),
gSavedSettings.getInteger("SpecifiedVersionMin"),
gSavedSettings.getInteger("SpecifiedVersionPatch"),
gSavedSettings.getU32("SpecifiedVersionMaj"),
gSavedSettings.getU32("SpecifiedVersionMin"),
gSavedSettings.getU32("SpecifiedVersionPatch"),
platform,
gSysCPU.getFamily().c_str(),
gGLManager.mGLRenderer.c_str(),

2
indra/newview/llpanellogin.cpp
View File

@@ -1006,7 +1006,7 @@ void LLPanelLogin::loadLoginPage()
// <edit>
// Channel and Version
std::string version = llformat("%d.%d.%d (%d)",
gSavedSettings.getInteger("SpecifiedVersionMaj"), gSavedSettings.getInteger("SpecifiedVersionMin"), gSavedSettings.getInteger("SpecifiedVersionPatch"), gSavedSettings.getInteger("SpecifiedVersionBuild"));
gSavedSettings.getU32("SpecifiedVersionMaj"), gSavedSettings.getU32("SpecifiedVersionMin"), gSavedSettings.getU32("SpecifiedVersionPatch"), gSavedSettings.getU32("SpecifiedVersionBuild"));
//char* curl_channel = curl_escape(gSavedSettings.getString("VersionChannelName").c_str(), 0);
char* curl_channel = curl_escape(gSavedSettings.getString("SpecifiedChannel").c_str(), 0);

6
indra/newview/llstartup.cpp
View File

@@ -906,9 +906,9 @@ bool idle_startup()
if(!start_messaging_system(
message_template_path,
port,
gSavedSettings.getInteger("SpecifiedVersionMaj"),
gSavedSettings.getInteger("SpecifiedVersionMin"),
gSavedSettings.getInteger("SpecifiedVersionPatch"),
gSavedSettings.getU32("SpecifiedVersionMaj"),
gSavedSettings.getU32("SpecifiedVersionMin"),
gSavedSettings.getU32("SpecifiedVersionPatch"),
FALSE,
std::string(),
responder,

14
indra/newview/lltranslate.cpp
View File

@@ -37,6 +37,10 @@
#include "llui.h"
#include "llversionviewer.h"
// <edit>
#include "llviewercontrol.h"
// </edit>
// These two are concatenated with the language specifiers to form a complete Google Translate URL
const char* LLTranslate::m_GoogleURL = "http://ajax.googleapis.com/ajax/services/language/translate?v=1.0&q=";
const char* LLTranslate::m_GoogleLangSpec = "&langpair=";
@@ -61,11 +65,11 @@ void LLTranslate::translateMessage(LLHTTPClient::ResponderPtr &result, const std
//<edit>
std::string user_agent = llformat("%s %d.%d.%d (%d)",
gSavedSettings.getInteger("SpecifiedChannel"),
gSavedSettings.getInteger("SpecifiedVersionMaj"),
gSavedSettings.getInteger("SpecifiedVersionMin"),
gSavedSettings.getInteger("SpecifiedVersionPatch"),
gSavedSettings.getInteger("SpecifiedVersionBuild") );
gSavedSettings.getString("SpecifiedChannel").c_str(),
gSavedSettings.getU32("SpecifiedVersionMaj"),
gSavedSettings.getU32("SpecifiedVersionMin"),
gSavedSettings.getU32("SpecifiedVersionPatch"),
gSavedSettings.getU32("SpecifiedVersionBuild") );
//</edit>
if (!m_Header.size())

2
indra/newview/llviewermedia.cpp
View File

@@ -260,7 +260,7 @@ std::string LLViewerMedia::getCurrentUserAgent()
// http://www.mozilla.org/build/revised-user-agent-strings.html
std::ostringstream codec;
codec << "SecondLife/";
codec << gSavedSettings.getInteger("SpecifiedVersionMaj") << "." << gSavedSettings.getInteger("SpecifiedVersionMin") << "." << gSavedSettings.getInteger("SpecifiedVersionPatch") << "." << gSavedSettings.getInteger("SpecifiedVersionBuild");
codec << gSavedSettings.getU32("SpecifiedVersionMaj") << "." << gSavedSettings.getU32("SpecifiedVersionMin") << "." << gSavedSettings.getU32("SpecifiedVersionPatch") << "." << gSavedSettings.getU32("SpecifiedVersionBuild");
codec << " (" << channel << "; " << skin_name << " skin)";
llinfos << codec.str() << llendl;

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

@@ -104,32 +104,37 @@
<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="54" drop_shadow_visible="true" follows="left|bottom"
font="SansSerif" h_pad="0" halign="left" height="16"
left="800" mouse_opaque="true" name="channel_text" v_pad="0" width="120">
left="750" mouse_opaque="true" name="channel_text" v_pad="0" width="120" font_size="small">
Channel:
</text>
<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="0"
follows="left|bottom" font="SansSerif" handle_edit_keys_directly="true"
height="20" left_delta="64" max_length="64" mouse_opaque="true"
name="channel_edit" select_all_on_focus_received="true" width="320" />
name="channel_edit" select_all_on_focus_received="true" width="230" font_size="small" />
<check_box bottom="31" follows="left|bottom" font="SansSerifSmall" height="16"
initial_value="false" label="MAC:" control_name="SpecifyMAC"
left="800" mouse_opaque="true" name="mac_check" width="138" />
left="750" mouse_opaque="true" name="mac_check" width="138" font_size="small" />
<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="0"
follows="left|bottom" font="SansSerif" handle_edit_keys_directly="true"
height="20" left_delta="64" max_length="32" mouse_opaque="true"
name="mac_edit" select_all_on_focus_received="true" width="320" enabled="false" />
name="mac_edit" select_all_on_focus_received="true" width="230" enabled="false" font_size="small" />
<check_box bottom="8" follows="left|bottom" font="SansSerifSmall" height="16"
initial_value="false" label="ID0:" control_name="SpecifyID0"
left="800" mouse_opaque="true" name="id0_check" width="138" />
left="750" mouse_opaque="true" name="id0_check" width="138" font_size="small" />
<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="0"
follows="left|bottom" font="SansSerif" handle_edit_keys_directly="true"
follows="left|bottom" font="SansSerif" font_size="8pt" handle_edit_keys_directly="true"
height="20" left_delta="64" max_length="32" mouse_opaque="true"
name="id0_edit" select_all_on_focus_received="true" width="320" enabled="false" />
name="id0_edit" select_all_on_focus_received="true" width="230" enabled="false" font_size="small" />
<panel border="true" bottom_delta="0" follows="left|top|right|bottom" height="20"
label="Version" left="1000" name="General" width="270">
BIDOOF
</panel>
<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="54" drop_shadow_visible="true" follows="left|bottom"
font="SansSerif" h_pad="0" halign="left" height="16"
left="1100" mouse_opaque="true" name="channel_text" v_pad="0" width="120" font_size="small">
Version:
</text>
<spinner decimal_digits="0" follows="left|bottom" height="16"
increment="1" initial_val="0" label="Maj" label_width="10" left_delta="20"
max_val="512" min_val="0" mouse_opaque="true" name="Ver Maj"
text_enabled_color="110, 15, 15, 255" width="87" font_size="small" />
</panel>