diff options
author | Merov Linden <merov@lindenlab.com> | 2010-11-02 17:27:39 -0700 |
---|---|---|
committer | Merov Linden <merov@lindenlab.com> | 2010-11-02 17:27:39 -0700 |
commit | e9640296d32beb529b4af16d34c06808edde4916 (patch) | |
tree | eeeb1f4d0085feb5da3d497165ec72a2fc922e6e /indra/newview/llnetmap.h | |
parent | 37b97d2f6dbb1b9031202aba982a116e0f8fa2bf (diff) | |
parent | 87e2b01fbbab1927a83d305edfc454ac05050742 (diff) |
STORM-420 : merge to viewer-development
Diffstat (limited to 'indra/newview/llnetmap.h')
-rw-r--r-- | indra/newview/llnetmap.h | 2 |
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(); |