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

6
indra/newview/llvoavatar.h
View File

@@ -155,7 +155,6 @@ public:
void updateAttachmentVisibility(U32 camera_mode);
void clampAttachmentPositions();
S32 getAttachmentCount(); // Warning: order(N) not order(1)
BOOL canAttachMoreObjects() const;
// HUD functions
BOOL hasHUDAttachment() const;
@@ -293,7 +292,7 @@ public:
void hideSkirt();
virtual BOOL setParent(LLViewerObject* parent);
virtual void setParent(LLViewerObject* parent);
virtual void addChild(LLViewerObject *childp);
virtual void removeChild(LLViewerObject *childp);
@@ -589,8 +588,7 @@ public:
// <edit>
std::map<S32, LLUUID> mUnsupportedAttachmentPoints;
// </edit>
protected:
U32 getNumAttachments() const; // O(N), not O(1) <---- Fix if possible, I guess it's not worst case scenario - HgB
//--------------------------------------------------------------------
// static preferences that are controlled by user settings/menus
//--------------------------------------------------------------------