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/llviewertexteditor.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/llviewertexteditor.cpp')
| -rw-r--r-- | linden/indra/newview/llviewertexteditor.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/linden/indra/newview/llviewertexteditor.cpp b/linden/indra/newview/llviewertexteditor.cpp index 54b7743..76b752c 100644 --- a/linden/indra/newview/llviewertexteditor.cpp +++ b/linden/indra/newview/llviewertexteditor.cpp | |||
| @@ -95,6 +95,13 @@ public: | |||
| 95 | } | 95 | } |
| 96 | else | 96 | else |
| 97 | { | 97 | { |
| 98 | // [RLVa:KB] - Checked: 2009-07-06 (RLVa-1.0.0c) | ||
| 99 | if ( (rlv_handler_t::isEnabled()) && (gRlvHandler.hasBehaviour("viewnote")) ) | ||
| 100 | { | ||
| 101 | return; | ||
| 102 | } | ||
| 103 | // [/RLVa:KB] | ||
| 104 | |||
| 98 | // See if we can bring an existing preview to the front | 105 | // See if we can bring an existing preview to the front |
| 99 | if(!LLPreview::show(item->getUUID(), true)) | 106 | if(!LLPreview::show(item->getUUID(), true)) |
| 100 | { | 107 | { |