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

Collection of minor edits from Imprudence to fix bugs, etcetera. Also updated the version.

Browse Source 
Also made the version almost entirely hard-coded to remove any remnants of Inertia's spoofer.

Signed-off-by: Beeks <HgDelirium@gmail.com>
This commit is contained in:
Beeks
2010-09-21 14:49:46 -04:00
parent 64abd1889f
commit 2faa13a37b
19 changed files with 69 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
indra/newview/jcfloaterareasearch.cpp
View File

@@ -16,7 +16,7 @@
* may be used to endorse or promote products derived from this
* software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY MODULAR SYSTEMS LTD AND CONTRIBUTORS <EFBFBD>AS IS<EFBFBD>
* THIS SOFTWARE IS PROVIDED BY MODULAR SYSTEMS LTD AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
* THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL MODULAR SYSTEMS OR CONTRIBUTORS
@@ -55,7 +55,7 @@ std::string JCFloaterAreaSearch::sSearchedGroup;
const std::string request_string = "JCFloaterAreaSearch::Requested_<64><5F><EFBFBD>";
const F32 min_refresh_interval = 0.25f; // Minimum interval between list refreshes in seconds.
JCFloaterAreaSearch::JCFloaterAreaSearch() :
JCFloaterAreaSearch::JCFloaterAreaSearch() :
LLFloater(),
mCounterText(0),
mResultList(0)
@@ -149,7 +149,7 @@ void JCFloaterAreaSearch::toggle()
void JCFloaterAreaSearch::onDoubleClick(void *userdata)
{
JCFloaterAreaSearch *self = (JCFloaterAreaSearch*)userdata;
LLScrollListItem *item = self->mResultList->getFirstSelected();
LLScrollListItem *item = self->mResultList->getFirstSelected();
if (!item) return;
LLUUID object_id = item->getUUID();
LLViewerObject* objectp = gObjectList.findObject(object_id);

8
indra/newview/llpanellogin.cpp
View File

@@ -966,14 +966,12 @@ void LLPanelLogin::loadLoginPage()
oStr << "&firstlogin=TRUE";
}
// <edit>
// Channel and Version
std::string version = llformat("%d.%d.%d (%d)",
LL_VERSION_MAJOR, LL_VERSION_MINOR, LL_VERSION_PATCH, LL_VERSION_BUILD);
//char* curl_channel = curl_escape(LL_CHANNEL.c_str(), 0);
char* curl_channel = curl_escape(gSavedSettings.getString("SpecifiedChannel").c_str(), 0);
// </edit>
char* curl_channel = curl_escape(LL_CHANNEL, 0);
char* curl_version = curl_escape(version.c_str(), 0);
oStr << "&channel=" << curl_channel;

2
indra/newview/lltranslate.cpp
View File

