aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llfloaterworldmap.h
diff options
context:
space:
mode:
authorJacek Antonelli2008-08-15 23:44:50 -0500
committerJacek Antonelli2008-08-15 23:44:50 -0500
commit89fe5dab825a62a0e3fd8d248cbc91c65eb2a426 (patch)
treebcff14b7888d04a2fec799c59369f6095224bd08 /linden/indra/newview/llfloaterworldmap.h
parentSecond Life viewer sources 1.13.3.2 (diff)
downloadmeta-impy-89fe5dab825a62a0e3fd8d248cbc91c65eb2a426.zip
meta-impy-89fe5dab825a62a0e3fd8d248cbc91c65eb2a426.tar.gz
meta-impy-89fe5dab825a62a0e3fd8d248cbc91c65eb2a426.tar.bz2
meta-impy-89fe5dab825a62a0e3fd8d248cbc91c65eb2a426.tar.xz
Second Life viewer sources 1.14.0.0
Diffstat (limited to 'linden/indra/newview/llfloaterworldmap.h')
-rw-r--r--linden/indra/newview/llfloaterworldmap.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/linden/indra/newview/llfloaterworldmap.h b/linden/indra/newview/llfloaterworldmap.h
index 67386c9..4b812b6 100644
--- a/linden/indra/newview/llfloaterworldmap.h
+++ b/linden/indra/newview/llfloaterworldmap.h
@@ -56,18 +56,18 @@ public:
56 static void *createWorldMapView(void* data); 56 static void *createWorldMapView(void* data);
57 BOOL postBuild(); 57 BOOL postBuild();
58 58
59 virtual void onClose(bool app_quitting); 59 /*virtual*/ void onClose(bool app_quitting);
60 60
61 static void show(void*, BOOL center_on_target ); 61 static void show(void*, BOOL center_on_target );
62 static void reloadIcons(void*); 62 static void reloadIcons(void*);
63 static void toggle(void*); 63 static void toggle(void*);
64 static void hide(void*); 64 static void hide(void*);
65 65
66 virtual void reshape( S32 width, S32 height, BOOL called_from_parent = TRUE ); 66 /*virtual*/ void reshape( S32 width, S32 height, BOOL called_from_parent = TRUE );
67 virtual BOOL handleHover(S32 x, S32 y, MASK mask); 67 /*virtual*/ BOOL handleHover(S32 x, S32 y, MASK mask);
68 virtual BOOL handleScrollWheel(S32 x, S32 y, S32 clicks); 68 /*virtual*/ BOOL handleScrollWheel(S32 x, S32 y, S32 clicks);
69 virtual void setVisible(BOOL visible); 69 /*virtual*/ void setVisible(BOOL visible);
70 virtual void draw(); 70 /*virtual*/ void draw();
71 71
72 // methods for dealing with inventory. The observe() method is 72 // methods for dealing with inventory. The observe() method is
73 // called during program startup. inventoryUpdated() will be 73 // called during program startup. inventoryUpdated() will be