summaryrefslogtreecommitdiff
path: root/indra/newview/llnetmap.h
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2010-11-08 12:57:26 -0500
committerLoren Shih <seraph@lindenlab.com>2010-11-08 12:57:26 -0500
commita5e63b1dc0ce6c706de46dfea10784838e2d0257 (patch)
tree15c7d26720fe56bfc6adf796b20af4e3a5e94110 /indra/newview/llnetmap.h
parentb3ab10923d74e64e543b15d773639a856f9989e7 (diff)
parent124a59263184391b0b4ec418c532b7a715e9b5a3 (diff)
Merge
Diffstat (limited to 'indra/newview/llnetmap.h')
-rw-r--r--indra/newview/llnetmap.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llnetmap.h b/indra/newview/llnetmap.h
index 650bce0da4..e053b1c177 100644
--- a/indra/newview/llnetmap.h
+++ b/indra/newview/llnetmap.h
@@ -38,6 +38,7 @@ class LLColor4U;
class LLCoordGL;
class LLImageRaw;
class LLViewerTexture;
+class LLFloaterMap;
class LLNetMap : public LLUICtrl
{
@@ -55,6 +56,7 @@ public:
protected:
LLNetMap (const Params & p);
friend class LLUICtrlFactory;
+ friend class LLFloaterMap;
public:
virtual ~LLNetMap();