@@ -65,7 +65,7 @@ void LLTranslate::translateMessage(LLHTTPClient::ResponderPtr &result, const std
//<edit>
std::string user_agent = llformat("%s %d.%d.%d (%d)",
gSavedSettings.getString("SpecifiedChannel").c_str(),
LL_CHANNEL,
LL_VERSION_MAJOR,
LL_VERSION_MINOR,
LL_VERSION_PATCH,

16
indra/newview/lluserauth.cpp
View File

@@ -137,15 +137,15 @@ void LLUserAuth::authenticate(
//WOW NEIL YOU ARE SO AWESOME!!
XMLRPC_VectorAppendString(params, "version", std::string(
gSavedSettings.getString("SpecifiedChannel") + " " +
llformat("%s", LL_CHANNEL) + " " +
llformat("%d", LL_VERSION_MAJOR) + "." +
llformat("%d", LL_VERSION_MINOR) + "." +
llformat("%d", LL_VERSION_PATCH) + "." +
llformat("%d", LL_VERSION_BUILD)
).c_str(), 0); // Includes channel name
XMLRPC_VectorAppendString(params, "channel", gSavedSettings.getString("SpecifiedChannel").c_str(), 0);
// </edit>
XMLRPC_VectorAppendString(params, "channel", std::string(LL_CHANNEL).c_str(), 0);
XMLRPC_VectorAppendString(params, "platform", PLATFORM_STRING, 0);
XMLRPC_VectorAppendString(params, "mac", hashed_mac.c_str(), 0);
@@ -232,22 +232,18 @@ 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);
// <edit>
//Partially correct but I'm very skeptical of the gSavedSettings part. Imprudence does it, but that doesn't mean it's right... -HgB
//XMLRPC_VectorAppendString(params, "version", gCurrentVersion.c_str(), 0); // Includes channel name
//XMLRPC_VectorAppendString(params, "channel", gSavedSettings.getString("VersionChannelName").c_str(), 0);
//WOW NEIL YOU ARE SO AWESOME!!
XMLRPC_VectorAppendString(params, "version", std::string(
gSavedSettings.getString("SpecifiedChannel") + " " +
llformat("%s", LL_CHANNEL) + " " +
llformat("%d", LL_VERSION_MAJOR) + "." +
llformat("%d", LL_VERSION_MINOR) + "." +
llformat("%d", LL_VERSION_PATCH) + "." +
llformat("%d", LL_VERSION_BUILD)
).c_str(), 0); // Includes channel name
XMLRPC_VectorAppendString(params, "channel", gSavedSettings.getString("SpecifiedChannel").c_str(), 0);
// </edit>
XMLRPC_VectorAppendString(params, "channel", std::string(LL_CHANNEL).c_str(), 0);
XMLRPC_VectorAppendString(params, "platform", PLATFORM_STRING, 0);
XMLRPC_VectorAppendString(params, "mac", hashed_mac.c_str(), 0);

15
indra/newview/llviewermessage.cpp
View File

@@ -1565,7 +1565,7 @@ if(dialog == IM_TYPING_START
if( do_auto_response )
{
if((dialog == IM_NOTHING_SPECIAL && !is_auto_response) ||
(dialog == IM_TYPING_START && gSavedPerAccountSettings.getBOOL("AscentInstantMessageShowOnTyping"))
(dialog == IM_TYPING_START && gSavedPerAccountSettings.getBOOL("AscentInstantMessageAnnounceIncoming"))
)
{
BOOL has = gIMMgr->hasSession(computed_session_id);
@@ -2137,7 +2137,18 @@ if(dialog == IM_TYPING_START
position,
true);
chat.mText = std::string("IM: ") + name + separator_string + saved + message.substr(message_offset);
std::string prepend_msg;
if (gAgent.isInGroup(session_id)&& gSavedSettings.getBOOL("OptionShowGroupNameInChatIM"))
{
prepend_msg = "[";
prepend_msg += std::string((char*)binary_bucket);
prepend_msg += "] ";
}
else
{
prepend_msg = std::string("IM: ");
}
chat.mText = prepend_msg + name + separator_string + saved + message.substr(message_offset);
LLFloaterChat::addChat(chat, TRUE, is_this_agent);
}
break;

11
indra/newview/llviewerstats.cpp
View File

@@ -647,9 +647,9 @@ public:
*/
void send_stats()
{
// <edit> Don't want to send ViewerStats
if(1) return;
// </edit>
// <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
@@ -695,10 +695,7 @@ void send_stats()
// send fps only for time app spends in foreground
agent["fps"] = (F32)gForegroundFrameCount / gForegroundTime.getElapsedTimeF32();
// <edit>
//agent["version"] = gCurrentVersion;
agent["version"] = gSavedSettings.getString("SpecifiedChannel");
// </edit>
agent["version"] = gCurrentVersion;
std::string language = LLUI::getLanguage();
agent["language"] = language;

2
indra/newview/pipeline.cpp
View File

@@ -4846,7 +4846,7 @@ void LLPipeline::resetVertexBuffers(LLDrawable* drawable)
void LLPipeline::resetVertexBuffers()
{
sRenderBump = gSavedSettings.getBOOL("RenderObjectBump");
LLVertexBuffer::sUseStreamDraw = gSavedSettings.getBOOL("RenderUseStreamVBO");
for (LLWorld::region_list_t::const_iterator iter = LLWorld::getInstance()->getRegionList().begin();
iter != LLWorld::getInstance()->getRegionList().end(); ++iter)
{

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

@@ -18,7 +18,7 @@
width="420">
<button bottom="1" follows="left|bottom" font="SansSerif" halign="center" height="20"
label="New IM" label_selected="New IM" left="0"
name="IM Received" scale_image="true"
name="New IM" scale_image="true"
tool_tip="You have an instant message pending. Click to show IMs."
width="102" />
<button bottom="1" follows="left|bottom" font="SansSerif" halign="center" height="20"