aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llfloaterabout.cpp
diff options
context:
space:
mode:
authorMcCabe Maxsted2009-10-18 17:58:27 -0700
committerMcCabe Maxsted2009-10-18 17:58:27 -0700
commite4b0e7c82d670081c071d8a3da31b5ec407b8e07 (patch)
tree9410962bbb582eedbec448139e217f2714050777 /linden/indra/newview/llfloaterabout.cpp
parentStarted 1.3.0 branch (diff)
parentUpdated and added some Linux libs. (diff)
downloadmeta-impy-e4b0e7c82d670081c071d8a3da31b5ec407b8e07.zip
meta-impy-e4b0e7c82d670081c071d8a3da31b5ec407b8e07.tar.gz
meta-impy-e4b0e7c82d670081c071d8a3da31b5ec407b8e07.tar.bz2
meta-impy-e4b0e7c82d670081c071d8a3da31b5ec407b8e07.tar.xz
Merged working branch of 1.2 into LL 1.23 merge
Diffstat (limited to 'linden/indra/newview/llfloaterabout.cpp')
-rw-r--r--linden/indra/newview/llfloaterabout.cpp10
1 files changed, 9 insertions, 1 deletions
diff --git a/linden/indra/newview/llfloaterabout.cpp b/linden/indra/newview/llfloaterabout.cpp
index 32b2c18..686353b 100644
--- a/linden/indra/newview/llfloaterabout.cpp
+++ b/linden/indra/newview/llfloaterabout.cpp
@@ -139,7 +139,15 @@ LLFloaterAbout::LLFloaterAbout()
139 139
140 // Position 140 // Position
141 LLViewerRegion* region = gAgent.getRegion(); 141 LLViewerRegion* region = gAgent.getRegion();
142 if (region) 142// [RLVa:KB] - Version: 1.22.11 | Checked: 2009-07-04 (RLVa-1.0.0a)
143 if (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWLOC))
144 {
145 support.append(rlv_handler_t::cstrHidden);
146 support.append("\n\n");
147 }
148 else if (region)
149// [/RLVa:KB]
150// if (region)
143 { 151 {
144 LLStyleSP server_link_style(new LLStyle); 152 LLStyleSP server_link_style(new LLStyle);
145 server_link_style->setVisible(true); 153 server_link_style->setVisible(true);