diff options
author | McCabe Maxsted | 2009-09-14 17:52:41 -0700 |
---|---|---|
committer | McCabe Maxsted | 2009-09-14 17:52:41 -0700 |
commit | 7f090f7bec5264ca9e203c27dfb6b2992bb2bcbd (patch) | |
tree | 0243666021de3ae6ac61a6c6f4e57d42771fe964 /linden/indra/newview/llfloaterabout.cpp | |
parent | Applied BlockClickSit debug setting from Emerald to block sit click action (diff) | |
download | meta-impy-7f090f7bec5264ca9e203c27dfb6b2992bb2bcbd.zip meta-impy-7f090f7bec5264ca9e203c27dfb6b2992bb2bcbd.tar.gz meta-impy-7f090f7bec5264ca9e203c27dfb6b2992bb2bcbd.tar.bz2 meta-impy-7f090f7bec5264ca9e203c27dfb6b2992bb2bcbd.tar.xz |
Merged in jacek/next
Diffstat (limited to 'linden/indra/newview/llfloaterabout.cpp')
-rw-r--r-- | linden/indra/newview/llfloaterabout.cpp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/linden/indra/newview/llfloaterabout.cpp b/linden/indra/newview/llfloaterabout.cpp index 0954a70..57c5339 100644 --- a/linden/indra/newview/llfloaterabout.cpp +++ b/linden/indra/newview/llfloaterabout.cpp | |||
@@ -126,7 +126,15 @@ LLFloaterAbout::LLFloaterAbout() | |||
126 | 126 | ||
127 | // Position | 127 | // Position |
128 | LLViewerRegion* region = gAgent.getRegion(); | 128 | LLViewerRegion* region = gAgent.getRegion(); |
129 | if (region) | 129 | // [RLVa:KB] - Version: 1.22.11 | Checked: 2009-07-04 (RLVa-1.0.0a) |
130 | if (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWLOC)) | ||
131 | { | ||
132 | support.append(rlv_handler_t::cstrHidden); | ||
133 | support.append("\n\n"); | ||
134 | } | ||
135 | else if (region) | ||
136 | // [/RLVa:KB] | ||
137 | // if (region) | ||
130 | { | 138 | { |
131 | LLStyleSP server_link_style(new LLStyle); | 139 | LLStyleSP server_link_style(new LLStyle); |
132 | server_link_style->setVisible(true); | 140 | server_link_style->setVisible(true); |