diff options
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llfloaterabout.cpp | 6 | ||||
| -rw-r--r-- | indra/newview/llfloaterreporter.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/llpanellogin.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/llstartup.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/llviewermessage.cpp | 21 | ||||
| -rw-r--r-- | indra/newview/llviewerprecompiledheaders.h | 2 | ||||
| -rw-r--r-- | indra/newview/llviewerregion.cpp | 1 | ||||
| -rwxr-xr-x | indra/newview/viewer_manifest.py | 14 |
8 files changed, 39 insertions, 11 deletions
diff --git a/indra/newview/llfloaterabout.cpp b/indra/newview/llfloaterabout.cpp index ff7e8a41b7..8a51c155de 100644 --- a/indra/newview/llfloaterabout.cpp +++ b/indra/newview/llfloaterabout.cpp @@ -21,7 +21,7 @@ #include "llagent.h" #include "llviewerstats.h" #include "llviewerregion.h" -#include "llversion.h" +#include "llversionviewer.h" #include "llviewerbuild.h" #include "llvieweruictrlfactory.h" #include "viewer.h" // for gViewerDigest @@ -89,7 +89,9 @@ LLFloaterAbout::LLFloaterAbout() support.append(" ("); gAgent.getRegion()->getHost().getString(buffer, MAX_STRING); support.append(buffer); - support.append(")\n\n"); + support.append(")\n"); + support.append(gLastVersionChannel); + support.append("\n\n"); } // CPU diff --git a/indra/newview/llfloaterreporter.cpp b/indra/newview/llfloaterreporter.cpp index 71491f16e6..e1a9a38ccb 100644 --- a/indra/newview/llfloaterreporter.cpp +++ b/indra/newview/llfloaterreporter.cpp @@ -21,7 +21,7 @@ #include "llinventory.h" #include "llstring.h" #include "llsys.h" -#include "llversion.h" +#include "llversionviewer.h" #include "message.h" #include "v3math.h" diff --git a/indra/newview/llpanellogin.cpp b/indra/newview/llpanellogin.cpp index e32a64eb8e..6e1a1b9f09 100644 --- a/indra/newview/llpanellogin.cpp +++ b/indra/newview/llpanellogin.cpp @@ -16,7 +16,7 @@ #include "llmd5.h" #include "llsecondlifeurls.h" #include "llwindow.h" // shell_open() -#include "llversion.h" +#include "llversionviewer.h" #include "v4color.h" #include "llbutton.h" diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index 20761ded11..74d8aa8e9a 100644 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -44,7 +44,7 @@ #include "llsecondlifeurls.h" #include "llstring.h" #include "lluserrelations.h" -#include "llversion.h" +#include "llversionviewer.h" #include "llvfs.h" #include "llwindow.h" // for shell_open #include "llxorcipher.h" // saved password, MAC address diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index 7cf9ca9568..cbaa1e2f2e 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -64,6 +64,7 @@ #include "llfloatermute.h" #include "llfloaterpostcard.h" #include "llfloaterpreference.h" +#include "llfloaterreleasemsg.h" #include "llfollowcam.h" #include "llgroupnotify.h" #include "llhudeffect.h" @@ -2612,6 +2613,9 @@ void process_agent_movement_complete(LLMessageSystem* msg, void**) msg->getVector3Fast(_PREHASH_Data, _PREHASH_LookAt, look_at); U64 region_handle; msg->getU64Fast(_PREHASH_Data, _PREHASH_RegionHandle, region_handle); + + char version_channel_char[MAX_STRING]; + msg->getString("SimData", "ChannelVersion", MAX_STRING, version_channel_char); LLVOAvatar* avatarp = gAgent.getAvatarObject(); if (!avatarp) @@ -2745,6 +2749,23 @@ void process_agent_movement_complete(LLMessageSystem* msg, void**) msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID()); msg->addBOOLFast(_PREHASH_AlwaysRun, gAgent.getAlwaysRun()); gAgent.sendReliableMessage(); + + + LLString version_channel = LLString(version_channel_char); + + if (gLastVersionChannel != version_channel) + { + //show release message if not on initial login + if (!gLastVersionChannel.empty()) + { + gLastVersionChannel = version_channel; + LLFloaterReleaseMsg::show(); + } + else { + gLastVersionChannel = version_channel; + } + } + } void process_crossed_region(LLMessageSystem* msg, void**) diff --git a/indra/newview/llviewerprecompiledheaders.h b/indra/newview/llviewerprecompiledheaders.h index 26bf41f8a2..0bcab49a84 100644 --- a/indra/newview/llviewerprecompiledheaders.h +++ b/indra/newview/llviewerprecompiledheaders.h @@ -89,7 +89,7 @@ #include "llthread.h" #include "lltimer.h" #include "lluuidhashmap.h" -//#include "llversion.h" +//#include "llversionviewer.h" //#include "processor.h" #include "stdenums.h" #include "stdtypes.h" diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp index c94aec8801..c3841cdd98 100644 --- a/indra/newview/llviewerregion.cpp +++ b/indra/newview/llviewerregion.cpp @@ -1255,6 +1255,7 @@ void LLViewerRegion::setSeedCapability(const std::string& url) capabilityNames.append("ParcelVoiceInfoRequest"); capabilityNames.append("ChatSessionRequest"); capabilityNames.append("ProvisionVoiceAccountRequest"); + capabilityNames.append("ServerReleaseNotes"); llinfos << "posting to seed " << url << llendl; diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 9136a06c24..041dfd1b81 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -382,8 +382,9 @@ class DarwinManifest(ViewerManifest): # make sure we don't have stale files laying about self.remove(sparsename, finalname) - self.run_command('hdiutil create "%(sparse)s" -volname "Second Life" -fs HFS+ -type SPARSE -megabytes 300' % { - 'sparse':sparsename}) + self.run_command('hdiutil create "%(sparse)s" -volname "%(channel)s" -fs HFS+ -type SPARSE -megabytes 300' % { + 'sparse':sparsename, + 'channel':channel_standin}) # mount the image and get the name of the mount point and device node hdi_output = self.run_command('hdiutil attach -private "' + sparsename + '"') @@ -439,9 +440,12 @@ class LinuxManifest(ViewerManifest): if(self.args.has_key('installer_name')): installer_name = self.args['installer_name'] else: - installer_name = '_'.join(['SecondLife', self.args.get('arch'), '_'.join(self.args['version'])]) - if not self.default_grid(): - installer_name += "_" + grid.upper() + installer_name = '_'.join('SecondLife_', self.args.get('arch'), *self.args['version']) + if self.default_channel(): + if not self.default_grid(): + installer_name += '_' + self.args['grid'].upper() + else: + installer_name += '_' + self.channel_oneword().upper() # temporarily move directory tree so that it has the right name in the tarfile self.run_command("mv %(dst)s %(inst)s" % {'dst':self.get_dst_prefix(),'inst':self.src_path_of(installer_name)}) |