From efc2907484225366eee6901335772bd63fcc3544 Mon Sep 17 00:00:00 2001
From: onefang
Date: Mon, 6 Sep 2021 21:37:18 +1000
Subject: More consistency in the 1ring menus.

---
 .1ring.theme.txt | 80 ++++++++++++++++++++++++++++----------------------------
 1ring.lsl        |  8 +++---
 2 files changed, 44 insertions(+), 44 deletions(-)

diff --git a/.1ring.theme.txt b/.1ring.theme.txt
index 0e6c330..f8baab3 100644
--- a/.1ring.theme.txt
+++ b/.1ring.theme.txt
@@ -5,20 +5,20 @@ ALIAS boss | Owner
 
 MAIN main
 MENU main | main menu | ALL
-TOMENU Access
+TOMENU access
 TOMENU clothes
 TOMENU couples | 1AOor2.COUPLES
-TOMENU Leash
+TOMENU leash
 TOMENU mood
 TOMENU moves
 TOMENU other
 BUTTON PANIC | PANIC
-TOMENU Restrictions
+TOMENU restrictions
 TOMENU sound
 BUTTON TEST | MENU 1AOor2.couples
 //TOGGLE test
 
-MENU Access | Access menu: | PRIV
+MENU access | access menu: | PRIV
 TOMENU + Boss | ADD_BOSS
 TOMENU - Boss | DEL_BOSS
 BUTTON list | LIST_BOSS
@@ -27,21 +27,21 @@ TOMENU - Trustee | DEL_TRUSTEE
 BUTTON run away | RUNAWAY
 TOMENU + block | ADD_BLOCKED
 TOMENU - block | DEL_BLOCKED
-TOMENU Relay settings
+TOMENU relay settings
 TOGGLE group
 TOGGLE public
 
-MENU clothes | clothing menu | MORE
+MENU clothes | clothing menu: | MORE
 TOMENU outfits |CHOOSE_OUTFIT
 TOMENU attached |CHOOSE_ATTACH
 TOMENU worn |CHOOSE_CLOTHES
 
-MENU Leash | Leash menu | MORE
-BUTTON Grab | GRAB
-TOMENU Leash | CHOOSE_ALL
-BUTTON Unleash | RELEASE
-TOGGLE Locate
-BUTTON Yank
+MENU leash | leash menu: | MORE
+BUTTON grab | GRAB
+TOMENU leash | CHOOSE_ALL leash
+BUTTON unleash | RELEASE
+TOGGLE locate
+BUTTON yank
 TOMENU length
 TOMENU size
 TOMENU texture | CHOOSE_ALL texture
@@ -69,52 +69,52 @@ MENU mood | moods menu:\nLaugh\nCheeky\nHappy\nNone\nSad\nAngry\nCry\nTantrum |
 BUTTON △ better
 BUTTON ▽ worse
 
-MENU moves | movement menu | MORE
-TOMENU Follow | CHOOSE_ALL
-TOMENU Go to | CHOOSE_ALL
-TOMENU Sit | CHOOSE_ALL
+MENU moves | movement menu: | MORE
 BUTTON slower - | 1AOor2.SLOWER_-
 BUTTON normal | 1AOor2.NORMAL_SPEED
 BUTTON faster + | 1AOor2.FASTER_+
+TOMENU follow | CHOOSE_ALL follow
+TOMENU go to | CHOOSE_ALL goto
+TOMENU sit | CHOOSE_ALL sit
 TOGGLE free
 BUTTON stop | STOP
-BUTTON Stand | STAND
 TOMENU AO| MENU 1AOor2.AO
+BUTTON stand | STAND
 TOMENU teleport
 
-MENU Restrictions | RLV restrictions menu: | PRIV
-TOMENU Camera
-TOMENU Chat
-TOMENU Clothes
-TOMENU Inventory
-TOMENU Movement
-TOMENU Touch
+MENU restrictions | RLV restrictions menu: | PRIV
+TOMENU camera
+TOMENU chat
+TOMENU clothes
+TOMENU inventory
+TOMENU movement
+TOMENU touch
 TOGGLE lock
-TOGGLE Safeword
-TOMENU Safeword
-TOMENU Timer
-TOMENU Bad words
+TOGGLE safeword
+TOMENU safeword
+TOMENU timer
+TOMENU bad words
 
 MENU sound | sound menu: | PRIV
-TOGGLE Bell
-BUTTON △ Bell volume
-BUTTON ▽ Bell volume
-TOMENU Choose bell
-TOGGLE Bell hide
-TOGGLE Lock sound
-BUTTON △ Lock volume
-BUTTON▽ Lock volume
-TOMENU Choose lock
-TOGGLE Lock hide
 
 MENU poses | poses menu: | MORE
 TOMENU choose
 TOMENU gestures
+TOGGLE bell
+BUTTON △ bell volume | NOP
+BUTTON ▽ bell volume | NOP
+TOMENU choose bell
+TOGGLE bell hide
+TOGGLE lock sound
+BUTTON △ lock volume | NOP
+BUTTON▽ lock volume | NOP
+TOMENU choose lock
+TOGGLE lock hide
 
-MENU teleport | teleport menu: | WEARER
+MENU teleport | teleport menu: | PRIV
 TOMENU choose
 BUTTON home
 
-MENU Relay settings | Relay settings menu: | PRIV
+MENU relay settings | relay settings menu: | PRIV
 TOGGLE relay
 BUTTON Chat relay
diff --git a/1ring.lsl b/1ring.lsl
index c3c3d52..5f1d7c8 100644
--- a/1ring.lsl
+++ b/1ring.lsl
@@ -492,13 +492,13 @@ llShout(0, "AAAHHHHH!");
     else if ("CHOOSE_ALL" == cmd)
     {
         list s;
-        if ("Follow…" == button)
+        if ("follow" == data)
             s = [AGENT, "Select someone to follow", "FOLLOW"];
-        else if ("Go to…" == button)
+        else if ("goto" == data)
             s = [ACTIVE | AGENT | PASSIVE, "Select something or someone to go to", "GOTO"];
-        else if ("Leash…" == button)
+        else if ("leash" == data)
             s = [ACTIVE | AGENT | PASSIVE, "Select something or someone to leash to", "LEASH"];
-        else if ("Sit…" == button)    // This will only be for objects, can't sit on an avatar.
+        else if ("sit" == data)    // This will only be for objects, can't sit on an avatar.
             s = [ACTIVE | PASSIVE, "Select something to sit on", "SIT"];
         else if ("texture" == data)
         {
-- 
cgit v1.1