livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge.

master
Tofu Linden 2009-11-06 17:02:16 +00:00
parent dfa9e7faaf 44673e5b40
commit c01a2b2a93
5 changed files with 30 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/llfloaterworldmap.cpp
View File

@ -457,7 +457,7 @@ void LLFloaterWorldMap::draw()
{
F64 seconds = LLTimer::getElapsedSeconds();
double value = fmod(seconds, 2);
value = 0.5 + 0.5*cos(value * M_PI);
value = 0.5 + 0.5*cos(value * F_PI);
LLColor4 loading_color(0.0, F32(value/2), F32(value), 1.0);
childSetColor("location_icon", loading_color);
}

63
indra/newview/llviewermessage.cpp
View File

@ -2914,47 +2914,38 @@ void process_agent_movement_complete(LLMessageSystem* msg, void**)
if (!gLastVersionChannel.empty())
{
LLSD payload;
payload["message"] = version_channel;
LLNotifications::instance().add("ServerVersionChanged", LLSD(), payload, server_version_changed_callback);
// work out the URL for this server's Release Notes
std::string url ="http://wiki.secondlife.com/wiki/Release_Notes/";
std::string server_version = version_channel;
std::vector<std::string> s_vect;
boost::algorithm::split(s_vect, server_version, isspace);
for(U32 i = 0; i < s_vect.size(); i++)
{
if (i != (s_vect.size() - 1))
{
if(i != (s_vect.size() - 2))
{
url += s_vect[i] + "_";
}
else
{
url += s_vect[i] + "/";
}
}
else
{
url += s_vect[i].substr(0,4);
}
}
LLSD args;
args["URL"] = url;
LLNotifications::instance().add("ServerVersionChanged", args);
}
gLastVersionChannel = version_channel;
}
bool server_version_changed_callback(const LLSD& notification, const LLSD& response)
{
if(notification["payload"]["message"].asString() =="")
return false;
std::string url ="http://wiki.secondlife.com/wiki/Release_Notes/";
//parse the msg string
std::string server_version = notification["payload"]["message"].asString();
std::vector<std::string> s_vect;
boost::algorithm::split(s_vect, server_version, isspace);
for(U32 i = 0; i < s_vect.size(); i++)
{
if (i != (s_vect.size() - 1))
{
if(i != (s_vect.size() - 2))
{
url += s_vect[i] + "_";
}
else
{
url += s_vect[i] + "/";
}
}
else
{
url += s_vect[i].substr(0,4);
}
}
LLWeb::loadURL(url);
return false;
}
void process_crossed_region(LLMessageSystem* msg, void**)
{
LLUUID agent_id;

1
indra/newview/llviewermessage.h
View File

@ -132,7 +132,6 @@ void container_inventory_arrived(LLViewerObject* object,
// agent movement
void send_complete_agent_movement(const LLHost& sim_host);
void process_agent_movement_complete(LLMessageSystem* msg, void**);
bool server_version_changed_callback(const LLSD& notification, const LLSD& response);
void process_crossed_region(LLMessageSystem* msg, void**);
void process_teleport_start(LLMessageSystem* msg, void**);
void process_teleport_progress(LLMessageSystem* msg, void**);

2
indra/newview/llworldmapview.cpp
View File

@ -822,7 +822,7 @@ void LLWorldMapView::draw()
else
{
double value = fmod(current_time, 2);
value = 0.5 + 0.5*cos(value * M_PI);
value = 0.5 + 0.5*cos(value * F_PI);
LLColor4 loading_color(0.0, F32(value/2), F32(value), 1.0);
drawTracking( LLWorldMap::getInstance()->mUnknownLocation, loading_color, TRUE, getString("Loading"), "");
}

2
indra/newview/skins/default/xui/en/notifications.xml
View File

@ -5669,7 +5669,7 @@ An error has occurred while trying to connect to voice chat for [VOICE_CHANNEL_N
name="ServerVersionChanged"
priority="high"
type="notifytip">
You just entered a region using a different server version, which may affect performance. Click to see the release notes.
You just entered a region using a different server version, which may affect performance. [[URL] View the release notes.]
</notification>
<notification