RLVa 1.1.2 to 1.1.3 upgrade. InvLinks + COF

This commit is contained in:
Siana Gearz
2010-11-25 23:47:11 +01:00
parent 074bec3ad1
commit f9dcb1bb09
88 changed files with 8710 additions and 4707 deletions

View File

@@ -170,11 +170,15 @@ void ScriptCounter::serializeSelection(bool delScript)
LLViewerJointAttachment* attachment = iter->second;
if (!attachment->getValid())
continue ;
LLViewerObject* object = attachment->getObject();
if(object)
for (LLViewerJointAttachment::attachedobjs_vec_t::const_iterator itObj = attachment->mAttachedObjects.begin();
itObj != attachment->mAttachedObjects.end(); ++itObj)
{
objectArray.put(object);
objectCount++;
LLViewerObject* object = *itObj;
if(object)
{
objectArray.put(object);
objectCount++;
}
}
}
}
@@ -400,4 +404,4 @@ void ScriptCounter::inventoryChanged(LLViewerObject* obj,
obj->removeInventoryListener(sInstance);
completechk();
}
}
}