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

Removed LLDynamicArray, LLDynamicArrayIndexed, LLDynamicArrayPtr, LLDLinked, LLDynamicQueuePtr, LLEnum, and LLIndexedQueue. Added new LLPointer variants.

Browse Source
This commit is contained in:
Shyotl
2015-06-19 18:27:21 -05:00
parent 1c627317ec
commit 09f4528bfb
122 changed files with 883 additions and 1632 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
indra/newview/llviewermenu.cpp
View File

@@ -4342,7 +4342,7 @@ static bool get_derezzable_objects(
EDeRezDestination dest,
std::string& error,
LLViewerRegion*& first_region,
LLDynamicArray<LLViewerObjectPtr>* derez_objectsp,
std::vector<LLViewerObjectPtr>* derez_objectsp,
bool only_check = false)
{
bool found = false;
@@ -4427,7 +4427,7 @@ static bool get_derezzable_objects(
break;
if (derez_objectsp)
derez_objectsp->put(object);
derez_objectsp->push_back(object);
}
}
@@ -4447,9 +4447,9 @@ static void derez_objects(
const LLUUID& dest_id,
LLViewerRegion*& first_region,
std::string& error,
LLDynamicArray<LLViewerObjectPtr>* objectsp)
std::vector<LLViewerObjectPtr>* objectsp)
{
LLDynamicArray<LLViewerObjectPtr> derez_objects;
std::vector<LLViewerObjectPtr> derez_objects;
if (!objectsp) // if objects to derez not specified
{
@@ -4476,13 +4476,13 @@ static void derez_objects(
// satisfy anybody.
const S32 MAX_ROOTS_PER_PACKET = 250;
const S32 MAX_PACKET_COUNT = 254;
F32 packets = ceil((F32)objectsp->count() / (F32)MAX_ROOTS_PER_PACKET);
F32 packets = ceil((F32)objectsp->size() / (F32)MAX_ROOTS_PER_PACKET);
if(packets > (F32)MAX_PACKET_COUNT)
{
error = "AcquireErrorTooManyObjects";
}
if(error.empty() && objectsp->count() > 0)
if(error.empty() && objectsp->size() > 0)
{
U8 d = (U8)dest;
LLUUID tid;
@@ -4507,11 +4507,11 @@ static void derez_objects(
msg->addU8Fast(_PREHASH_PacketCount, packet_count);
msg->addU8Fast(_PREHASH_PacketNumber, packet_number);
objects_in_packet = 0;
while((object_index < objectsp->count())
while((object_index < objectsp->size())
&& (objects_in_packet++ < MAX_ROOTS_PER_PACKET))
{
LLViewerObject* object = objectsp->get(object_index++);
LLViewerObject* object = objectsp->at(object_index++);
msg->nextBlockFast(_PREHASH_ObjectData);
msg->addU32Fast(_PREHASH_ObjectLocalID, object->getLocalID());
// <edit>
@@ -4621,7 +4621,7 @@ private:
LLObjectSelectionHandle mObjectSelection;
LLDynamicArray<LLViewerObjectPtr> mReturnableObjects;
std::vector<LLViewerObjectPtr> mReturnableObjects;
std::string mError;
LLViewerRegion* mFirstRegion;
};
@@ -5522,7 +5522,7 @@ public:
};
LLObjectSelectionHandle mObjectSelection;
LLDynamicArray<LLViewerObjectPtr> mReturnableObjects;
std::vector<LLViewerObjectPtr> mReturnableObjects;
std::string mError;
LLViewerRegion *mFirstRegion;
};