Merge branch 'master' into stable

src/device/oc_sys.lsl

@@ -499,7 +499,7 @@ default {
                     else if (sMessage == "Help") UserCommand(iAuth, "help", kAv, TRUE);
                     else if (sMessage == "Update") UserCommand(iAuth, "update", kAv, TRUE);
                     else if (sMessage == "Version")
-                        g_kHttpVersion = llHTTPRequest("https://git.lotix.org/lotek/oscollar/raw/branch/master/web/device", [], "");
+                        g_kHttpVersion = llHTTPRequest("https://git.lotix.org/lotek/oscollar/raw/branch/stable/web/device", [], "");
                 } else if (sMenu == "UpdateConfirmMenu"){
                     if (sMessage=="Yes") StartUpdate();
                     else {
@@ -656,7 +656,7 @@ default {
             if (compareVersions(sWebVersion, g_sCollarVersion)) {
                 llOwnerSay("An update is available!");
                 // Fetch a list of distribution sites:
-                g_kHttpDistsites = llHTTPRequest("https://git.lotix.org/lotek/oscollar/raw/branch/master/web/distsites", [], "");
+                g_kHttpDistsites = llHTTPRequest("https://git.lotix.org/lotek/oscollar/raw/branch/stable/web/distsites", [], "");
             } else
                 llOwnerSay("You are using the most recent version");
         } else if (kID == g_kHttpDistsites) {

web/distsites

@@ -1,4 +1,5 @@
 
 Get an updater at:
 
-TBD
+Kinky Hub
+hop://hg.tamai.nl:80/Oaks%20Woods/21/124/23