diff options
| author | Callum Prentice <callum@lindenlab.com> | 2023-07-18 10:51:51 -0700 |
|---|---|---|
| committer | Callum Prentice <callum@lindenlab.com> | 2023-07-18 10:51:51 -0700 |
| commit | c5d7f3c4c1cf37ca0e68bbe9830bd3f3931476e5 (patch) | |
| tree | c2af269fd56c04bb9ddca3d99a0cd68ab9d6c94e /indra/newview/llviewermenu.cpp | |
| parent | 1fe007abef6eeceefb0dc720b4a5ecb4505ede88 (diff) | |
| parent | ec4135da63a3f3877222fba4ecb59b15650371fe (diff) | |
DRTVWR-489: trivial merge conflict fix
Diffstat (limited to 'indra/newview/llviewermenu.cpp')
| -rw-r--r-- | indra/newview/llviewermenu.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index c8c58f86bd..94ea130d42 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -276,10 +276,6 @@ void handle_object_owner_permissive(void*); void handle_object_lock(void*); void handle_object_asset_ids(void*); void force_take_copy(void*); -#ifdef _CORY_TESTING -void force_export_copy(void*); -void force_import_geometry(void*); -#endif void handle_force_parcel_owner_to_me(void*); void handle_force_parcel_to_content(void*); |