aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/llui/lliconctrl.h
diff options
context:
space:
mode:
authorJacek Antonelli2008-08-15 23:45:34 -0500
committerJacek Antonelli2008-08-15 23:45:34 -0500
commitcd17687f01420952712a500107e0f93e7ab8d5f8 (patch)
treece48c2b706f2c1176290e39fb555fbdf6648ce01 /linden/indra/llui/lliconctrl.h
parentSecond Life viewer sources 1.19.0.5 (diff)
downloadmeta-impy-cd17687f01420952712a500107e0f93e7ab8d5f8.zip
meta-impy-cd17687f01420952712a500107e0f93e7ab8d5f8.tar.gz
meta-impy-cd17687f01420952712a500107e0f93e7ab8d5f8.tar.bz2
meta-impy-cd17687f01420952712a500107e0f93e7ab8d5f8.tar.xz
Second Life viewer sources 1.19.1.0
Diffstat (limited to 'linden/indra/llui/lliconctrl.h')
-rw-r--r--linden/indra/llui/lliconctrl.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/linden/indra/llui/lliconctrl.h b/linden/indra/llui/lliconctrl.h
index f767b3c..b0c191f 100644
--- a/linden/indra/llui/lliconctrl.h
+++ b/linden/indra/llui/lliconctrl.h
@@ -69,7 +69,7 @@ public:
69 virtual LLXMLNodePtr getXML(bool save_children = true) const; 69 virtual LLXMLNodePtr getXML(bool save_children = true) const;
70 static LLView* fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory); 70 static LLView* fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory);
71 71
72protected: 72private:
73 LLColor4 mColor; 73 LLColor4 mColor;
74 LLString mImageName; 74 LLString mImageName;
75 LLUUID mImageID; 75 LLUUID mImageID;