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

Revert "THE BIGGIE."

Browse Source 
This reverts commit ec55705bdd.

Conflicts:

	indra/newview/ascentprefsvan.cpp
	indra/newview/llinventorybridge.cpp
	indra/newview/skins/default/xui/en-us/panel_preferences_ascent_vanity.xml
This commit is contained in:
Siana Gearz
2010-10-18 18:27:09 +02:00
parent 49cb86adae
commit 5a67fcd623
48 changed files with 7185 additions and 8544 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
indra/newview/scriptcounter.cpp
View File

@@ -170,16 +170,11 @@ void ScriptCounter::serializeSelection(bool delScript)
LLViewerJointAttachment* attachment = iter->second;
if (!attachment->getValid())
continue ;
for (LLViewerJointAttachment::attachedobjs_vec_t::iterator attachment_iter = attachment->mAttachedObjects.begin();
attachment_iter != attachment->mAttachedObjects.end();
++attachment_iter)
LLViewerObject* object = attachment->getObject();
if(object)
{
LLViewerObject *attached_object = (*attachment_iter);
if (attached_object)
{
objectArray.put(attached_object);
objectCount++;
}
objectArray.put(object);
objectCount++;
}
}
}