diff options
author | brad kittenbrink <brad@lindenlab.com> | 2010-11-02 19:02:49 -0700 |
---|---|---|
committer | brad kittenbrink <brad@lindenlab.com> | 2010-11-02 19:02:49 -0700 |
commit | 6a9e70053beaa0fb936482f5594137a8bcdf2f1e (patch) | |
tree | 9f6a44825ed0886807c4b38d9a92188261bbaf25 /indra/newview/llnetmap.h | |
parent | 4902a2752e6ee5dfd47be3d94955f88bf73bf5d8 (diff) | |
parent | accbddaeadeec7221c9244bf1c0245b8ccbd12bc (diff) |
Merge
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(); |