diff options
Diffstat (limited to '')
-rw-r--r-- | linden/indra/newview/llfloateropenobject.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/linden/indra/newview/llfloateropenobject.cpp b/linden/indra/newview/llfloateropenobject.cpp index bd7bca8..13230a9 100644 --- a/linden/indra/newview/llfloateropenobject.cpp +++ b/linden/indra/newview/llfloateropenobject.cpp | |||
@@ -50,7 +50,7 @@ | |||
50 | #include "llselectmgr.h" | 50 | #include "llselectmgr.h" |
51 | #include "lluiconstants.h" | 51 | #include "lluiconstants.h" |
52 | #include "llviewerobject.h" | 52 | #include "llviewerobject.h" |
53 | #include "llvieweruictrlfactory.h" | 53 | #include "lluictrlfactory.h" |
54 | #include "llviewerwindow.h" | 54 | #include "llviewerwindow.h" |
55 | 55 | ||
56 | 56 | ||
@@ -63,7 +63,7 @@ LLFloaterOpenObject::LLFloaterOpenObject() | |||
63 | { | 63 | { |
64 | LLCallbackMap::map_t factory_map; | 64 | LLCallbackMap::map_t factory_map; |
65 | factory_map["object_contents"] = LLCallbackMap(createPanelInventory, this); | 65 | factory_map["object_contents"] = LLCallbackMap(createPanelInventory, this); |
66 | gUICtrlFactory->buildFloater(this,"floater_openobject.xml",&factory_map); | 66 | LLUICtrlFactory::getInstance()->buildFloater(this,"floater_openobject.xml",&factory_map); |
67 | 67 | ||
68 | childSetAction("copy_to_inventory_button", onClickMoveToInventory, this); | 68 | childSetAction("copy_to_inventory_button", onClickMoveToInventory, this); |
69 | childSetAction("copy_and_wear_button", onClickMoveAndWear, this); | 69 | childSetAction("copy_and_wear_button", onClickMoveAndWear, this); |
@@ -106,7 +106,7 @@ void LLFloaterOpenObject::dirty() | |||
106 | // static | 106 | // static |
107 | void LLFloaterOpenObject::show() | 107 | void LLFloaterOpenObject::show() |
108 | { | 108 | { |
109 | LLObjectSelectionHandle object_selection = gSelectMgr->getSelection(); | 109 | LLObjectSelectionHandle object_selection = LLSelectMgr::getInstance()->getSelection(); |
110 | if (object_selection->getRootObjectCount() != 1) | 110 | if (object_selection->getRootObjectCount() != 1) |
111 | { | 111 | { |
112 | gViewerWindow->alertXml("UnableToViewContentsMoreThanOne"); | 112 | gViewerWindow->alertXml("UnableToViewContentsMoreThanOne"); |
@@ -123,7 +123,7 @@ void LLFloaterOpenObject::show() | |||
123 | sInstance->open(); /* Flawfinder: ignore */ | 123 | sInstance->open(); /* Flawfinder: ignore */ |
124 | sInstance->setFocus(TRUE); | 124 | sInstance->setFocus(TRUE); |
125 | 125 | ||
126 | sInstance->mObjectSelection = gSelectMgr->getEditSelection(); | 126 | sInstance->mObjectSelection = LLSelectMgr::getInstance()->getEditSelection(); |
127 | } | 127 | } |
128 | 128 | ||
129 | 129 | ||