From b73ad517841cb428a395a6f49376d3bdc8e50f7e Mon Sep 17 00:00:00 2001
From: Leyla Farazha <leyla@lindenlab.com>
Date: Tue, 8 Apr 2008 21:04:41 +0000
Subject: svn merge -r84080:84255
 svn+ssh://svn/svn/linden/branches/intermezzo-9 QAR-431

---
 indra/newview/llfloaterregioninfo.cpp | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'indra/newview')

diff --git a/indra/newview/llfloaterregioninfo.cpp b/indra/newview/llfloaterregioninfo.cpp
index fa9c9c9374..9ff5739255 100644
--- a/indra/newview/llfloaterregioninfo.cpp
+++ b/indra/newview/llfloaterregioninfo.cpp
@@ -80,6 +80,8 @@
 const S32 TERRAIN_TEXTURE_COUNT = 4;
 const S32 CORNER_COUNT = 4;
 
+extern LLString gLastVersionChannel;
+
 
 ///----------------------------------------------------------------------------
 /// Local class declaration
@@ -317,6 +319,7 @@ void LLFloaterRegionInfo::processRegionInfo(LLMessageSystem* msg)
 	// GENERAL PANEL
 	panel = tab->getChild<LLPanel>("General");
 	panel->childSetValue("region_text", LLSD(sim_name));
+	panel->childSetValue("version_channel_text", gLastVersionChannel);
 
 	panel->childSetValue("block_terraform_check", (region_flags & REGION_FLAGS_BLOCK_TERRAFORM) ? TRUE : FALSE );
 	panel->childSetValue("block_fly_check", (region_flags & REGION_FLAGS_BLOCK_FLY) ? TRUE : FALSE );
-- 
cgit v1.2.3