diff options
| author | Brad Kittenbrink <brad@lindenlab.com> | 2008-02-27 18:58:14 +0000 |
|---|---|---|
| committer | Brad Kittenbrink <brad@lindenlab.com> | 2008-02-27 18:58:14 +0000 |
| commit | 6d52efe452aa8469e0343da1c7d108f3f52ab651 (patch) | |
| tree | a87be48e9840d7fc1f7ee514d7c7f994e71fdb3c /indra/newview/llhudobject.cpp | |
| parent | 6027ad2630b8650cabcf00628ee9b0d25bedd67f (diff) | |
Merge of windlight into release (QAR-286). This includes all changes in
windlight14 which have passed QA (up through r79932).
svn merge -r 80831:80833 svn+ssh://svn.lindenlab.com/svn/linden/branches/merge_windlight14_r80620
Diffstat (limited to 'indra/newview/llhudobject.cpp')
| -rw-r--r-- | indra/newview/llhudobject.cpp | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/indra/newview/llhudobject.cpp b/indra/newview/llhudobject.cpp index 6271f0f377..d6bafa9b58 100644 --- a/indra/newview/llhudobject.cpp +++ b/indra/newview/llhudobject.cpp @@ -39,17 +39,11 @@ #include "llhudtext.h" #include "llhudicon.h" -#include "llhudconnector.h" #include "llhudeffectbeam.h" #include "llhudeffecttrail.h" #include "llhudeffectlookat.h" -//Ventrella #include "llvoicevisualizer.h" -#include "llanimalcontrols.h" -#include "lllocalanimationobject.h" -#include "llcape.h" -// End Ventrella #include "llagent.h" @@ -155,9 +149,6 @@ LLHUDObject *LLHUDObject::addHUDObject(const U8 type) case LL_HUD_ICON: hud_objectp = new LLHUDIcon(type); break; - case LL_HUD_CONNECTOR: - hud_objectp = new LLHUDConnector(type); - break; default: llwarns << "Unknown type of hud object:" << (U32) type << llendl; } |