diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2023-02-27 20:55:00 +0200 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2023-02-27 20:55:00 +0200 |
| commit | 18e96f5264fcdf56e2c6b2a67e1e63a8506a242f (patch) | |
| tree | 67abe5d534cd0ff6dc8c6ee06c5d6c102619d381 /indra/newview/llnetmap.h | |
| parent | 20be54210f17db8499a234760b0eef91fb962731 (diff) | |
| parent | 8d21d29bd7fa038db632ff90fb0e1207d0713ca2 (diff) | |
Merge branch 'main' into DRTVWR-579-texture-preview
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 fe1aca65a9..75c1abc4ed 100644 --- a/indra/newview/llnetmap.h +++ b/indra/newview/llnetmap.h @@ -162,7 +162,7 @@ private: void setMapOrientation(const LLSD& userdata); void popupShowAboutLand(const LLSD& userdata); - LLMenuGL* mPopupMenu; + LLHandle<LLView> mPopupMenuHandle; uuid_vec_t gmSelected; }; |