1 files changed, 93 insertions, 0 deletions

diff --git a/linden/indra/newview/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp
index c403700..c5964d5 100644
--- a/linden/indra/newview/llviewermenu.cpp
+++ b/linden/indra/newview/llviewermenu.cpp
@@ -4534,6 +4534,97 @@ class LLToolsSnapObjectXY : public view_listener_t
         }
 };
 
+// Determine if the option to cycle between linked prims is shown
+class LLToolsEnableSelectNextPart : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                bool new_value = (gSavedSettings.getBOOL("EditLinkedParts") &&
+                                 !LLSelectMgr::getInstance()->getSelection()->isEmpty());
+                gMenuHolder->findControl(userdata["control"].asString())->setValue(new_value);
+                return true;
+        }
+};
+
+// Cycle selection through linked children in selected object.
+// FIXME: Order of children list is not always the same as sim's idea of link order. This may confuse
+// resis. Need link position added to sim messages to address this.
+class LLToolsSelectNextPart : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                S32 object_count = LLSelectMgr::getInstance()->getSelection()->getObjectCount();
+                if (gSavedSettings.getBOOL("EditLinkedParts") && object_count)
+                {
+                        LLViewerObject* selected = LLSelectMgr::getInstance()->getSelection()->getFirstObject();
+                        if (selected && selected->getRootEdit())
+                        {
+                                bool fwd = (userdata.asString() == "next");
+                                bool prev = (userdata.asString() == "previous");
+                                bool ifwd = (userdata.asString() == "includenext");
+                                bool iprev = (userdata.asString() == "includeprevious");
+                                LLViewerObject* to_select = NULL;
+                                LLViewerObject::child_list_t children = selected->getRootEdit()->getChildren();
+                                children.push_front(selected->getRootEdit());   // need root in the list too
+
+                                for (LLViewerObject::child_list_t::iterator iter = children.begin(); iter != children.end(); ++iter)
+                                {
+                                        if ((*iter)->isSelected())
+                                        {
+                                                if (object_count > 1 && (fwd || prev))  // multiple selection, find first or last selected if not include
+                                                {
+                                                        to_select = *iter;
+                                                        if (fwd)
+                                                        {
+                                                                // stop searching if going forward; repeat to get last hit if backward
+                                                                break;
+                                                        }
+                                                }
+                                                else if ((object_count == 1) || (ifwd || iprev))        // single selection or include
+                                                {
+                                                        if (fwd || ifwd)
+                                                        {
+                                                                ++iter;
+                                                                while (iter != children.end() && ((*iter)->isAvatar() || (ifwd && (*iter)->isSelected())))
+                                                                {
+                                                                        ++iter; // skip sitting avatars and selected if include
+                                                                }
+                                                        }
+                                                        else // backward
+                                                        {
+                                                                iter = (iter == children.begin() ? children.end() : iter);
+                                                                --iter;
+                                                                while (iter != children.begin() && ((*iter)->isAvatar() || (iprev && (*iter)->isSelected())))
+                                                                {
+                                                                        --iter; // skip sitting avatars and selected if include
+                                                                }
+                                                        }
+                                                        iter = (iter == children.end() ? children.begin() : iter);
+                                                        to_select = *iter;
+                                                        break;
+                                                }
+                                        }
+                                }
+
+                                if (to_select)
+                                {
+                                        if (gFocusMgr.childHasKeyboardFocus(gFloaterTools))
+                                        {
+                                                gFocusMgr.setKeyboardFocus(NULL);       // force edit toolbox to commit any changes
+                                        }
+                                        if (fwd || prev)
+                                        {
+                                                LLSelectMgr::getInstance()->deselectAll();
+                                        }
+                                        LLSelectMgr::getInstance()->selectObjectOnly(to_select);
+                                        return true;
+                                }
+                        }
+                }
+                return true;
+        }
+};
+
 // in order to link, all objects must have the same owner, and the
 // agent must have the ability to modify all of the objects. However,
 // we're not answering that question with this method. The question
@@ -10666,6 +10757,7 @@ void initialize_menus()
         addMenu(new LLToolsEditLinkedParts(), "Tools.EditLinkedParts");
         addMenu(new LLToolsSnapObjectXY(), "Tools.SnapObjectXY");
         addMenu(new LLToolsUseSelectionForGrid(), "Tools.UseSelectionForGrid");
+        addMenu(new LLToolsSelectNextPart(), "Tools.SelectNextPart");
         addMenu(new LLToolsLink(), "Tools.Link");
         addMenu(new LLToolsUnlink(), "Tools.Unlink");
         addMenu(new LLToolsStopAllAnimations(), "Tools.StopAllAnimations");
@@ -10679,6 +10771,7 @@ void initialize_menus()
         addMenu(new LLToolsSetBulkPerms(), "Tools.SetBulkPerms");
 
         addMenu(new LLToolsEnableToolNotPie(), "Tools.EnableToolNotPie");
+        addMenu(new LLToolsEnableSelectNextPart(), "Tools.EnableSelectNextPart");
         addMenu(new LLToolsEnableLink(), "Tools.EnableLink");
         addMenu(new LLToolsEnableUnlink(), "Tools.EnableUnlink");
         addMenu(new LLToolsEnableTake(), "Tools.EnableTake");