diff options
| author | Merov Linden <merov@lindenlab.com> | 2010-11-04 14:30:32 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2010-11-04 14:30:32 -0700 |
| commit | f7af29ab40c2405504969a453eba3919be1af5c5 (patch) | |
| tree | f31f6d31582e8ff89c769334cb70e1076c887ef7 /indra/newview/llnetmap.h | |
| parent | c2500f808cd8e1957054d5ec1b3555e30698c2b3 (diff) | |
| parent | 889aff8d87a4dbf3ca43c43bdeed825f67fd5e60 (diff) | |
merge with 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(); |