diff options
| author | Merov Linden <merov@lindenlab.com> | 2010-11-04 18:10:29 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2010-11-04 18:10:29 -0700 |
| commit | 4bbe823302427a705ea541d968f6058571a13c2f (patch) | |
| tree | d932a7a3483b674a7600b0e4bff3d0bda3344b35 /indra/newview/llnetmap.h | |
| parent | ba3307b8d0f2ceb40454174a6593f3f98ce98b65 (diff) | |
| parent | f7af29ab40c2405504969a453eba3919be1af5c5 (diff) | |
merge with STORM-105
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(); |