From f39e9904b27422b14256289d508d014d82c99531 Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Sun, 7 Sep 2008 16:27:00 -0500
Subject: Applied VWR-8056: Clean up menu_viewer.xml (main menu XUI)
---
.../skins/default/xui/en-us/menu_viewer.xml | 759 +++++++++------------
1 file changed, 307 insertions(+), 452 deletions(-)
(limited to 'linden/indra')
diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
index 054f867..acdb963 100644
--- a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
@@ -1,856 +1,711 @@
-
-
+
+
+
+
+
+
+
+
--
cgit v1.1
From 3282c5ff73176cb9fe8a8be6a372790516237448 Mon Sep 17 00:00:00 2001
From: Michelle2 Zenovka
Date: Sat, 20 Sep 2008 13:16:14 -0500
Subject: VWR-5082: 'Set permissions on selected task inventory' feature.
---
linden/indra/newview/llfloaterbulkpermission.cpp | 595 +++++++++++++++++++++
linden/indra/newview/llfloaterbulkpermission.h | 143 +++++
linden/indra/newview/llviewermenu.cpp | 13 +
.../skins/default/xui/en-us/floater_bulk_perms.xml | 127 +++++
.../skins/default/xui/en-us/menu_viewer.xml | 5 +
5 files changed, 883 insertions(+)
create mode 100644 linden/indra/newview/llfloaterbulkpermission.cpp
create mode 100644 linden/indra/newview/llfloaterbulkpermission.h
create mode 100644 linden/indra/newview/skins/default/xui/en-us/floater_bulk_perms.xml
(limited to 'linden/indra')
diff --git a/linden/indra/newview/llfloaterbulkpermission.cpp b/linden/indra/newview/llfloaterbulkpermission.cpp
new file mode 100644
index 0000000..29d94bc
--- /dev/null
+++ b/linden/indra/newview/llfloaterbulkpermission.cpp
@@ -0,0 +1,595 @@
+/**
+ * @file llfloaterbulkpermissions.cpp
+ * @brief A floater which allows task inventory item's properties to be changed on mass.
+ *
+ * $LicenseInfo:firstyear=2008&license=viewergpl$
+ *
+ * Copyright (c) 2008, Linden Research, Inc.
+ *
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab. Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ *
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ *
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ *
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+/* Allow multiple task inventory properties to be set in one go, by Michelle2 Zenovka */
+
+/* TODO
+
+ * Add in the option to select objects or task inventory
+s
+
+It would be nice to set the permissions on groups of prims as well as task inventory
+
+*/
+
+
+#include "llviewerprecompiledheaders.h"
+#include "llfloaterbulkpermission.h"
+#include "llagent.h"
+#include "llchat.h"
+#include "llviewerwindow.h"
+#include "llviewerobject.h"
+#include "llviewerobjectlist.h"
+#include "llviewerregion.h"
+#include "lscript_rt_interface.h"
+#include "llviewercontrol.h"
+#include "llviewerobject.h"
+#include "llviewerregion.h"
+#include "llresmgr.h"
+#include "llbutton.h"
+#include "lldir.h"
+#include "llfloaterchat.h"
+#include "llviewerstats.h"
+#include "lluictrlfactory.h"
+#include "llselectmgr.h"
+#include "llinventory.h"
+
+
+#include
+#include
+#include "llcachename.h"
+#include "lldbstrings.h"
+#include "llinventory.h"
+
+#include "llagent.h"
+#include "llbutton.h"
+#include "llcheckboxctrl.h"
+#include "llfloateravatarinfo.h"
+#include "llfloatergroupinfo.h"
+#include "llinventorymodel.h"
+#include "lllineeditor.h"
+#include "llradiogroup.h"
+#include "llresmgr.h"
+#include "roles_constants.h"
+#include "llselectmgr.h"
+#include "lltextbox.h"
+#include "lluiconstants.h"
+#include "llviewerinventory.h"
+#include "llviewerobjectlist.h"
+#include "llviewerregion.h"
+#include "llviewercontrol.h"
+
+#include "lluictrlfactory.h"
+
+
+const char* BULKPERM_QUEUE_TITLE = "Update Progress";
+const char* BULKPERM_START_STRING = "update";
+
+namespace
+{
+ struct BulkQueueObjects : public LLSelectedObjectFunctor
+ {
+ BOOL scripted;
+ BOOL modifiable;
+ LLFloaterBulkPermission* mQueue;
+ BulkQueueObjects(LLFloaterBulkPermission* q) : mQueue(q), scripted(FALSE), modifiable(FALSE) {}
+ virtual bool apply(LLViewerObject* obj)
+ {
+ scripted = obj->flagScripted();
+ modifiable = obj->permModify();
+
+ mQueue->addObject(obj->getID());
+ return false;
+
+ }
+ };
+}
+
+///----------------------------------------------------------------------------
+/// Class LLFloaterBulkPermission
+///----------------------------------------------------------------------------
+
+// static
+LLMap LLFloaterBulkPermission::sInstances;
+
+
+// Default constructor
+LLFloaterBulkPermission::LLFloaterBulkPermission(const std::string& name,
+ const LLRect& rect,
+ const char* title,
+ const char* start_string) :
+ LLFloater(name, rect, title,
+ RESIZE_YES, DEFAULT_MIN_WIDTH, DEFAULT_MIN_HEIGHT,
+ DRAG_ON_TOP, MINIMIZE_YES, CLOSE_YES)
+{
+
+ req_perm_mask=0; // This should match the default state the checkboxes are set to
+ recurse=false;
+
+ LLUICtrlFactory::getInstance()->buildFloater(this,"floater_bulk_perms.xml");
+
+ childSetAction("Apply...",onApplyBtn,this);
+ childSetEnabled("Apply...",TRUE);
+
+ childSetCommitCallback("Modify",&onCommitPermissions, this);
+ childSetCommitCallback("Trans",&onCommitPermissions, this);
+ childSetCommitCallback("Copy",&onCommitPermissions, this);
+
+ //childSetCommitCallback("Recurse",&onRecurse, this);
+
+ childSetCommitCallback("Parent",&onParent, this);
+
+ childSetCommitCallback("objects",&InvSelection, this);
+ childSetCommitCallback("scripts",&InvSelection, this);
+ childSetCommitCallback("textures",&InvSelection, this);
+ childSetCommitCallback("sounds",&InvSelection, this);
+ childSetCommitCallback("animations",&InvSelection, this);
+ childSetCommitCallback("notecards",&InvSelection, this);
+ childSetCommitCallback("landmarks",&InvSelection, this);
+ childSetCommitCallback("bodyparts",&InvSelection, this);
+ childSetCommitCallback("clothing",&InvSelection, this);
+ childSetCommitCallback("gestures",&InvSelection, this);
+
+ //Set variable state to XUI default state consistancy
+ processObject=getChild("objects")->get();
+ processScript=getChild("scripts")->get();
+ processTexture=getChild("textures")->get();
+ processSound=getChild("sounds")->get();
+ processAnimation=getChild("animations")->get();
+ processNotecard=getChild("notecards")->get();
+ processGesture=getChild("gestures")->get();
+ processClothing=getChild("clothing")->get();
+ processBodypart=getChild("bodyparts")->get();
+ processLandmark=getChild("landmarks")->get();
+ parent=getChild("Parent")->get();
+
+
+ setTitle(title);
+
+ if (!getHost())
+ {
+ LLRect curRect = getRect();
+ translate(rect.mLeft - curRect.mLeft, rect.mTop - curRect.mTop);
+ }
+
+ mStartString = start_string;
+ mDone = FALSE;
+ sInstances.addData(mID, this);
+
+}
+
+void LLFloaterBulkPermission::doApply()
+{
+ // Its alive now do the nasty work that the ScriptQueue and friends try to do in the menu code
+ // but first grab the user options
+
+ LLScrollListCtrl* list = getChild("queue output");
+ list->deleteAllItems();
+
+ //Apply to selected objects if requested first
+
+ if(parent)
+ {
+ llinfos<< "Setting permission on parent items" << llendl;
+ LLSelectMgr::getInstance()->selectionSetObjectPermissions(PERM_NEXT_OWNER,true, req_perm_mask);
+ LLSelectMgr::getInstance()->selectionSetObjectPermissions(PERM_NEXT_OWNER,false, ~req_perm_mask); //How annoying need to set and unset
+ }
+
+
+ LLFloaterBulkPermission* q;
+ q=(LLFloaterBulkPermission*)this;
+
+ BulkQueueObjects func(q);
+ const bool firstonly = false;
+ bool fail = LLSelectMgr::getInstance()->getSelection()->applyToObjects(&func, firstonly);
+ if(fail)
+ {
+ if ( !func.modifiable )
+ {
+ gViewerWindow->alertXml("NO MODIFY");
+ }
+ else
+ {
+ llwarns << "Bad logic. Are there actualy any items in that prim?" << llendl;
+ }
+ }
+ else
+ {
+ if (!q->start())
+ {
+ llwarns << "Unexpected failure attepmting to set permissions." << llendl;
+ }
+ }
+}
+
+// Destroys the object
+LLFloaterBulkPermission::~LLFloaterBulkPermission()
+{
+ sInstances.removeData(mID);
+}
+
+// find an instance by ID. Return NULL if it does not exist.
+// static
+LLFloaterBulkPermission* LLFloaterBulkPermission::findInstance(const LLUUID& id)
+{
+ if(sInstances.checkData(id))
+ {
+ return sInstances.getData(id);
+ }
+ return NULL;
+}
+
+
+// This is the callback method for the viewer object currently being
+// worked on.
+// NOT static, virtual!
+void LLFloaterBulkPermission::inventoryChanged(LLViewerObject* viewer_object,
+ InventoryObjectList* inv,
+ S32,
+ void* q_id)
+{
+ llinfos << "LLFloaterBulkPermission::inventoryChanged() for object "
+ << viewer_object->getID() << llendl;
+
+ //Remove this listener from the object since its
+ //listener callback is now being executed.
+
+ //We remove the listener here because the function
+ //removeVOInventoryListener removes the listener from a ViewerObject
+ //which it internally stores.
+
+ //If we call this further down in the function, calls to handleInventory
+ //and nextObject may update the interally stored viewer object causing
+ //the removal of the incorrect listener from an incorrect object.
+
+ //Fixes SL-6119:Recompile scripts fails to complete
+ removeVOInventoryListener();
+
+ if (viewer_object && inv && (viewer_object->getID() == mCurrentObjectID) )
+ {
+ handleInventory(viewer_object, inv);
+ }
+ else
+ {
+ // something went wrong...
+ // note that we're not working on this one, and move onto the
+ // next object in the list.
+ llwarns << "No inventory for " << mCurrentObjectID
+ << llendl;
+ nextObject();
+ }
+}
+
+void LLFloaterBulkPermission::onApplyBtn(void* user_data)
+{
+ LLFloaterBulkPermission* self = (LLFloaterBulkPermission*)user_data;
+ self->doApply();
+}
+
+
+// static
+void LLFloaterBulkPermission::InvSelection(LLUICtrl* ctrl, void* data)
+{
+ LLFloaterBulkPermission* self = (LLFloaterBulkPermission*)data;
+
+ self->processObject=self->getChild("objects")->get();
+ self->processScript=self->getChild("scripts")->get();
+ self->processTexture=self->getChild("textures")->get();
+ self->processSound=self->getChild("sounds")->get();
+ self->processAnimation=self->getChild("animations")->get();
+ self->processNotecard=self->getChild("notecards")->get();
+ self->processGesture=self->getChild("gestures")->get();
+ self->processClothing=self->getChild("clothing")->get();
+ self->processBodypart=self->getChild("bodyparts")->get();
+ self->processLandmark=self->getChild("landmarks")->get();
+
+
+}
+
+// static
+void LLFloaterBulkPermission::onParent(LLUICtrl* ctrl, void* data)
+{
+ LLFloaterBulkPermission* self = (LLFloaterBulkPermission*)data;
+ self->parent=self->getChild("Parent")->get();
+}
+
+// static
+void LLFloaterBulkPermission::onRecurse(LLUICtrl* ctrl, void* data)
+{
+ LLFloaterBulkPermission* self = (LLFloaterBulkPermission*)data;
+ self->recurse=self->getChild("Recurse")->get();
+}
+
+// static
+void LLFloaterBulkPermission::onCommitPermissions(LLUICtrl* ctrl, void* data)
+{
+ LLFloaterBulkPermission* self = (LLFloaterBulkPermission*)data;
+ LLCheckBoxCtrl* CheckModify = self->getChild("Modify");
+ LLCheckBoxCtrl* CheckCopy = self->getChild("Copy");
+ LLCheckBoxCtrl* CheckTrans = self->getChild("Trans");
+
+ self->req_perm_mask=0;
+
+ if(CheckModify->get())
+ {
+ self->req_perm_mask|=PERM_MODIFY;
+ }
+ else
+ {
+ self->req_perm_mask&=~PERM_MODIFY;
+ }
+
+ if(CheckCopy->get())
+ {
+ self->req_perm_mask|=PERM_COPY;
+ }
+ else
+ {
+ self->req_perm_mask&=~PERM_COPY;
+ }
+
+ if(CheckTrans->get())
+ {
+ self->req_perm_mask|=PERM_TRANSFER;
+ }
+ else
+ {
+ self->req_perm_mask&=~PERM_TRANSFER;
+ }
+
+
+}
+
+void LLFloaterBulkPermission::addObject(const LLUUID& id)
+{
+ mObjectIDs.put(id);
+}
+
+BOOL LLFloaterBulkPermission::start()
+{
+ llinfos << "LLFloaterBulkPermission::start()" << llendl;
+ char buffer[MAX_STRING]; /*Flawfinder: ignore*/
+ snprintf(buffer, sizeof(buffer), "Starting %s of %d items.", mStartString, mObjectIDs.count()); /* Flawfinder: ignore */
+
+ LLScrollListCtrl* list = getChild("queue output");
+ list->addCommentText(buffer);
+
+ return nextObject();
+}
+
+BOOL LLFloaterBulkPermission::isDone() const
+{
+ return (mCurrentObjectID.isNull() || (mObjectIDs.count() == 0));
+}
+
+// go to the next object. If no objects left, it falls out silently
+// and waits to be killed by the window being closed.
+BOOL LLFloaterBulkPermission::nextObject()
+{
+ S32 count;
+ BOOL successful_start = FALSE;
+ do
+ {
+ count = mObjectIDs.count();
+ llinfos << "LLFloaterBulkPermission::nextObject() - " << count
+ << " objects left to process." << llendl;
+ mCurrentObjectID.setNull();
+ if(count > 0)
+ {
+ successful_start = popNext();
+ }
+ llinfos << "LLFloaterBulkPermission::nextObject() "
+ << (successful_start ? "successful" : "unsuccessful")
+ << llendl;
+ } while((mObjectIDs.count() > 0) && !successful_start);
+
+ if(isDone() && !mDone)
+ {
+
+ LLScrollListCtrl* list = getChild("queue output");
+ mDone = TRUE;
+ char buffer[MAX_STRING]; /*Flawfinder: ignore*/
+ snprintf(buffer, sizeof(buffer), "Done."); /* Flawfinder: ignore */
+ list->addCommentText(buffer);
+
+ }
+ return successful_start;
+}
+
+// returns true if the queue has started, otherwise false. This
+// method pops the top object off of the queue.
+BOOL LLFloaterBulkPermission::popNext()
+{
+ // get the first element off of the container, and attempt to get
+ // the inventory.
+ BOOL rv = FALSE;
+ S32 count = mObjectIDs.count();
+ if(mCurrentObjectID.isNull() && (count > 0))
+ {
+ mCurrentObjectID = mObjectIDs.get(0);
+ llinfos << "LLFloaterBulkPermission::popNext() - mCurrentID: "
+ << mCurrentObjectID << llendl;
+ mObjectIDs.remove(0);
+ LLViewerObject* obj = gObjectList.findObject(mCurrentObjectID);
+ if(obj)
+ {
+ llinfos << "LLFloaterBulkPermission::popNext() requesting inv for "
+ << mCurrentObjectID << llendl;
+ LLUUID* id = new LLUUID(mID);
+
+ registerVOInventoryListener(obj,id);
+ requestVOInventory();
+ rv = TRUE;
+ }
+ else
+ {
+ llinfos<<"LLFloaterBulkPermission::popNext() returned a NULL LLViewerObject" <getNewFloaterPosition(&left, &top);
+ LLRect rect = gSavedSettings.getRect("CompileOutputRect");
+ rect.translate(left - rect.mLeft, top - rect.mTop);
+ LLFloaterBulkPermission* new_queue = new LLFloaterBulkPermission("queue",rect,"Setting Bulk permissions","Results");
+ new_queue->open(); /*Flawfinder: ignore*/
+ return new_queue;
+}
+
+
+void LLFloaterBulkPermission::handleInventory(LLViewerObject* viewer_obj, InventoryObjectList* inv)
+{
+ // find all of the lsl, leaving off duplicates. We'll remove
+ // all matching asset uuids on compilation success.
+
+ llinfos<<"handleInventory"<("queue output");
+
+ InventoryObjectList::const_iterator it = inv->begin();
+ InventoryObjectList::const_iterator end = inv->end();
+ for ( ; it != end; ++it)
+ {
+ llinfos<<"Doing iterator of inventory"<getType() == LLAssetType::AT_LSL_TEXT && processScript) ||
+ ( (*it)->getType() == LLAssetType::AT_TEXTURE && processTexture) ||
+ ( (*it)->getType() == LLAssetType::AT_SOUND && processSound) ||
+ ( (*it)->getType() == LLAssetType::AT_LANDMARK && processLandmark) ||
+ ( (*it)->getType() == LLAssetType::AT_CLOTHING && processClothing) ||
+ ( (*it)->getType() == LLAssetType::AT_OBJECT && processObject) ||
+ ( (*it)->getType() == LLAssetType::AT_NOTECARD && processNotecard) ||
+ ( (*it)->getType() == LLAssetType::AT_BODYPART && processBodypart) ||
+ ( (*it)->getType() == LLAssetType::AT_ANIMATION && processAnimation) ||
+ ( (*it)->getType() == LLAssetType::AT_GESTURE && processGesture))
+ {
+
+ LLViewerObject* object = gObjectList.findObject(viewer_obj->getID());
+
+ if (object)
+ {
+ LLInventoryItem* item = (LLInventoryItem*)((LLInventoryObject*)(*it));
+ LLViewerInventoryItem* new_item = (LLViewerInventoryItem*)item;
+ LLPermissions perm(new_item->getPermissions());
+
+ // chomp the inventory name so it fits in the scroll window nicely
+ // and the user can see the [OK]
+ std::string invname;
+ invname=item->getName().substr(0,item->getName().size() < 30 ? item->getName().size() : 30 );
+
+ // My attempt at checking valid permissions, CHECK ME
+ // note its not actually bad to try to set permissions that are not allowed as the
+ // server will protect against this, but it will piss the user off if its wrong
+ if(
+ (perm.getCreator()==gAgentID) ||
+ (perm.getMaskOwner() & PERM_TRANSFER) && (perm.getMaskOwner() & PERM_MODIFY) ||
+ (gAgent.getGroupID()==perm.getGroup() && (perm.getMaskGroup() & PERM_TRANSFER) && (perm.getMaskGroup() & PERM_MODIFY))
+ ){
+ llinfos<<"Setting perms"<setPermissions(perm);
+ updateInventory(object,new_item,TASK_INVENTORY_ITEM_KEY,FALSE);
+ snprintf(buffer, sizeof(buffer), "Setting perms on '%s' [OK]", invname.c_str()); /* Flawfinder: ignore */
+ }
+ else
+ {
+ llinfos<<"NOT setting perms"<addCommentText(buffer);
+
+ if(recurse && ( (*it)->getType() == LLAssetType::AT_OBJECT && processObject))
+ {
+ //Add this object back to the queue to be processed as it has inventory
+ snprintf(buffer, sizeof(buffer), "Queueing object '%s' for open", invname.c_str());
+ llwarns << "Queueing object "<< invname.c_str() << " ID "<< (*it)->getUUID()<getUUID());
+ // This will not YET work. as this is not a viewer object the unpack will fail
+ }
+
+ }
+ }
+ }
+
+ nextObject();
+}
+
+
+// Avoid inventory callbacks etc by just fire and forgetting the message with the permissions update
+// we could do this via LLViewerObject::updateInventory but that uses inventory call backs and buggers
+// us up and we would have a dodgy item iterator
+
+void LLFloaterBulkPermission::updateInventory(
+ LLViewerObject* object,
+ LLViewerInventoryItem* item,
+ U8 key,
+ bool is_new)
+{
+ LLMemType mt(LLMemType::MTYPE_OBJECT);
+
+
+ // This slices the object into what we're concerned about on the
+ // viewer. The simulator will take the permissions and transfer
+ // ownership.
+ LLPointer task_item =
+ new LLViewerInventoryItem(item->getUUID(), mID, item->getPermissions(),
+ item->getAssetUUID(), item->getType(),
+ item->getInventoryType(),
+ item->getName(), item->getDescription(),
+ item->getSaleInfo(),
+ item->getFlags(),
+ item->getCreationDate());
+ task_item->setTransactionID(item->getTransactionID());
+ LLMessageSystem* msg = gMessageSystem;
+ msg->newMessageFast(_PREHASH_UpdateTaskInventory);
+ msg->nextBlockFast(_PREHASH_AgentData);
+ msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
+ msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
+ msg->nextBlockFast(_PREHASH_UpdateData);
+ msg->addU32Fast(_PREHASH_LocalID, object->mLocalID);
+ msg->addU8Fast(_PREHASH_Key, key);
+ msg->nextBlockFast(_PREHASH_InventoryData);
+ task_item->packMessage(msg);
+ msg->sendReliable(object->getRegion()->getHost());
+
+}
+
diff --git a/linden/indra/newview/llfloaterbulkpermission.h b/linden/indra/newview/llfloaterbulkpermission.h
new file mode 100644
index 0000000..3de871b
--- /dev/null
+++ b/linden/indra/newview/llfloaterbulkpermission.h
@@ -0,0 +1,143 @@
+/**
+ * @file llfloaterbulkpermissions.h
+ * @brief A floater which allows task inventory item's properties to be changed on mass.
+ *
+ * $LicenseInfo:firstyear=2008&license=viewergpl$
+ *
+ * Copyright (c) 2008, Linden Research, Inc.
+ *
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab. Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ *
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ *
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ *
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+/* Allow multiple task inventory properties to be set in one go, by Michelle2 Zenovka */
+
+#ifndef LL_LLBULKPERMISSION_H
+#define LL_LLBULKPERMISSION_H
+
+#include "lldarray.h"
+#include "llinventory.h"
+#include "llviewerobject.h"
+#include "llvoinventorylistener.h"
+#include "llmap.h"
+#include "lluuid.h"
+
+#include "llfloater.h"
+#include "llscrolllistctrl.h"
+
+#include "llviewerinventory.h"
+
+class LLFloaterBulkPermission : public LLFloater, public LLVOInventoryListener
+{
+public:
+ // addObject() accepts an object id.
+ void addObject(const LLUUID& id);
+
+ // start() returns TRUE if the queue has started, otherwise FALSE.
+ BOOL start();
+
+ // Use this method to create a reset queue. Once created, it
+ // will be responsible for it's own destruction.
+ static LLFloaterBulkPermission * create();
+
+protected:
+ LLFloaterBulkPermission(const std::string& name, const LLRect& rect,
+ const char* title, const char* start_string);
+ virtual ~LLFloaterBulkPermission();
+
+ // This is the callback method for the viewer object currently
+ // being worked on.
+ /*virtual*/ void inventoryChanged(LLViewerObject* obj,
+ InventoryObjectList* inv,
+ S32 serial_num,
+ void* queue);
+
+ // This is called by inventoryChanged
+ void handleInventory(LLViewerObject* viewer_obj,
+ InventoryObjectList* inv);
+
+
+ void updateInventory(LLViewerObject* object,
+ LLViewerInventoryItem* item,
+ U8 key,
+ bool is_new);
+
+
+ static void onCloseBtn(void* user_data);
+ static void onApplyBtn(void* user_data);
+ static void onCommitPermissions(LLUICtrl* ctrl, void* data);
+ static void InvSelection(LLUICtrl* ctrl, void* data);
+ static void onRecurse(LLUICtrl* ctrl, void* data);
+ static void onParent(LLUICtrl* ctrl, void* data);
+
+ // returns true if this is done
+ BOOL isDone() const;
+
+ //Read the settings and Apply the permissions
+ void doApply();
+
+ // go to the next object. If no objects left, it falls out
+ // silently and waits to be killed by the deleteIfDone() callback.
+ BOOL nextObject();
+ BOOL popNext();
+
+ // Get this instances ID.
+ const LLUUID& getID() const { return mID; }
+
+ // find an instance by ID. Return NULL if it does not exist.
+ static LLFloaterBulkPermission* findInstance(const LLUUID& id);
+
+ U32 req_perm_mask;
+
+ BOOL processObject;
+ BOOL processScript;
+ BOOL processTexture;
+ BOOL processSound;
+ BOOL processAnimation;
+ BOOL processCallingcard;
+ BOOL processNotecard;
+ BOOL processGesture;
+ BOOL processClothing;
+ BOOL processBodypart;
+ BOOL processLandmark;
+
+ BOOL recurse;
+ BOOL parent;
+
+protected:
+ // UI
+ LLScrollListCtrl* mMessages;
+ LLButton* mCloseBtn;
+
+ // Object Queue
+ LLDynamicArray mObjectIDs;
+ LLUUID mCurrentObjectID;
+ BOOL mDone;
+
+ LLUUID mID;
+ static LLMap sInstances;
+
+ const char* mStartString;
+
+};
+
+#endif
diff --git a/linden/indra/newview/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp
index 3e99384..1ec71ac 100644
--- a/linden/indra/newview/llviewermenu.cpp
+++ b/linden/indra/newview/llviewermenu.cpp
@@ -86,6 +86,7 @@
#include "llfloateravatarinfo.h"
#include "llfloateravatartextures.h"
#include "llfloaterbuildoptions.h"
+#include "llfloaterbulkpermission.h"
#include "llfloaterbump.h"
#include "llfloaterbuy.h"
#include "llfloaterbuycontents.h"
@@ -6239,6 +6240,17 @@ void queue_actions(LLFloaterScriptQueue* q, const std::string& noscriptmsg, cons
}
}
+class LLToolsSetBulkPerms : public view_listener_t
+{
+ bool handleEvent(LLPointer event, const LLSD& userdata)
+ {
+ LLFloaterBulkPermission* queue = NULL;
+ queue = LLFloaterBulkPermission::create();
+ return true;
+ }
+};
+
+
class LLToolsSelectedScriptAction : public view_listener_t
{
bool handleEvent(LLPointer event, const LLSD& userdata)
@@ -7827,6 +7839,7 @@ void initialize_menus()
addMenu(new LLToolsSaveToInventory(), "Tools.SaveToInventory");
addMenu(new LLToolsSaveToObjectInventory(), "Tools.SaveToObjectInventory");
addMenu(new LLToolsSelectedScriptAction(), "Tools.SelectedScriptAction");
+ addMenu(new LLToolsSetBulkPerms(), "Tools.SetBulkPerms");
addMenu(new LLToolsEnableToolNotPie(), "Tools.EnableToolNotPie");
addMenu(new LLToolsEnableLink(), "Tools.EnableLink");
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_bulk_perms.xml b/linden/indra/newview/skins/default/xui/en-us/floater_bulk_perms.xml
new file mode 100644
index 0000000..3dd838a
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_bulk_perms.xml
@@ -0,0 +1,127 @@
+
+
+
+Apply to
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Permissions
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
index 054f867..eacd0ed 100644
--- a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
@@ -756,6 +756,11 @@
+
+
+
+