diff --git a/res/models/MeshLabel Object.dae b/res/models/MeshLabel Object.dae new file mode 100644 index 000000000..9a95080d5 --- /dev/null +++ b/res/models/MeshLabel Object.dae @@ -0,0 +1,246 @@ + + + + + Blender User + Blender 3.0.0 commit date:2021-12-02, commit time:18:35, hash:f1cca3055776 + + 2022-11-12T20:28:51 + 2022-11-12T20:28:51 + + Z_UP + + + + + + + + 0 0 0 1 + + + 0.8 0.8 0.8 1 + + + 1.45 + + + + + + + + + + + 0 0 0 1 + + + 0.8 0.8 0.8 1 + + + 1.45 + + + + + + + + + + + 0 0 0 1 + + + 0.8 0.8 0.8 1 + + + 1.45 + + + + + + + + + + + 0 0 0 1 + + + 0.8 0.8 0.8 1 + + + 1.45 + + + + + + + + + + + 0 0 0 1 + + + 0.8 0.8 0.8 1 + + + 1.45 + + + + + + + + + + + 0 0 0 1 + + + 0.8 0.8 0.8 1 + + + 1.45 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -0.01611298 -0.005507946 0.005462944 -0.01610594 -0.005507946 -0.005448997 -0.01043695 -0.004592955 -0.00544697 -0.01044499 -0.004592955 0.005464971 -0.01044499 -0.004592955 0.005464971 -0.01043695 -0.004592955 -0.00544697 -0.004889965 -0.003112971 -0.005444943 -0.004897952 -0.003112971 0.005464971 -0.004897952 -0.003112971 0.005464971 -0.004889965 -0.003112971 -0.005444943 4.88e-4 -0.001113951 -0.005444943 4.88e-4 -0.00109899 0.005465984 4.88e-4 -0.00109899 0.005465984 4.88e-4 -0.001113951 -0.005444943 0.00564599 0.001433968 -0.00544399 0.00564599 0.001433968 0.005465984 0.00564599 0.001433968 0.005465984 0.00564599 0.001433968 -0.00544399 0.01043695 0.004622995 -0.00544399 0.01042896 0.004622995 0.005467951 0.01042896 0.004622995 0.005467951 0.01488494 0.008254945 -0.00544399 0.01487696 0.008254945 0.005467951 0.01043695 0.004622995 -0.00544399 + + + + + + + + + + 0.1574428 -0.9875281 4.11641e-4 0.1574726 -0.9875233 4.0686e-4 0.1574801 -0.9875221 4.05705e-4 0.1574504 -0.9875268 4.10163e-4 0.2523745 -0.9676296 4.31276e-4 0.2523745 -0.9676295 4.31859e-4 0.2523745 -0.9676296 4.31577e-4 0.2523746 -0.9676296 4.31724e-4 0.3454363 -0.9384421 4.55023e-4 0.3454481 -0.9384378 4.56025e-4 0.3454262 -0.9384459 4.55446e-4 0.3454552 -0.9384352 4.57532e-4 0.4370563 -0.899434 4.75244e-4 0.4370392 -0.8994423 4.72618e-4 0.4370527 -0.8994358 4.74534e-4 0.437032 -0.8994458 4.78257e-4 0.5476634 -0.8366987 4.93118e-4 0.5476703 -0.8366941 4.92858e-4 0.5476623 -0.8366994 4.93466e-4 0.5476608 -0.8367004 4.03743e-4 0.6268182 -0.7791655 5.00393e-4 0.6268181 -0.7791655 5.00379e-4 0.6268181 -0.7791655 4.63641e-4 0.626818 -0.7791656 5.00109e-4 + + + + + + + + + + 0 1 0 0 1 0 0 1 1 0 1 1 0 1 0 0 1 0 0 1 1 0 1 1 0 1 0 0 0.999997 0 0 1 0.999997 0 0.999997 1 0 1 0 0 1 0 0 1 1 0 1 1 0 1 0 0 0.999997 0 0 1 0.999997 0 0.999997 1 0 1 1 0 1 1 0 1 0 0 1 0 + + + + + + + + + + + + + + +

0 0 0 1 1 1 2 2 2 0 0 3 2 2 4 3 3 5

+
+ + + + +

4 4 6 5 5 7 6 6 8 4 4 9 6 6 10 7 7 11

+
+ + + + +

8 8 12 9 9 13 10 10 14 8 8 15 10 10 16 11 11 17

+
+ + + + +

12 12 18 13 13 19 14 14 20 12 12 21 14 14 22 15 15 23

+
+ + + + +

16 16 24 17 17 25 18 18 26 16 16 27 18 18 28 19 19 29

+
+ + + + +

20 20 30 21 21 31 22 22 32 20 20 33 23 23 34 21 21 35

+
+
+
+
+ + + + 0.917578 0.3975556 -6.477e-8 0 0 -1.62921e-7 -1 0 -0.3975556 0.917578 -1.49492e-7 0 0 0 0 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
\ No newline at end of file diff --git a/src/collar/oc_resizer.lsl b/src/collar/oc_resizer.lsl index fd52109b5..bc58cae54 100644 --- a/src/collar/oc_resizer.lsl +++ b/src/collar/oc_resizer.lsl @@ -6,7 +6,9 @@ // Based on a split of OpenCollar - appearance by Romka Swallowtail -// Virtual Disgrace - Resizer is derivative of OpenCollar - adjustment +// Resizer is derivative of OpenCollar - adjustment + +// Ping (Pingout Duffield) Jan 2023 Fix behavior of BACK button in Position, Rotation, and Size menus string g_sScriptVersion = "8.1.0000"; @@ -274,7 +276,7 @@ state active else if (sMessage == SIZEMENU) SizeMenu(kAv, iAuth); } else if (sMenuType == POSMENU) { if (sMessage == UPMENU) { - llMessageLinked(LINK_SET, iAuth, "menu " + g_sParentMenu, kAv); + DoMenu(kAv, iAuth); //llMessageLinked(LINK_SET, iAuth, "menu " + g_sParentMenu, kAv); return; } else if (llGetAttached()) { if (sMessage == "forward ↳") AdjustPos(); @@ -290,7 +292,7 @@ state active PosMenu(kAv, iAuth); } else if (sMenuType == ROTMENU) { if (sMessage == UPMENU) { - llMessageLinked(LINK_SET, iAuth, "menu " + g_sParentMenu, kAv); + DoMenu(kAv, iAuth); //llMessageLinked(LINK_SET, iAuth, "menu " + g_sParentMenu, kAv); return; } else if (llGetAttached()) { if (sMessage == "tilt right ↘") AdjustRot(); @@ -303,7 +305,7 @@ state active RotMenu(kAv, iAuth); } else if (sMenuType == SIZEMENU) { if (sMessage == UPMENU) { - llMessageLinked(LINK_SET, iAuth, "menu " + g_sParentMenu, kAv); + DoMenu(kAv, iAuth); //llMessageLinked(LINK_SET, iAuth, "menu " + g_sParentMenu, kAv); return; } else { integer iMenuCommand = llListFindList(SIZEMENU_BUTTONS, [sMessage]);