diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2008-02-19 21:42:32 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2008-02-19 21:42:32 +0000 |
| commit | 2e32d44e7165775936beae5d9ef636ff9d3f2bd2 (patch) | |
| tree | 8153bc399994aabf6e1c41c2d8332e4e8c4ddb78 /indra/newview/llnetmap.h | |
| parent | db0f5847ea8b96b3c1ac08e7aeb43d83daacb8e4 (diff) | |
merge svn+ssh://svn.lindenlab.com/svn/linden/qa/combo-merge-ui-2008-02-13 -r 79986 : 80178 -> release.
QAR-290 = QAR-271 + QAR-191
Diffstat (limited to 'indra/newview/llnetmap.h')
| -rw-r--r-- | indra/newview/llnetmap.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llnetmap.h b/indra/newview/llnetmap.h index 40d80646cf..d375413d1d 100644 --- a/indra/newview/llnetmap.h +++ b/indra/newview/llnetmap.h @@ -92,7 +92,7 @@ protected: static void fly( const LLVector3d& destination ); public: - LLViewHandle mPopupMenuHandle; + LLHandle<LLView> mPopupMenuHandle; LLColor4 mBackgroundColor; F32 mScale; // Size of a region in pixels |