Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
commit
24cc581014
|
|
@ -362,7 +362,7 @@ BOOL LLFloaterLinkReplace::tick()
|
|||
|
||||
LLInventoryModel::item_array_t current_batch;
|
||||
|
||||
for (U32 i = 0; i < mBatchSize, mActiveItems <= 250; ++i, ++mActiveItems)
|
||||
for (U32 i = 0; i < mBatchSize && mActiveItems <= 250; ++i, ++mActiveItems)
|
||||
{
|
||||
if (!mRemainingInventoryItems.size())
|
||||
{
|
||||
|
|
|
|||
Loading…
Reference in New Issue