diff options
Diffstat (limited to 'linden/indra/newview/llfloateropenobject.h')
-rw-r--r-- | linden/indra/newview/llfloateropenobject.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/linden/indra/newview/llfloateropenobject.h b/linden/indra/newview/llfloateropenobject.h index aae3876..4772982 100644 --- a/linden/indra/newview/llfloateropenobject.h +++ b/linden/indra/newview/llfloateropenobject.h | |||
@@ -35,8 +35,7 @@ | |||
35 | 35 | ||
36 | #include "llfloater.h" | 36 | #include "llfloater.h" |
37 | 37 | ||
38 | 38 | class LLObjectSelection; | |
39 | |||
40 | class LLPanelInventory; | 39 | class LLPanelInventory; |
41 | 40 | ||
42 | class LLFloaterOpenObject | 41 | class LLFloaterOpenObject |
@@ -59,9 +58,10 @@ protected: | |||
59 | void refresh(); | 58 | void refresh(); |
60 | void draw(); | 59 | void draw(); |
61 | 60 | ||
61 | void moveToInventory(bool wear); | ||
62 | |||
62 | static void onClickMoveToInventory(void* data); | 63 | static void onClickMoveToInventory(void* data); |
63 | static void onClickMoveAndWear(void* data); | 64 | static void onClickMoveAndWear(void* data); |
64 | static void moveToInventory(bool wear); | ||
65 | static void callbackMoveInventory(S32 result, void* data); | 65 | static void callbackMoveInventory(S32 result, void* data); |
66 | static void* createPanelInventory(void* data); | 66 | static void* createPanelInventory(void* data); |
67 | 67 | ||
@@ -69,6 +69,7 @@ protected: | |||
69 | static LLFloaterOpenObject* sInstance; | 69 | static LLFloaterOpenObject* sInstance; |
70 | 70 | ||
71 | LLPanelInventory* mPanelInventory; | 71 | LLPanelInventory* mPanelInventory; |
72 | LLHandle<LLObjectSelection> mObjectSelection; | ||
72 | BOOL mDirty; | 73 | BOOL mDirty; |
73 | }; | 74 | }; |
74 | 75 | ||