diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2007-02-05 20:20:42 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2007-02-05 20:20:42 +0000 |
| commit | d1582a5105f01181535fb859c530e45c2efca071 (patch) | |
| tree | f8c6939e2c67d64d7be0e2488af296b42f13800d /indra/newview/llnetmap.cpp | |
| parent | 57be416ab7c9d93196231fb55de8ba563f3b29eb (diff) | |
merge -r 57111:57464 maintenance.
Diffstat (limited to 'indra/newview/llnetmap.cpp')
| -rw-r--r-- | indra/newview/llnetmap.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llnetmap.cpp b/indra/newview/llnetmap.cpp index 26f4a2fb5b..b03996d460 100644 --- a/indra/newview/llnetmap.cpp +++ b/indra/newview/llnetmap.cpp @@ -772,7 +772,7 @@ BOOL LLNetMap::handleRightMouseDown(S32 x, S32 y, MASK mask) if (menu) { menu->buildDrawLabels(); - menu->updateParent(gMenuHolder); + menu->updateParent(LLMenuGL::sMenuContainer); LLMenuGL::showPopup(this, menu, x, y); } return TRUE; |