diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2023-03-31 11:39:06 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2023-03-31 11:39:06 -0400 |
| commit | 1be9d68468e51be7de5b632f0276dc6708e75dc6 (patch) | |
| tree | ba80104fa9531a51291d2ad067b23fa75cb58fc9 /indra/newview/llnetmap.h | |
| parent | 0dd7b362a6e77d8f3dff450376ddf2d4ffaf752c (diff) | |
| parent | c7053a6928fd5eafdc935453742e92951ae4e0c1 (diff) | |
DRTVWR-573: Merge branch 'main' into fix-monterey
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; }; |