From 71d2bd83aa41173a1a6802468930fa6e8cca332a Mon Sep 17 00:00:00 2001 From: Siana Gearz Date: Wed, 17 Oct 2012 13:41:30 +0200 Subject: [PATCH] Fix inconsistent link/unlink checking --- indra/newview/llpanelobject.cpp | 4 ++-- indra/newview/llselectmgr.cpp | 2 +- indra/newview/llselectmgr.h | 5 ++--- indra/newview/llviewermenu.cpp | 2 +- indra/newview/llviewerobjectbackup.cpp | 2 +- 5 files changed, 7 insertions(+), 8 deletions(-) diff --git a/indra/newview/llpanelobject.cpp b/indra/newview/llpanelobject.cpp index ef6c5f138..b1f702bcd 100644 --- a/indra/newview/llpanelobject.cpp +++ b/indra/newview/llpanelobject.cpp @@ -2507,13 +2507,13 @@ void LLPanelObject::onPasteParams(void* user_data) void LLPanelObject::onLinkObj(void* user_data) { llinfos << "Attempting link." << llendl; - LLSelectMgr::getInstance()->sendLink(); + LLSelectMgr::getInstance()->linkObjects(); } void LLPanelObject::onUnlinkObj(void* user_data) { llinfos << "Attempting unlink." << llendl; - LLSelectMgr::getInstance()->sendDelink(); + LLSelectMgr::getInstance()->unlinkObjects(); } void LLPanelObject::onPastePos(void* user_data) diff --git a/indra/newview/llselectmgr.cpp b/indra/newview/llselectmgr.cpp index 81c6bcb87..882b96b9c 100644 --- a/indra/newview/llselectmgr.cpp +++ b/indra/newview/llselectmgr.cpp @@ -572,7 +572,7 @@ bool LLSelectMgr::linkObjects() } S32 object_count = LLSelectMgr::getInstance()->getSelection()->getObjectCount(); - if (object_count > MAX_CHILDREN_PER_TASK + 1) + if (gHippoGridManager->getConnectedGrid()->isSecondLife() && (object_count > MAX_CHILDREN_PER_TASK + 1)) { LLSD args; args["COUNT"] = llformat("%d", object_count); diff --git a/indra/newview/llselectmgr.h b/indra/newview/llselectmgr.h index f3c52dbfe..8f0119f80 100644 --- a/indra/newview/llselectmgr.h +++ b/indra/newview/llselectmgr.h @@ -663,8 +663,6 @@ public: void sendAttach(U8 attachment_point, bool replace=true); void sendDetach(); void sendDropAttachment(); - void sendLink(); - void sendDelink(); //void sendHinge(U8 type); //void sendDehinge(); void sendSelect(); @@ -705,7 +703,8 @@ private: void (*pack_body)(LLSelectNode* node, void *user_data), void *user_data, ESendType send_type); - + void sendLink(); + void sendDelink(); static void packAgentID( void *); static void packAgentAndSessionID(void* user_data); diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index 0c0b12075..a0f2064ca 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -2647,7 +2647,7 @@ class LLPowerfulWizard : public view_listener_t */ LLSelectMgr::getInstance()->selectionUpdateTemporary(1);//set temp to TRUE LLSelectMgr::getInstance()->selectionUpdatePhysics(1); - LLSelectMgr::getInstance()->sendDelink(); + LLSelectMgr::getInstance()->unlinkObjects(); LLSelectMgr::getInstance()->deselectAll(); } diff --git a/indra/newview/llviewerobjectbackup.cpp b/indra/newview/llviewerobjectbackup.cpp index c341d296b..e08968f42 100644 --- a/indra/newview/llviewerobjectbackup.cpp +++ b/indra/newview/llviewerobjectbackup.cpp @@ -1103,7 +1103,7 @@ void LLObjectBackup::primUpdate(LLViewerObject* object) // Now link LLSelectMgr::getInstance()->deselectAll(); LLSelectMgr::getInstance()->selectObjectAndFamily(mToSelect, true); - LLSelectMgr::getInstance()->sendLink(); + LLSelectMgr::getInstance()->linkObjects(); LLViewerObject* root = mToSelect.back(); root->setRotation(mRootRot); }