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

Merging broke compile. Fixing and removing a few no-longer-needed global constants.

Browse Source
This commit is contained in:
Shyotl
2011-06-08 17:06:28 -05:00
parent b691e2b286
commit ec9da17ed0
2 changed files with 17 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
indra/newview/llagent.h
View File

@@ -45,14 +45,11 @@
#include "llvoavatardefines.h"
#include "llviewerinventory.h"
#include "llinventorymodel.h"
#include "v3dmath.h"
// Ventrella
#include "llfollowcam.h"
// end Ventrella
const BOOL ANIMATE = TRUE;
const U8 AGENT_STATE_TYPING = 0x04; // Typing indication
const U8 AGENT_STATE_EDITING = 0x10; // Set when agent has objects selected
extern const BOOL ANIMATE;
extern const U8 AGENT_STATE_TYPING; // Typing indication
extern const U8 AGENT_STATE_EDITING; // Set when agent has objects selected
class LLChat;
class LLVOAvatar;
@@ -693,7 +690,7 @@ public:
const LLColor4 &getEffectColor();
void setEffectColor(const LLColor4 &color);
private:
LLColor4 mEffectColor;
LLColor4 *mEffectColor;
/** Rendering
** **