svn merge svn+ssh://svn.lindenlab.com/svn/linden/release@56631 svn+ssh://svn.lindenlab.com/svn/linden/branches/abstract-kdu@56647 --ignore-ancestry

8 files changed, 12 insertions, 0 deletions

diff --git a/indra/llui/llbutton.h b/indra/llui/llbutton.h
index 0a4e41b017..1982c2e36f 100644
--- a/indra/llui/llbutton.h
+++ b/indra/llui/llbutton.h
@@ -33,6 +33,9 @@ extern S32	BTN_HEIGHT;
 // All button widths should be rounded up to this size
 extern S32	BTN_GRID;
 
+
+class LLUICtrlFactory;
+
 //
 // Classes
 //
diff --git a/indra/llui/lliconctrl.h b/indra/llui/lliconctrl.h
index ea762982a2..21796396fa 100644
--- a/indra/llui/lliconctrl.h
+++ b/indra/llui/lliconctrl.h
@@ -16,6 +16,7 @@
 #include "llimagegl.h"
 
 class LLTextBox;
+class LLUICtrlFactory;
 
 //
 // Classes
diff --git a/indra/llui/llscrollcontainer.h b/indra/llui/llscrollcontainer.h
index 5f23be4628..b63e3ffc07 100644
--- a/indra/llui/llscrollcontainer.h
+++ b/indra/llui/llscrollcontainer.h
@@ -29,6 +29,7 @@
 
 class LLScrollbar;
 class LLViewBorder;
+class LLUICtrlFactory;
 
 
 class LLScrollableContainerView : public LLUICtrl
diff --git a/indra/llui/llslider.h b/indra/llui/llslider.h
index a437cf2886..d88da42064 100644
--- a/indra/llui/llslider.h
+++ b/indra/llui/llslider.h
@@ -12,6 +12,8 @@
 #include "lluictrl.h"
 #include "v4color.h"
 
+class LLUICtrlFactory;
+
 class LLSlider : public LLUICtrl
 {
 public:
diff --git a/indra/llui/llspinctrl.h b/indra/llui/llspinctrl.h
index d6ccd4d6bf..4fe1a26f5d 100644
--- a/indra/llui/llspinctrl.h
+++ b/indra/llui/llspinctrl.h
@@ -31,6 +31,7 @@ class LLFontGL;
 class LLButton;
 class LLTextBox;
 class LLLineEditor;
+class LLUICtrlFactory;
 
 
 class LLSpinCtrl
diff --git a/indra/llui/lltextbox.h b/indra/llui/lltextbox.h
index 0c09ae26b4..56c00eb8b3 100644
--- a/indra/llui/lltextbox.h
+++ b/indra/llui/lltextbox.h
@@ -15,6 +15,8 @@
 #include "llfontgl.h"
 #include "lluistring.h"
 
+class LLUICtrlFactory;
+
 
 class LLTextBox
 :	public LLUICtrl
diff --git a/indra/llui/lltexteditor.h b/indra/llui/lltexteditor.h
index bebf2b31f2..ce85e35fe3 100644
--- a/indra/llui/lltexteditor.h
+++ b/indra/llui/lltexteditor.h
@@ -25,6 +25,7 @@ class LLScrollbar;
 class LLViewBorder;
 class LLKeywordToken;
 class LLTextCmd;
+class LLUICtrlFactory;
 
 //
 // Constants
diff --git a/indra/llui/llviewborder.h b/indra/llui/llviewborder.h
index 984eee6e60..946c6b9f74 100644
--- a/indra/llui/llviewborder.h
+++ b/indra/llui/llviewborder.h
@@ -18,6 +18,7 @@
 #include "llxmlnode.h"
 
 class LLUUID;
+class LLUICtrlFactory;
 
 
 class LLViewBorder : public LLView