Bitch if RLV is not enabled when trying to do RLV stuff.

1 files changed, 17 insertions, 0 deletions

diff --git a/1ring.lsl b/1ring.lsl
index c08de7f..a50d28e 100644
--- a/1ring.lsl
+++ b/1ring.lsl
@@ -1042,6 +1042,12 @@ sendRLV(string cmd)
 }
 sendRLV(string cmd, float time)
 {
+    if ((RLVd) && ("" == RLVversion))
+    {
+        llSay(0, "RLV not enabled for " + llKey2Name(Owner) + ".");
+        return;
+    }
+
     integer c = llGetListLength(llParseString2List(cmd, [","], []));
     RLVq += [(string)(RLVchannel + RLVl), cmd, (string) c, 0, time, 0, 0];
     ++RLVl;
@@ -1064,6 +1070,13 @@ doRLV(integer f)
     string cmd = "";
     if (0 != h)
         return;
+
+    if ((RLVd) && ("" == RLVversion))
+    {
+        llSay(0, "RLV not enabled for " + llKey2Name(Owner) + ".");
+        return;
+    }
+
 // TODO - check if this command is available and not blacklisted.
 //          Though since getcommands seems to miss "clear" and "setrot", even though they work, seems pointless.
     if (0.0 < time)
@@ -1256,11 +1269,15 @@ string gotRLV(integer chan, integer g, string message)
             else
             {
                 if (v)  // Various docs say RLV might take upto 30 seconds to start in the viewer.
+                {
                     s(Owner, "Your viewer is not RLV-enabled, so some things wont work.");
+                    RLVd = TRUE;
+                }
                 else
                 {
                     d("RLV command " + r + " not responding!  Giving up.");
                     S("Your viewer is taking too long to start up RLV.");
+                    RLVd = TRUE;
                 }
                 if (0 != h)     llListenRemove(h);
                 RLVq = llListReplaceList(RLVq, [], f, f + qSTRIDE - 1);