diff options
| author | brad kittenbrink <brad@lindenlab.com> | 2010-11-05 16:45:18 -0700 |
|---|---|---|
| committer | brad kittenbrink <brad@lindenlab.com> | 2010-11-05 16:45:18 -0700 |
| commit | d1c365e7b79c91a51b847535d8df0d804af5ae70 (patch) | |
| tree | 786ada896c585004d9e94c2171f13fd808009441 /indra/newview/llnetmap.h | |
| parent | 169fe36f69e3be6104af980ed005af5b77909e90 (diff) | |
| parent | 124a59263184391b0b4ec418c532b7a715e9b5a3 (diff) | |
Merge latest lindenlab/viewer-development with mani_linden/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(); |