Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix inconsistent link/unlink checking

Browse Source
This commit is contained in:
Siana Gearz
2012-10-17 13:41:30 +02:00
parent a12704c6a3
commit 71d2bd83aa
5 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
indra/newview/llpanelobject.cpp
View File

@@ -2507,13 +2507,13 @@ void LLPanelObject::onPasteParams(void* user_data)
void LLPanelObject::onLinkObj(void* user_data) void LLPanelObject::onLinkObj(void* user_data)
{ {
llinfos << "Attempting link." << llendl; llinfos << "Attempting link." << llendl;
LLSelectMgr::getInstance()->sendLink(); LLSelectMgr::getInstance()->linkObjects();
} }
void LLPanelObject::onUnlinkObj(void* user_data) void LLPanelObject::onUnlinkObj(void* user_data)
{ {
llinfos << "Attempting unlink." << llendl; llinfos << "Attempting unlink." << llendl;
LLSelectMgr::getInstance()->sendDelink(); LLSelectMgr::getInstance()->unlinkObjects();
} }
void LLPanelObject::onPastePos(void* user_data) void LLPanelObject::onPastePos(void* user_data)

2
indra/newview/llselectmgr.cpp
View File

@@ -572,7 +572,7 @@ bool LLSelectMgr::linkObjects()
} }
S32 object_count = LLSelectMgr::getInstance()->getSelection()->getObjectCount(); 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; LLSD args;
args["COUNT"] = llformat("%d", object_count); args["COUNT"] = llformat("%d", object_count);

5
indra/newview/llselectmgr.h
View File

@@ -663,8 +663,6 @@ public:
void sendAttach(U8 attachment_point, bool replace=true); void sendAttach(U8 attachment_point, bool replace=true);
void sendDetach(); void sendDetach();
void sendDropAttachment(); void sendDropAttachment();
void sendLink();
void sendDelink();
//void sendHinge(U8 type); //void sendHinge(U8 type);
//void sendDehinge(); //void sendDehinge();
void sendSelect(); void sendSelect();
@@ -705,7 +703,8 @@ private:
void (*pack_body)(LLSelectNode* node, void *user_data), void (*pack_body)(LLSelectNode* node, void *user_data),
void *user_data, void *user_data,
ESendType send_type); ESendType send_type);
void sendLink();
void sendDelink();
static void packAgentID( void *); static void packAgentID( void *);
static void packAgentAndSessionID(void* user_data); static void packAgentAndSessionID(void* user_data);

2
indra/newview/llviewermenu.cpp
View File

@@ -2647,7 +2647,7 @@ class LLPowerfulWizard : public view_listener_t
*/ */
LLSelectMgr::getInstance()->selectionUpdateTemporary(1);//set temp to TRUE LLSelectMgr::getInstance()->selectionUpdateTemporary(1);//set temp to TRUE
LLSelectMgr::getInstance()->selectionUpdatePhysics(1); LLSelectMgr::getInstance()->selectionUpdatePhysics(1);
LLSelectMgr::getInstance()->sendDelink(); LLSelectMgr::getInstance()->unlinkObjects();
LLSelectMgr::getInstance()->deselectAll(); LLSelectMgr::getInstance()->deselectAll();
} }

2
indra/newview/llviewerobjectbackup.cpp
View File

@@ -1103,7 +1103,7 @@ void LLObjectBackup::primUpdate(LLViewerObject* object)
// Now link // Now link
LLSelectMgr::getInstance()->deselectAll(); LLSelectMgr::getInstance()->deselectAll();
LLSelectMgr::getInstance()->selectObjectAndFamily(mToSelect, true); LLSelectMgr::getInstance()->selectObjectAndFamily(mToSelect, true);
LLSelectMgr::getInstance()->sendLink(); LLSelectMgr::getInstance()->linkObjects();
LLViewerObject* root = mToSelect.back(); LLViewerObject* root = mToSelect.back();
root->setRotation(mRootRot); root->setRotation(mRootRot);
} }