From 330b78817dd5cb3a063ad02fd70185966d30dfe2 Mon Sep 17 00:00:00 2001
From: Kitty Barnett <develop@catznip.com>
Date: Sun, 22 May 2011 16:23:59 +0200
Subject: [PATCH] - internal : header dependency cleanup for common RLVa cpp
 files

--HG--
branch : RLVa
---
 indra/newview/rlvcommon.cpp  | 1 -
 indra/newview/rlvcommon.h    | 1 +
 indra/newview/rlvhandler.cpp | 3 +--
 indra/newview/rlvhelper.cpp  | 2 +-
 indra/newview/rlvhelper.h    | 1 +
 indra/newview/rlvlocks.cpp   | 3 ++-
 indra/newview/rlvlocks.h     | 9 ++-------
 7 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/indra/newview/rlvcommon.cpp b/indra/newview/rlvcommon.cpp
index bd906f40f3..ae2f4e512f 100644
--- a/indra/newview/rlvcommon.cpp
+++ b/indra/newview/rlvcommon.cpp
@@ -17,7 +17,6 @@
 #include "llviewerprecompiledheaders.h"
 #include "llagent.h"
 #include "llagentui.h"
-#include "llappviewer.h"
 #include "llavatarnamecache.h"
 #include "llinstantmessage.h"
 #include "llnotificationsutil.h"
diff --git a/indra/newview/rlvcommon.h b/indra/newview/rlvcommon.h
index ac84264ec0..1b762971c4 100644
--- a/indra/newview/rlvcommon.h
+++ b/indra/newview/rlvcommon.h
@@ -43,6 +43,7 @@ class LLInventoryItem;
 class LLViewerInventoryCategory;
 class LLViewerInventoryItem;
 class LLViewerJointAttachment;
+class LLWearable;
 
 //
 // RLVa-specific
diff --git a/indra/newview/rlvhandler.cpp b/indra/newview/rlvhandler.cpp
index 2d927d00e9..b9eb3df141 100644
--- a/indra/newview/rlvhandler.cpp
+++ b/indra/newview/rlvhandler.cpp
@@ -15,10 +15,9 @@
  */
 
 #include "llviewerprecompiledheaders.h"
-#include "llagentwearables.h"
+#include "llagent.h"
 #include "llappearancemgr.h"
 #include "llappviewer.h"
-#include "llcallbacklist.h"
 #include "llgroupactions.h"
 #include "llhudtext.h"
 #include "llstartup.h"
diff --git a/indra/newview/rlvhelper.cpp b/indra/newview/rlvhelper.cpp
index 3b8cb8517e..f03485e76d 100644
--- a/indra/newview/rlvhelper.cpp
+++ b/indra/newview/rlvhelper.cpp
@@ -15,11 +15,11 @@
  */
 
 #include "llviewerprecompiledheaders.h"
+#include "llagent.h"
 #include "llagentwearables.h"
 #include "llappearancemgr.h"
 #include "llattachmentsmgr.h"
 #include "llgesturemgr.h"
-#include "llnotifications.h"
 #include "llnotificationsutil.h"
 #include "llviewerobject.h"
 #include "llviewerobjectlist.h"
diff --git a/indra/newview/rlvhelper.h b/indra/newview/rlvhelper.h
index 45cb50cf68..1b07a0c188 100644
--- a/indra/newview/rlvhelper.h
+++ b/indra/newview/rlvhelper.h
@@ -20,6 +20,7 @@
 #include "lleventtimer.h"
 #include "llinventorymodel.h"
 #include "llviewerinventory.h"
+#include "llwearabletype.h"
 #include "llwlparamset.h"
 
 #include "rlvdefines.h"
diff --git a/indra/newview/rlvlocks.cpp b/indra/newview/rlvlocks.cpp
index b2414d438e..f57aed931c 100644
--- a/indra/newview/rlvlocks.cpp
+++ b/indra/newview/rlvlocks.cpp
@@ -15,6 +15,7 @@
  */
 
 #include "llviewerprecompiledheaders.h"
+#include "llagent.h"
 #include "llappearancemgr.h"
 #include "llattachmentsmgr.h"
 #include "llinventoryobserver.h"
@@ -22,9 +23,9 @@
 #include "llviewerobjectlist.h"
 #include "pipeline.h"
 
+#include "rlvlocks.h"
 #include "rlvhelper.h"
 #include "rlvinventory.h"
-#include "rlvlocks.h"
 
 // ============================================================================
 // RlvAttachPtLookup member functions
diff --git a/indra/newview/rlvlocks.h b/indra/newview/rlvlocks.h
index c0a5fed89f..ae8ceb066a 100644
--- a/indra/newview/rlvlocks.h
+++ b/indra/newview/rlvlocks.h
@@ -17,8 +17,10 @@
 #ifndef RLV_LOCKS_H
 #define RLV_LOCKS_H
 
+#include "llagentconstants.h"
 #include "llagentwearables.h"
 #include "lleventtimer.h"
+#include "llvoavatarself.h"
 
 #include "rlvdefines.h"
 #include "rlvcommon.h"
@@ -27,13 +29,6 @@
 // RlvAttachPtLookup class declaration
 //
 
-#include "llagent.h"
-#include "llviewerjointattachment.h"
-#include "llviewerobject.h"
-#include "llvoavatarself.h"
-
-#include "rlvdefines.h"
-
 class RlvAttachPtLookup
 {
 public: