summaryrefslogtreecommitdiff
path: root/indra/newview/llhudobject.cpp
diff options
context:
space:
mode:
authorKartic Krishnamurthy <drunkensufi@lindenlab.com>2007-08-08 00:55:57 +0000
committerKartic Krishnamurthy <drunkensufi@lindenlab.com>2007-08-08 00:55:57 +0000
commit52cb2aea8667056671b67a3c70eeefd00a061751 (patch)
treef68af9fa643127dd4c026ec5c95b41241dd279f3 /indra/newview/llhudobject.cpp
parent057a5646c14d3a61a5743e7a0cb3d6276634619e (diff)
svn merge -r67131:67483 svn+ssh://svn/svn/linden/branches/Branch_1-18-1
Diffstat (limited to 'indra/newview/llhudobject.cpp')
-rw-r--r--indra/newview/llhudobject.cpp18
1 files changed, 17 insertions, 1 deletions
diff --git a/indra/newview/llhudobject.cpp b/indra/newview/llhudobject.cpp
index 0bcbbbb140..b6a6f14fc9 100644
--- a/indra/newview/llhudobject.cpp
+++ b/indra/newview/llhudobject.cpp
@@ -135,6 +135,22 @@ LLHUDObject *LLHUDObject::addHUDObject(const U8 type)
case LL_HUD_CONNECTOR:
hud_objectp = new LLHUDConnector(type);
break;
+ default:
+ llwarns << "Unknown type of hud object:" << (U32) type << llendl;
+ }
+ if (hud_objectp)
+ {
+ sHUDObjects.push_back(hud_objectp);
+ }
+ return hud_objectp;
+}
+
+LLHUDEffect *LLHUDObject::addHUDEffect(const U8 type)
+{
+ LLHUDEffect *hud_objectp = NULL;
+
+ switch (type)
+ {
case LL_HUD_EFFECT_BEAM:
hud_objectp = new LLHUDEffectSpiral(type);
((LLHUDEffectSpiral *)hud_objectp)->setDuration(0.7f);
@@ -213,7 +229,7 @@ LLHUDObject *LLHUDObject::addHUDObject(const U8 type)
hud_objectp = new LLHUDEffectPointAt(type);
break;
default:
- llwarns << "Unknown type of hud object:" << (U32) type << llendl;
+ llwarns << "Unknown type of hud effect:" << (U32) type << llendl;
}
if (hud_objectp)