Removed LLDynamicArray, LLDynamicArrayIndexed, LLDynamicArrayPtr, LLDLinked, LLDynamicQueuePtr, LLEnum, and LLIndexedQueue. Added new LLPointer variants.
This commit is contained in:
@@ -183,7 +183,7 @@ void LLFloaterScriptQueue::onCloseBtn(void* user_data)
|
||||
|
||||
void LLFloaterScriptQueue::addObject(const LLUUID& id)
|
||||
{
|
||||
mObjectIDs.put(id);
|
||||
mObjectIDs.push_back(id);
|
||||
}
|
||||
|
||||
BOOL LLFloaterScriptQueue::start()
|
||||
@@ -193,7 +193,7 @@ BOOL LLFloaterScriptQueue::start()
|
||||
|
||||
LLStringUtil::format_map_t args;
|
||||
args["[START]"] = mStartString;
|
||||
args["[COUNT]"] = llformat ("%d", mObjectIDs.count());
|
||||
args["[COUNT]"] = llformat ("%d", mObjectIDs.size());
|
||||
buffer = getString ("Starting", args);
|
||||
|
||||
getChild<LLScrollListCtrl>("queue output")->addSimpleElement(buffer, ADD_BOTTOM);
|
||||
@@ -648,7 +648,7 @@ void LLFloaterResetQueue::handleInventory(LLViewerObject* viewer_obj,
|
||||
{
|
||||
// find all of the lsl, leaving off duplicates. We'll remove
|
||||
// all matching asset uuids on compilation success.
|
||||
LLDynamicArray<const char*> names;
|
||||
std::vector<const char*> names;
|
||||
|
||||
LLInventoryObject::object_list_t::const_iterator it = inv->begin();
|
||||
LLInventoryObject::object_list_t::const_iterator end = inv->end();
|
||||
@@ -709,7 +709,7 @@ void LLFloaterRunQueue::handleInventory(LLViewerObject* viewer_obj,
|
||||
{
|
||||
// find all of the lsl, leaving off duplicates. We'll remove
|
||||
// all matching asset uuids on compilation success.
|
||||
LLDynamicArray<const char*> names;
|
||||
std::vector<const char*> names;
|
||||
|
||||
LLInventoryObject::object_list_t::const_iterator it = inv->begin();
|
||||
LLInventoryObject::object_list_t::const_iterator end = inv->end();
|
||||
@@ -793,7 +793,7 @@ void LLFloaterNotRunQueue::handleInventory(LLViewerObject* viewer_obj,
|
||||
{
|
||||
// find all of the lsl, leaving off duplicates. We'll remove
|
||||
// all matching asset uuids on compilation success.
|
||||
LLDynamicArray<const char*> names;
|
||||
std::vector<const char*> names;
|
||||
|
||||
LLInventoryObject::object_list_t::const_iterator it = inv->begin();
|
||||
LLInventoryObject::object_list_t::const_iterator end = inv->end();
|
||||
|
||||
Reference in New Issue
Block a user