diff options
Diffstat (limited to 'linden/indra/newview/llpreview.cpp')
-rw-r--r-- | linden/indra/newview/llpreview.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/linden/indra/newview/llpreview.cpp b/linden/indra/newview/llpreview.cpp index 8827598..39bdfd4 100644 --- a/linden/indra/newview/llpreview.cpp +++ b/linden/indra/newview/llpreview.cpp | |||
@@ -231,11 +231,11 @@ void LLPreview::onCommit() | |||
231 | LLViewerObject* obj = avatar->getWornAttachment( item->getUUID() ); | 231 | LLViewerObject* obj = avatar->getWornAttachment( item->getUUID() ); |
232 | if( obj ) | 232 | if( obj ) |
233 | { | 233 | { |
234 | gSelectMgr->deselectAll(); | 234 | LLSelectMgr::getInstance()->deselectAll(); |
235 | gSelectMgr->addAsIndividual( obj, SELECT_ALL_TES, FALSE ); | 235 | LLSelectMgr::getInstance()->addAsIndividual( obj, SELECT_ALL_TES, FALSE ); |
236 | gSelectMgr->selectionSetObjectDescription( childGetText("desc") ); | 236 | LLSelectMgr::getInstance()->selectionSetObjectDescription( childGetText("desc") ); |
237 | 237 | ||
238 | gSelectMgr->deselectAll(); | 238 | LLSelectMgr::getInstance()->deselectAll(); |
239 | } | 239 | } |
240 | } | 240 | } |
241 | } | 241 | } |
@@ -374,7 +374,7 @@ BOOL LLPreview::handleMouseDown(S32 x, S32 y, MASK mask) | |||
374 | S32 screen_x; | 374 | S32 screen_x; |
375 | S32 screen_y; | 375 | S32 screen_y; |
376 | localPointToScreen(x, y, &screen_x, &screen_y ); | 376 | localPointToScreen(x, y, &screen_x, &screen_y ); |
377 | gToolDragAndDrop->setDragStart(screen_x, screen_y); | 377 | LLToolDragAndDrop::getInstance()->setDragStart(screen_x, screen_y); |
378 | return TRUE; | 378 | return TRUE; |
379 | } | 379 | } |
380 | return LLFloater::handleMouseDown(x, y, mask); | 380 | return LLFloater::handleMouseDown(x, y, mask); |
@@ -402,7 +402,7 @@ BOOL LLPreview::handleHover(S32 x, S32 y, MASK mask) | |||
402 | if(item | 402 | if(item |
403 | && item->getPermissions().allowCopyBy(gAgent.getID(), | 403 | && item->getPermissions().allowCopyBy(gAgent.getID(), |
404 | gAgent.getGroupID()) | 404 | gAgent.getGroupID()) |
405 | && gToolDragAndDrop->isOverThreshold(screen_x, screen_y)) | 405 | && LLToolDragAndDrop::getInstance()->isOverThreshold(screen_x, screen_y)) |
406 | { | 406 | { |
407 | EDragAndDropType type; | 407 | EDragAndDropType type; |
408 | type = LLAssetType::lookupDragAndDropType(item->getType()); | 408 | type = LLAssetType::lookupDragAndDropType(item->getType()); |
@@ -415,11 +415,11 @@ BOOL LLPreview::handleHover(S32 x, S32 y, MASK mask) | |||
415 | { | 415 | { |
416 | src = LLToolDragAndDrop::SOURCE_AGENT; | 416 | src = LLToolDragAndDrop::SOURCE_AGENT; |
417 | } | 417 | } |
418 | gToolDragAndDrop->beginDrag(type, | 418 | LLToolDragAndDrop::getInstance()->beginDrag(type, |
419 | item->getUUID(), | 419 | item->getUUID(), |
420 | src, | 420 | src, |
421 | mObjectUUID); | 421 | mObjectUUID); |
422 | return gToolDragAndDrop->handleHover(x, y, mask ); | 422 | return LLToolDragAndDrop::getInstance()->handleHover(x, y, mask ); |
423 | } | 423 | } |
424 | } | 424 | } |
425 | return LLFloater::handleHover(x,y,mask); | 425 | return LLFloater::handleHover(x,y,mask); |