diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2023-06-01 09:57:57 -0400 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2023-06-01 09:57:57 -0400 |
commit | d844da2a6c5fc1a75e606150bb070fdb787698d3 (patch) | |
tree | 349ecda36a5a561d6e564e2cc3db39121fd8946b /indra/newview/lllandmarklist.h | |
parent | 8a74efa38ba631be5400c4912a6339310968c9d7 (diff) | |
parent | 7d05ade3f10563e8c202106e00cb3d273ab13338 (diff) |
SL-18330: Merge branch 'xcode-14.3' into fix-monterey
to pick up new merge from main.
Diffstat (limited to 'indra/newview/lllandmarklist.h')
-rw-r--r-- | indra/newview/lllandmarklist.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/lllandmarklist.h b/indra/newview/lllandmarklist.h index f5fa958204..b50332b215 100644 --- a/indra/newview/lllandmarklist.h +++ b/indra/newview/lllandmarklist.h @@ -72,7 +72,6 @@ protected: typedef std::set<LLUUID> landmark_uuid_list_t; landmark_uuid_list_t mBadList; - landmark_uuid_list_t mWaitList; typedef std::map<LLUUID,F32> landmark_requested_list_t; landmark_requested_list_t mRequestedList; |