diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2008-04-08 21:04:41 +0000 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2008-04-08 21:04:41 +0000 |
| commit | b73ad517841cb428a395a6f49376d3bdc8e50f7e (patch) | |
| tree | 3f69c38d1f540e5e97a537683369229ac6a77014 /indra/newview | |
| parent | f5e386527c4a74e6e5733f4f1cfa55873851257e (diff) | |
svn merge -r84080:84255 svn+ssh://svn/svn/linden/branches/intermezzo-9
QAR-431
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llfloaterregioninfo.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
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 ); |