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/llfloatermap.h | |
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/llfloatermap.h')
-rw-r--r-- | linden/indra/newview/llfloatermap.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/linden/indra/newview/llfloatermap.h b/linden/indra/newview/llfloatermap.h index dd1cba8..857b1ed 100644 --- a/linden/indra/newview/llfloatermap.h +++ b/linden/indra/newview/llfloatermap.h | |||
@@ -52,6 +52,10 @@ public: | |||
52 | /*virtual*/ void onOpen(); | 52 | /*virtual*/ void onOpen(); |
53 | /*virtual*/ void onClose(bool app_quitting); | 53 | /*virtual*/ void onClose(bool app_quitting); |
54 | /*virtual*/ BOOL canClose(); | 54 | /*virtual*/ BOOL canClose(); |
55 | // [RLVa:KB] - Version: 1.22.11 | Checked: 2009-07-05 (RLVa-1.0.0c) | ||
56 | /*virtual*/ void open(); | ||
57 | // [/RLVa:KB] | ||
58 | |||
55 | 59 | ||
56 | private: | 60 | private: |
57 | LLFloaterMap(const LLSD& key = LLSD()); | 61 | LLFloaterMap(const LLSD& key = LLSD()); |