diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-02-02 20:26:35 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-02-02 20:26:35 -0500 |
| commit | 785d771eaf83bbf056cabe05e639fce8b234e0cc (patch) | |
| tree | 89105472d7ed67ef78b236f05bab878ad8f8182e | |
| parent | 85cc9f121d0b8cb5c10a9ed505a9f67bb9b87862 (diff) | |
| parent | 5285e5479cb9f8d3b1c00fbafc4b01b21c613df2 (diff) | |
automated merge viewer2.0->viewer2.0
| -rw-r--r-- | indra/newview/lldrawable.h | 1 | ||||
| -rw-r--r-- | indra/newview/lltoolplacer.h | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/indra/newview/lldrawable.h b/indra/newview/lldrawable.h index 5a10b688da..651dabff9e 100644 --- a/indra/newview/lldrawable.h +++ b/indra/newview/lldrawable.h @@ -44,7 +44,6 @@ #include "llquaternion.h" #include "xform.h" #include "llmemtype.h" -#include "llprimitive.h" #include "lldarray.h" #include "llviewerobject.h" #include "llrect.h" diff --git a/indra/newview/lltoolplacer.h b/indra/newview/lltoolplacer.h index b7422380d4..df07f1854c 100644 --- a/indra/newview/lltoolplacer.h +++ b/indra/newview/lltoolplacer.h @@ -33,7 +33,6 @@ #ifndef LL_TOOLPLACER_H #define LL_TOOLPLACER_H -#include "llprimitive.h" #include "llpanel.h" #include "lltool.h" |