diff options
| author | Tofu Buzzard <no-email> | 2010-11-09 10:05:17 +0000 |
|---|---|---|
| committer | Tofu Buzzard <no-email> | 2010-11-09 10:05:17 +0000 |
| commit | caa53cc8cdd69bd48bd6c07fa6c98234e81f8a42 (patch) | |
| tree | 682c2571bad71cf52e5157f4703163ca2ce21f57 /indra/newview/llnetmap.h | |
| parent | 179e9e37ecbdcd1ad2133733047707ddd42e8c30 (diff) | |
| parent | b657516f72f016a918e0ff627105dd380a94394c (diff) | |
merge up from v-d
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(); |
