[XP Tools] Initial merge Cherry Pick Also modernize llfloaterauction internally, but leave the ui the same for now. Breaks out script_question_mute() in llviewermessage.cpp to better sync with upstream Adds support for UnknownScriptQuestion notification (translators need to translate this one~) RLVa note: Rewrote RLVa permissions handling block just a bit. Added 13 new capabilities from the XP Tools, I doubt all of them really exist. Minor update to LLComboBox, decided against implementing LLIconsComboBox for now. Modified LLExperienceLog::notify to lookup names and display them along with the slurls since our editors don't do that automatically. Experience tweak: Changed a few notify's to notifytips so that we can click the links to experience profiles from chat instead of via hacked in buttons Migrated LLFloaterCompileQueue to a proper Instance Tracker so we can call getKey Modernized LLSD, gives us reverse iterators and the new debugging impl. We needed the reverse iterators. Experience tweak: Added virtual destructors to responders. Updated llhandle.h to allow calling getDerivedHandle in public. Updated LLScrollContainer and LLScrollBar to be more modern. Added LLFlatListView/flat_list_view from upstream - these don't seem work though? Added some newer login/logout strings to strings.xml Thanks for the default timeout policies, Aleric~ To avoid needing to scroll through tabs, about land tabs now are as big as they need to be to display their labels, same on groups Group Members and Roles has been renamed to just Members because this allows the new Experiences tab enough room to display. Thanks to Henri Beauchamp (Cool VL Viewer) for the setupList augmentation. (without it, I'd still be stuck) Thanks to Shyotl for the helpsies~ Added the LSL constants, events, and functions that LL neglected to put in. Added click callbacks and name lookups for profile linky texts~ Merge is up to 22b4cdc Old TODO: Get the uis looking nice (profiles? Experiences... floater) - done Old TODO: Make sure flatlistviews look okay... - Not using Old TODO: Fix LLFloaterExperiencePicker, right now the panel does not show. - unsure Old TODO: Remove the llfloaterabout.cpp change. - done Merges llexperiencecache with upstream and unstable Introduces LLCoroResponder, TODO: Make everything use this. Updates Reporter floater to the latest, supports the new cap thingy Also adds these commits/changes: [XPTools] Double clicking experiences in namelists should open the profile Add List.CopyNames support for Experiences [XP Tools] Some UI work, I'll do more later [XPTools] More UI Stuff, Later is now! Allow getSLURL for experiences WIP Experience list menu Also make EXPERIENCE > OBJECT, because mainline started OBJECT already [XPTools] Add Experience support to Name UI [XPTools] Fix experience profile UI 9c3067e843265587e91c659200a8d783acf2d9b2 [XPTools] Fix experience location showing "last" and getting set to "last" [XPTools] Move Experiences floater from view menu to world menu [XPTools] Fix up more UI [XPTools] Fix experiences panels [XPTools] Hide pieces of the Experiences menu when they're not usable [XPTools] More UI work, mostly to get the menus working [XPTools] The events list is for events, not experiences, remove menu # Conflicts: # indra/llcommon/llsd.cpp - merge with unstable branch # indra/llmessage/message_prehash.cpp # indra/llmessage/message_prehash.h # indra/llui/llscrollbar.cpp # indra/llui/llscrollcontainer.cpp # indra/llui/llurlentry.cpp # indra/llui/llurlregistry.cpp # indra/newview/app_settings/keywords.ini # indra/newview/app_settings/settings.xml # indra/newview/llappviewer.cpp # indra/newview/llappviewer.h # indra/newview/llassetuploadresponders.cpp # indra/newview/llcompilequeue.* - merge stable # indra/newview/llfloaterabout.cpp # indra/newview/llfloaterland.* - merge unstable # indra/newview/llfloaterproperties.cpp # indra/newview/llfloaterregioninfo.* - merge unstable # indra/newview/llmenucommands.cpp - merge unstable # indra/newview/llpreviewscript.cpp - merge unstable # indra/newview/llviewermessage.cpp - merge unstable # indra/newview/llviewerregion.cpp - merge unstable # indra/newview/skins/default/textures/textures.xml - merge unstable # indra/newview/skins/default/xui/en-us/strings.xml - merge unstable
814 lines
25 KiB
C++
814 lines
25 KiB
C++
/**
|
|
* @file llcompilequeue.cpp
|
|
* @brief LLCompileQueueData class implementation
|
|
*
|
|
* $LicenseInfo:firstyear=2002&license=viewergpl$
|
|
*
|
|
* Copyright (c) 2002-2009, 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$
|
|
*/
|
|
|
|
/**
|
|
*
|
|
* Implementation of the script queue which keeps an array of object
|
|
* UUIDs and manipulates all of the scripts on each of them.
|
|
*
|
|
*/
|
|
|
|
|
|
#include "llviewerprecompiledheaders.h"
|
|
|
|
#include "llcompilequeue.h"
|
|
|
|
#include "llagent.h"
|
|
#include "llassetuploadqueue.h"
|
|
#include "llassetuploadresponders.h"
|
|
#include "llchat.h"
|
|
#include "llviewerwindow.h"
|
|
#include "llviewerobject.h"
|
|
#include "llviewerobjectlist.h"
|
|
#include "llviewerregion.h"
|
|
#include "llviewercontrol.h"
|
|
#include "llviewerobject.h"
|
|
#include "llviewerregion.h"
|
|
#include "llresmgr.h"
|
|
|
|
#include "llbutton.h"
|
|
#include "llscrolllistctrl.h"
|
|
#include "lldir.h"
|
|
#include "llnotificationsutil.h"
|
|
#include "llfloaterchat.h"
|
|
#include "llviewerstats.h"
|
|
#include "lluictrlfactory.h"
|
|
#include "lltrans.h"
|
|
|
|
#include "llselectmgr.h"
|
|
#include "llexperiencecache.h"
|
|
|
|
// *TODO: This should be separated into the script queue, and the floater views of that queue.
|
|
// There should only be one floater class that can view any queue type
|
|
|
|
///----------------------------------------------------------------------------
|
|
/// Local function declarations, constants, enums, and typedefs
|
|
///----------------------------------------------------------------------------
|
|
|
|
struct LLScriptQueueData
|
|
{
|
|
LLUUID mQueueID;
|
|
LLPointer<LLInventoryItem> mItemp;
|
|
LLUUID mTaskId;
|
|
LLUUID mExperienceId;
|
|
LLHost mHost;
|
|
LLScriptQueueData(const LLUUID& q_id, const LLUUID& task_id, LLInventoryItem* item, const LLHost& host) :
|
|
mQueueID(q_id), mTaskId(task_id), mItemp(item), mHost(host) {}
|
|
};
|
|
|
|
///----------------------------------------------------------------------------
|
|
/// Class LLFloaterScriptQueue
|
|
///----------------------------------------------------------------------------
|
|
|
|
// static
|
|
LLMap<LLUUID, LLFloaterScriptQueue*> LLFloaterScriptQueue::sInstances;
|
|
|
|
|
|
// Default constructor
|
|
LLFloaterScriptQueue::LLFloaterScriptQueue(const std::string& name,
|
|
const LLRect& rect,
|
|
const std::string& title,
|
|
const std::string& start_string) :
|
|
LLFloater(name, rect, title,
|
|
RESIZE_YES, DEFAULT_MIN_WIDTH, DEFAULT_MIN_HEIGHT,
|
|
DRAG_ON_TOP, MINIMIZE_YES, CLOSE_YES),
|
|
mMessages(nullptr),
|
|
mCloseBtn(nullptr),
|
|
mDone(false),
|
|
mMono(false)
|
|
{
|
|
mID.generate();
|
|
|
|
LLUICtrlFactory::getInstance()->buildFloater(this,"floater_script_queue.xml");
|
|
setTitle(title);
|
|
|
|
LLRect curRect = getRect();
|
|
translate(rect.mLeft - curRect.mLeft, rect.mTop - curRect.mTop);
|
|
mStartString = start_string;
|
|
sInstances.addData(mID, this);
|
|
}
|
|
|
|
// Destroys the object
|
|
LLFloaterScriptQueue::~LLFloaterScriptQueue()
|
|
{
|
|
sInstances.removeData(mID);
|
|
}
|
|
|
|
BOOL LLFloaterScriptQueue::postBuild()
|
|
{
|
|
childSetAction("close",onCloseBtn,this);
|
|
getChildView("close")->setEnabled(FALSE);
|
|
return TRUE;
|
|
}
|
|
|
|
// find an instance by ID. Return NULL if it does not exist.
|
|
// static
|
|
LLFloaterScriptQueue* LLFloaterScriptQueue::findInstance(const LLUUID& id)
|
|
{
|
|
return sInstances.checkData(id) ? sInstances.getData(id) : NULL;
|
|
}
|
|
|
|
// This is the callback method for the viewer object currently being
|
|
// worked on.
|
|
// NOT static, virtual!
|
|
void LLFloaterScriptQueue::inventoryChanged(LLViewerObject* viewer_object,
|
|
LLInventoryObject::object_list_t* inv,
|
|
S32,
|
|
void* q_id)
|
|
{
|
|
LL_INFOS() << "LLFloaterScriptQueue::inventoryChanged() for object "
|
|
<< viewer_object->getID() << LL_ENDL;
|
|
|
|
//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.
|
|
LL_WARNS() << "No inventory for " << mCurrentObjectID
|
|
<< LL_ENDL;
|
|
nextObject();
|
|
}
|
|
}
|
|
|
|
|
|
// static
|
|
void LLFloaterScriptQueue::onCloseBtn(void* user_data)
|
|
{
|
|
LLFloaterScriptQueue* self = (LLFloaterScriptQueue*)user_data;
|
|
self->close();
|
|
}
|
|
|
|
void LLFloaterScriptQueue::addObject(const LLUUID& id)
|
|
{
|
|
mObjectIDs.push_back(id);
|
|
}
|
|
|
|
BOOL LLFloaterScriptQueue::start()
|
|
{
|
|
std::string buffer;
|
|
|
|
LLStringUtil::format_map_t args;
|
|
args["[START]"] = mStartString;
|
|
args["[COUNT]"] = llformat ("%d", mObjectIDs.size());
|
|
buffer = getString ("Starting", args);
|
|
|
|
getChild<LLScrollListCtrl>("queue output")->addSimpleElement(buffer, ADD_BOTTOM);
|
|
|
|
return startQueue();
|
|
}
|
|
|
|
BOOL LLFloaterScriptQueue::isDone() const
|
|
{
|
|
return (mCurrentObjectID.isNull() && (mObjectIDs.size() == 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 LLFloaterScriptQueue::nextObject()
|
|
{
|
|
U32 count;
|
|
BOOL successful_start = FALSE;
|
|
do
|
|
{
|
|
count = mObjectIDs.size();
|
|
LL_INFOS() << "LLFloaterScriptQueue::nextObject() - " << count
|
|
<< " objects left to process." << LL_ENDL;
|
|
mCurrentObjectID.setNull();
|
|
if (count > 0)
|
|
{
|
|
successful_start = popNext();
|
|
}
|
|
LL_INFOS() << "LLFloaterScriptQueue::nextObject() "
|
|
<< (successful_start ? "successful" : "unsuccessful")
|
|
<< LL_ENDL;
|
|
} while((mObjectIDs.size() > 0) && !successful_start);
|
|
if (isDone() && !mDone)
|
|
{
|
|
mDone = true;
|
|
getChild<LLScrollListCtrl>("queue output")->addSimpleElement(getString("Done"), ADD_BOTTOM);
|
|
getChildView("close")->setEnabled(TRUE);
|
|
}
|
|
return successful_start;
|
|
}
|
|
|
|
// returns true if the queue has started, otherwise false. This
|
|
// method pops the top object off of the queue.
|
|
BOOL LLFloaterScriptQueue::popNext()
|
|
{
|
|
// get the first element off of the container, and attempt to get
|
|
// the inventory.
|
|
BOOL rv = FALSE;
|
|
S32 count = mObjectIDs.size();
|
|
if (mCurrentObjectID.isNull() && (count > 0))
|
|
{
|
|
mCurrentObjectID = mObjectIDs.at(0);
|
|
LL_INFOS() << "LLFloaterScriptQueue::popNext() - mCurrentID: "
|
|
<< mCurrentObjectID << LL_ENDL;
|
|
mObjectIDs.erase(mObjectIDs.begin());
|
|
LLViewerObject* obj = gObjectList.findObject(mCurrentObjectID);
|
|
if (obj)
|
|
{
|
|
LL_INFOS() << "LLFloaterScriptQueue::popNext() requesting inv for "
|
|
<< mCurrentObjectID << LL_ENDL;
|
|
LLUUID* id = new LLUUID(mID);
|
|
registerVOInventoryListener(obj,id);
|
|
requestVOInventory();
|
|
rv = TRUE;
|
|
}
|
|
}
|
|
return rv;
|
|
}
|
|
|
|
BOOL LLFloaterScriptQueue::startQueue()
|
|
{
|
|
return nextObject();
|
|
}
|
|
|
|
class CompileQueueExperienceResponder final : public LLHTTPClient::ResponderWithResult
|
|
{
|
|
const LLUUID mParent;
|
|
public:
|
|
CompileQueueExperienceResponder(const LLUUID& parent): mParent(parent) {}
|
|
|
|
void httpSuccess() override { sendResult(getContent()); }
|
|
void httpFailure() override { sendResult(LLSD()); }
|
|
void sendResult(const LLSD& content)
|
|
{
|
|
if (auto queue = static_cast<LLFloaterCompileQueue*>(LLFloaterCompileQueue::findInstance(mParent)))
|
|
queue->experienceIdsReceived(content["experience_ids"]);
|
|
}
|
|
char const* getName() const override { return "CompileQueueExperienceResponder"; }
|
|
};
|
|
|
|
|
|
|
|
///----------------------------------------------------------------------------
|
|
/// Class LLFloaterCompileQueue
|
|
///----------------------------------------------------------------------------
|
|
|
|
class LLCompileFloaterUploadQueueSupplier : public LLAssetUploadQueueSupplier
|
|
{
|
|
public:
|
|
|
|
LLCompileFloaterUploadQueueSupplier(const LLUUID& queue_id) :
|
|
mQueueId(queue_id)
|
|
{
|
|
}
|
|
|
|
virtual LLAssetUploadQueue* get() const
|
|
{
|
|
LLFloaterCompileQueue* queue = (LLFloaterCompileQueue*) LLFloaterScriptQueue::findInstance(mQueueId);
|
|
if (NULL == queue)
|
|
{
|
|
return NULL;
|
|
}
|
|
return queue->getUploadQueue();
|
|
}
|
|
|
|
virtual void log(std::string message) const
|
|
{
|
|
LLFloaterCompileQueue* queue = (LLFloaterCompileQueue*) LLFloaterScriptQueue::findInstance(mQueueId);
|
|
if (NULL == queue)
|
|
{
|
|
return;
|
|
}
|
|
|
|
queue->getChild<LLScrollListCtrl>("queue output")->addSimpleElement(message, ADD_BOTTOM);
|
|
}
|
|
|
|
private:
|
|
LLUUID mQueueId;
|
|
};
|
|
|
|
// static
|
|
LLFloaterCompileQueue* LLFloaterCompileQueue::create(bool mono)
|
|
{
|
|
S32 left, top;
|
|
gFloaterView->getNewFloaterPosition(&left, &top);
|
|
LLRect rect = gSavedSettings.getRect("CompileOutputRect");
|
|
rect.translate(left - rect.mLeft, top - rect.mTop);
|
|
LLFloaterCompileQueue* new_queue = new LLFloaterCompileQueue("queue", rect);
|
|
|
|
new_queue->mUploadQueue = new LLAssetUploadQueue(new LLCompileFloaterUploadQueueSupplier(new_queue->getID()));
|
|
new_queue->setMono(mono);
|
|
new_queue->open();
|
|
return new_queue;
|
|
}
|
|
|
|
LLFloaterCompileQueue::LLFloaterCompileQueue(const std::string& name, const LLRect& rect)
|
|
: LLFloaterScriptQueue(name, rect, LLTrans::getString("CompileQueueTitle"), LLTrans::getString("CompileQueueStart"))
|
|
{ }
|
|
|
|
LLFloaterCompileQueue::~LLFloaterCompileQueue()
|
|
{
|
|
}
|
|
|
|
void LLFloaterCompileQueue::experienceIdsReceived(const LLSD& content)
|
|
{
|
|
for(LLSD::array_const_iterator it = content.beginArray(); it != content.endArray(); ++it)
|
|
{
|
|
mExperienceIds.insert(it->asUUID());
|
|
}
|
|
nextObject();
|
|
}
|
|
|
|
BOOL LLFloaterCompileQueue::hasExperience(const LLUUID& id) const
|
|
{
|
|
return mExperienceIds.find(id) != mExperienceIds.end();
|
|
}
|
|
|
|
|
|
void LLFloaterCompileQueue::handleInventory(LLViewerObject *viewer_object,
|
|
LLInventoryObject::object_list_t* inv)
|
|
{
|
|
// find all of the lsl, leaving off duplicates. We'll remove
|
|
// all matching asset uuids on compilation success.
|
|
|
|
typedef std::multimap<LLUUID, LLPointer<LLInventoryItem> > uuid_item_map;
|
|
uuid_item_map asset_item_map;
|
|
|
|
LLInventoryObject::object_list_t::const_iterator it = inv->begin();
|
|
LLInventoryObject::object_list_t::const_iterator end = inv->end();
|
|
for ( ; it != end; ++it)
|
|
{
|
|
if ((*it)->getType() == LLAssetType::AT_LSL_TEXT)
|
|
{
|
|
LLInventoryItem* item = (LLInventoryItem*)((LLInventoryObject*)(*it));
|
|
// Check permissions before allowing the user to retrieve data.
|
|
if (item->getPermissions().allowModifyBy(gAgent.getID(), gAgent.getGroupID()) &&
|
|
item->getPermissions().allowCopyBy(gAgent.getID(), gAgent.getGroupID()) )
|
|
{
|
|
LLPointer<LLViewerInventoryItem> script = new LLViewerInventoryItem(item);
|
|
mCurrentScripts.push_back(script);
|
|
asset_item_map.insert(std::make_pair(item->getAssetUUID(), item));
|
|
}
|
|
}
|
|
}
|
|
|
|
if (asset_item_map.empty())
|
|
{
|
|
// There are no scripts in this object. move on.
|
|
nextObject();
|
|
}
|
|
else
|
|
{
|
|
LLViewerRegion* region = viewer_object->getRegion();
|
|
std::string url = std::string();
|
|
if (region)
|
|
{
|
|
url = region->getCapability("GetMetadata");
|
|
}
|
|
|
|
const auto& host = region->getHost();
|
|
const auto& obj_id = viewer_object->getID();
|
|
// request all of the assets.
|
|
for(const auto& pair : asset_item_map)
|
|
{
|
|
LLInventoryItem *itemp = pair.second;
|
|
LLScriptQueueData* datap = new LLScriptQueueData(getID(),
|
|
obj_id,
|
|
itemp,
|
|
host);
|
|
|
|
LLExperienceCache::instance().fetchAssociatedExperience(itemp->getParentUUID(), itemp->getUUID(),
|
|
boost::bind(LLFloaterCompileQueue::requestAsset, datap, _1));
|
|
}
|
|
}
|
|
}
|
|
|
|
void LLFloaterCompileQueue::requestAsset(LLScriptQueueData* datap, const LLSD& experience)
|
|
{
|
|
LLFloaterCompileQueue* queue = static_cast<LLFloaterCompileQueue*>(findInstance(datap->mQueueID));
|
|
if (!queue)
|
|
{
|
|
delete datap;
|
|
return;
|
|
}
|
|
|
|
if (experience.has(LLExperienceCache::EXPERIENCE_ID))
|
|
{
|
|
datap->mExperienceId = experience[LLExperienceCache::EXPERIENCE_ID].asUUID();
|
|
if (!queue->hasExperience(datap->mExperienceId))
|
|
{
|
|
std::string buffer = LLTrans::getString("CompileNoExperiencePerm", LLSD::emptyMap()
|
|
.with("SCRIPT", datap->mItemp->getName())
|
|
.with("EXPERIENCE", experience[LLExperienceCache::NAME].asString()));
|
|
|
|
queue->getChild<LLScrollListCtrl>("queue output")->addSimpleElement(buffer, ADD_BOTTOM);
|
|
queue->removeItemByItemID(datap->mItemp->getUUID());
|
|
delete datap;
|
|
return;
|
|
}
|
|
}
|
|
|
|
//LL_INFOS() << "ITEM NAME 2: " << names.get(i) << LL_ENDL;
|
|
gAssetStorage->getInvItemAsset(datap->mHost,
|
|
gAgent.getID(),
|
|
gAgent.getSessionID(),
|
|
datap->mItemp->getPermissions().getOwner(),
|
|
datap->mTaskId,
|
|
datap->mItemp->getUUID(),
|
|
datap->mItemp->getAssetUUID(),
|
|
datap->mItemp->getType(),
|
|
LLFloaterCompileQueue::scriptArrived,
|
|
(void*)datap);
|
|
}
|
|
|
|
|
|
// This is the callback for when each script arrives
|
|
// static
|
|
void LLFloaterCompileQueue::scriptArrived(LLVFS *vfs, const LLUUID& asset_id,
|
|
LLAssetType::EType type,
|
|
void* user_data, S32 status, LLExtStat ext_status)
|
|
{
|
|
LL_INFOS() << "LLFloaterCompileQueue::scriptArrived()" << LL_ENDL;
|
|
LLScriptQueueData* data = (LLScriptQueueData*)user_data;
|
|
if(!data)
|
|
{
|
|
return;
|
|
}
|
|
LLFloaterCompileQueue* queue = static_cast<LLFloaterCompileQueue*> (LLFloaterScriptQueue::findInstance(data->mQueueID));
|
|
|
|
std::string buffer;
|
|
if (queue && (0 == status))
|
|
{
|
|
//LL_INFOS() << "ITEM NAME 3: " << data->mItemp->getName() << LL_ENDL;
|
|
|
|
// Dump this into a file on the local disk so we can compile it.
|
|
std::string filename;
|
|
LLVFile file(vfs, asset_id, type);
|
|
std::string uuid_str;
|
|
asset_id.toString(uuid_str);
|
|
filename = gDirUtilp->getExpandedFilename(LL_PATH_CACHE,uuid_str) + llformat(".%s",LLAssetType::lookup(type));
|
|
|
|
const bool is_running = true;
|
|
LLViewerObject* object = gObjectList.findObject(data->mTaskId);
|
|
if (object)
|
|
{
|
|
std::string url = object->getRegion()->getCapability("UpdateScriptTask");
|
|
if (!url.empty())
|
|
{
|
|
// Read script source in to buffer.
|
|
U32 script_size = file.getSize();
|
|
U8* script_data = new U8[script_size];
|
|
file.read(script_data, script_size);
|
|
|
|
queue->mUploadQueue->queue(filename, data->mTaskId,
|
|
data->mItemp->getUUID(), is_running, queue->mMono, queue->getID(),
|
|
script_data, script_size, data->mItemp->getName(), data->mExperienceId);
|
|
}
|
|
else
|
|
{
|
|
std::string text = LLTrans::getString("CompileQueueProblemUploading");
|
|
LLChat chat(text);
|
|
LLFloaterChat::addChat(chat);
|
|
buffer = text + LLTrans::getString(":") + ' ' + data->mItemp->getName();
|
|
LL_WARNS() << "Problem uploading script asset." << LL_ENDL;
|
|
if(queue) queue->removeItemByItemID(data->mItemp->getUUID());
|
|
}
|
|
}
|
|
}
|
|
else
|
|
{
|
|
LLViewerStats::getInstance()->incStat( LLViewerStats::ST_DOWNLOAD_FAILED );
|
|
|
|
if ( LL_ERR_ASSET_REQUEST_NOT_IN_DATABASE == status )
|
|
{
|
|
LLChat chat(LLTrans::getString("CompileQueueScriptNotFound"));
|
|
LLFloaterChat::addChat(chat);
|
|
|
|
buffer = LLTrans::getString("CompileQueueProblemDownloading") + LLTrans::getString(":") + ' ' + data->mItemp->getName();
|
|
}
|
|
else if (LL_ERR_INSUFFICIENT_PERMISSIONS == status)
|
|
{
|
|
LLChat chat(LLTrans::getString("CompileQueueInsufficientPermDownload"));
|
|
LLFloaterChat::addChat(chat);
|
|
|
|
buffer = LLTrans::getString("CompileQueueInsufficientPermFor") + LLTrans::getString(":") + ' ' + data->mItemp->getName();
|
|
}
|
|
else
|
|
{
|
|
buffer = LLTrans::getString("CompileQueueUnknownFailure") + ' ' + data->mItemp->getName();
|
|
}
|
|
|
|
LL_WARNS() << "Problem downloading script asset." << LL_ENDL;
|
|
if(queue) queue->removeItemByItemID(data->mItemp->getUUID());
|
|
}
|
|
if (queue && (buffer.size() > 0))
|
|
{
|
|
queue->getChild<LLScrollListCtrl>("queue output")->addSimpleElement(buffer, ADD_BOTTOM);
|
|
}
|
|
delete data;
|
|
}
|
|
|
|
|
|
const LLInventoryItem* LLFloaterCompileQueue::findItemByItemID(const LLUUID& asset_id) const
|
|
{
|
|
LLInventoryItem* result = NULL;
|
|
S32 count = mCurrentScripts.size();
|
|
for(S32 i = 0; i < count; ++i)
|
|
{
|
|
if(asset_id == mCurrentScripts.at(i)->getUUID())
|
|
{
|
|
result = mCurrentScripts.at(i);
|
|
}
|
|
}
|
|
return result;
|
|
}
|
|
|
|
void LLFloaterCompileQueue::saveItemByItemID(const LLUUID& asset_id)
|
|
{
|
|
LL_INFOS() << "LLFloaterCompileQueue::saveItemByAssetID()" << LL_ENDL;
|
|
LLViewerObject* viewer_object = gObjectList.findObject(mCurrentObjectID);
|
|
if (viewer_object)
|
|
{
|
|
S32 count = mCurrentScripts.size();
|
|
for(S32 i = 0; i < count; ++i)
|
|
{
|
|
if(asset_id == mCurrentScripts.at(i)->getUUID())
|
|
{
|
|
// *FIX: this auto-resets active to TRUE. That might
|
|
// be a bad idea.
|
|
viewer_object->saveScript(mCurrentScripts.at(i), TRUE, false);
|
|
}
|
|
}
|
|
}
|
|
else
|
|
{
|
|
LL_WARNS() << "Unable to finish save!" << LL_ENDL;
|
|
}
|
|
}
|
|
|
|
///----------------------------------------------------------------------------
|
|
/// Class LLFloaterResetQueue
|
|
///----------------------------------------------------------------------------
|
|
|
|
// static
|
|
LLFloaterResetQueue* LLFloaterResetQueue::create()
|
|
{
|
|
S32 left, top;
|
|
gFloaterView->getNewFloaterPosition(&left, &top);
|
|
LLRect rect = gSavedSettings.getRect("CompileOutputRect");
|
|
rect.translate(left - rect.mLeft, top - rect.mTop);
|
|
LLFloaterResetQueue* new_queue = new LLFloaterResetQueue("queue", rect);
|
|
gFloaterView->addChild(new_queue);
|
|
new_queue->open();
|
|
return new_queue;
|
|
}
|
|
|
|
LLFloaterResetQueue::LLFloaterResetQueue(const std::string& name, const LLRect& rect)
|
|
: LLFloaterScriptQueue(name, rect, LLTrans::getString("ResetQueueTitle"), LLTrans::getString("ResetQueueStart"))
|
|
{ }
|
|
|
|
LLFloaterResetQueue::~LLFloaterResetQueue()
|
|
{
|
|
}
|
|
|
|
void LLFloaterResetQueue::handleInventory(LLViewerObject* viewer_obj,
|
|
LLInventoryObject::object_list_t* inv)
|
|
{
|
|
// find all of the lsl, leaving off duplicates. We'll remove
|
|
// all matching asset uuids on compilation success.
|
|
|
|
LLInventoryObject::object_list_t::const_iterator it = inv->begin();
|
|
LLInventoryObject::object_list_t::const_iterator end = inv->end();
|
|
for ( ; it != end; ++it)
|
|
{
|
|
if ((*it)->getType() == LLAssetType::AT_LSL_TEXT)
|
|
{
|
|
LLViewerObject* object = gObjectList.findObject(viewer_obj->getID());
|
|
|
|
if (object)
|
|
{
|
|
LLInventoryItem* item = (LLInventoryItem*)((LLInventoryObject*)(*it));
|
|
std::string buffer;
|
|
buffer = getString("Resetting") + LLTrans::getString(":") + ' ' + item->getName();
|
|
getChild<LLScrollListCtrl>("queue output")->addSimpleElement(buffer, ADD_BOTTOM);
|
|
LLMessageSystem* msg = gMessageSystem;
|
|
msg->newMessageFast(_PREHASH_ScriptReset);
|
|
msg->nextBlockFast(_PREHASH_AgentData);
|
|
msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
|
|
msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
|
|
msg->nextBlockFast(_PREHASH_Script);
|
|
msg->addUUIDFast(_PREHASH_ObjectID, viewer_obj->getID());
|
|
msg->addUUIDFast(_PREHASH_ItemID, (*it)->getUUID());
|
|
msg->sendReliable(object->getRegion()->getHost());
|
|
}
|
|
}
|
|
}
|
|
|
|
nextObject();
|
|
}
|
|
|
|
///----------------------------------------------------------------------------
|
|
/// Class LLFloaterRunQueue
|
|
///----------------------------------------------------------------------------
|
|
|
|
// static
|
|
LLFloaterRunQueue* LLFloaterRunQueue::create()
|
|
{
|
|
S32 left, top;
|
|
gFloaterView->getNewFloaterPosition(&left, &top);
|
|
LLRect rect = gSavedSettings.getRect("CompileOutputRect");
|
|
rect.translate(left - rect.mLeft, top - rect.mTop);
|
|
LLFloaterRunQueue* new_queue = new LLFloaterRunQueue("queue", rect);
|
|
new_queue->open(); /*Flawfinder: ignore*/
|
|
return new_queue;
|
|
}
|
|
|
|
LLFloaterRunQueue::LLFloaterRunQueue(const std::string& name, const LLRect& rect)
|
|
: LLFloaterScriptQueue(name, rect, LLTrans::getString("RunQueueTitle"), LLTrans::getString("RunQueueStart"))
|
|
{ }
|
|
|
|
LLFloaterRunQueue::~LLFloaterRunQueue()
|
|
{
|
|
}
|
|
|
|
void LLFloaterRunQueue::handleInventory(LLViewerObject* viewer_obj,
|
|
LLInventoryObject::object_list_t* inv)
|
|
{
|
|
// find all of the lsl, leaving off duplicates. We'll remove
|
|
// all matching asset uuids on compilation success.
|
|
LLInventoryObject::object_list_t::const_iterator it = inv->begin();
|
|
LLInventoryObject::object_list_t::const_iterator end = inv->end();
|
|
for ( ; it != end; ++it)
|
|
{
|
|
if ((*it)->getType() == LLAssetType::AT_LSL_TEXT)
|
|
{
|
|
LLViewerObject* object = gObjectList.findObject(viewer_obj->getID());
|
|
|
|
if (object)
|
|
{
|
|
LLInventoryItem* item = (LLInventoryItem*)((LLInventoryObject*)(*it));
|
|
LLScrollListCtrl* list = getChild<LLScrollListCtrl>("queue output");
|
|
std::string buffer;
|
|
buffer = getString("Running") + LLTrans::getString(":") + ' ' + item->getName();
|
|
list->addSimpleElement(buffer, ADD_BOTTOM);
|
|
|
|
LLMessageSystem* msg = gMessageSystem;
|
|
msg->newMessageFast(_PREHASH_SetScriptRunning);
|
|
msg->nextBlockFast(_PREHASH_AgentData);
|
|
msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
|
|
msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
|
|
msg->nextBlockFast(_PREHASH_Script);
|
|
msg->addUUIDFast(_PREHASH_ObjectID, viewer_obj->getID());
|
|
msg->addUUIDFast(_PREHASH_ItemID, (*it)->getUUID());
|
|
msg->addBOOLFast(_PREHASH_Running, TRUE);
|
|
msg->sendReliable(object->getRegion()->getHost());
|
|
}
|
|
}
|
|
}
|
|
|
|
nextObject();
|
|
}
|
|
|
|
///----------------------------------------------------------------------------
|
|
/// Class LLFloaterNotRunQueue
|
|
///----------------------------------------------------------------------------
|
|
|
|
// static
|
|
LLFloaterNotRunQueue* LLFloaterNotRunQueue::create()
|
|
{
|
|
S32 left, top;
|
|
gFloaterView->getNewFloaterPosition(&left, &top);
|
|
LLRect rect = gSavedSettings.getRect("CompileOutputRect");
|
|
rect.translate(left - rect.mLeft, top - rect.mTop);
|
|
LLFloaterNotRunQueue* new_queue = new LLFloaterNotRunQueue("queue", rect);
|
|
new_queue->open(); /*Flawfinder: ignore*/
|
|
return new_queue;
|
|
}
|
|
|
|
LLFloaterNotRunQueue::LLFloaterNotRunQueue(const std::string& name, const LLRect& rect)
|
|
: LLFloaterScriptQueue(name, rect, LLTrans::getString("NotRunQueueTitle"), LLTrans::getString("NotRunQueueStart"))
|
|
{ }
|
|
|
|
LLFloaterNotRunQueue::~LLFloaterNotRunQueue()
|
|
{
|
|
}
|
|
|
|
void LLFloaterCompileQueue::removeItemByItemID(const LLUUID& asset_id)
|
|
{
|
|
LL_INFOS() << "LLFloaterCompileQueue::removeItemByAssetID()" << LL_ENDL;
|
|
for(size_t i = 0; i < mCurrentScripts.size(); )
|
|
{
|
|
if(asset_id == mCurrentScripts[i]->getUUID())
|
|
{
|
|
vector_replace_with_last(mCurrentScripts, mCurrentScripts.begin() + i);
|
|
}
|
|
else
|
|
{
|
|
++i;
|
|
}
|
|
}
|
|
if(mCurrentScripts.empty())
|
|
{
|
|
nextObject();
|
|
}
|
|
}
|
|
|
|
BOOL LLFloaterCompileQueue::startQueue()
|
|
{
|
|
LLViewerRegion* region = gAgent.getRegion();
|
|
if (region)
|
|
{
|
|
std::string lookup_url = region->getCapability("GetCreatorExperiences");
|
|
if (!lookup_url.empty())
|
|
{
|
|
LLHTTPClient::get(lookup_url, new CompileQueueExperienceResponder(mID));
|
|
return TRUE;
|
|
}
|
|
}
|
|
return nextObject();
|
|
}
|
|
|
|
|
|
|
|
void LLFloaterNotRunQueue::handleInventory(LLViewerObject* viewer_obj,
|
|
LLInventoryObject::object_list_t* inv)
|
|
{
|
|
// find all of the lsl, leaving off duplicates. We'll remove
|
|
// all matching asset uuids on compilation success.
|
|
LLInventoryObject::object_list_t::const_iterator it = inv->begin();
|
|
LLInventoryObject::object_list_t::const_iterator end = inv->end();
|
|
for ( ; it != end; ++it)
|
|
{
|
|
if ((*it)->getType() == LLAssetType::AT_LSL_TEXT)
|
|
{
|
|
LLViewerObject* object = gObjectList.findObject(viewer_obj->getID());
|
|
|
|
if (object)
|
|
{
|
|
LLInventoryItem* item = (LLInventoryItem*)((LLInventoryObject*)(*it));
|
|
LLScrollListCtrl* list = getChild<LLScrollListCtrl>("queue output");
|
|
std::string buffer;
|
|
buffer = getString("NotRunning") + LLTrans::getString(":") + ' ' + item->getName();
|
|
list->addSimpleElement(buffer, ADD_BOTTOM);
|
|
|
|
LLMessageSystem* msg = gMessageSystem;
|
|
msg->newMessageFast(_PREHASH_SetScriptRunning);
|
|
msg->nextBlockFast(_PREHASH_AgentData);
|
|
msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
|
|
msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
|
|
msg->nextBlockFast(_PREHASH_Script);
|
|
msg->addUUIDFast(_PREHASH_ObjectID, viewer_obj->getID());
|
|
msg->addUUIDFast(_PREHASH_ItemID, (*it)->getUUID());
|
|
msg->addBOOLFast(_PREHASH_Running, FALSE);
|
|
msg->sendReliable(object->getRegion()->getHost());
|
|
}
|
|
}
|
|
}
|
|
|
|
nextObject();
|
|
}
|
|
|
|
///----------------------------------------------------------------------------
|
|
/// Local function definitions
|
|
///----------------------------------------------------------------------------
|