Merge branch 'master' of git://github.com/siana/SingularityViewer.git

Conflicts:
	indra/llrender/llglstates.h
This commit is contained in:
Shyotl
2011-03-25 17:54:52 -05:00
25 changed files with 1298 additions and 152 deletions

View File

@@ -181,6 +181,7 @@ LLViewerObject::LLViewerObject(const LLUUID &id, const LLPCode pcode, LLViewerRe
mCreateSelected(FALSE),
mRenderMedia(FALSE),
mBestUpdatePrecision(0),
mIsNameAttachment(false),
mText(),
mLastInterpUpdateSecs(0.f),
mLastMessageUpdateSecs(0.f),