Merge branch 'basic_structure' into develop, preparing release - work on

branch basic_structure is not finished yet
RayZopf · Mar 10, 2014 · 68a14ee · 68a14ee
2 parents 3bebbc9 + b51e9fb
commit 68a14ee
Show file tree

Hide file tree

Showing 4 changed files with 183 additions and 822 deletions.
diff --git a/LSL/CameraButton.lsl b/LSL/CameraButton.lsl
@@ -1,7 +1,19 @@
-// LSL script generated: Camera.LSL.CameraButton.lslp Mon Mar 10 13:50:44 Mitteleuropäische Zeit 2014
+// LSL script generated: Camera.LSL.CameraButton.lslp Mon Mar 10 18:20:21 Mitteleuropäische Zeit 2014
+
+
+
+
 default {
 
-    touch_start(integer total_number) {
+	state_entry() {
+        integer rc = 0;
+        (rc = llSetMemoryLimit(8192));
+
+    }
+
+
+
+	touch_start(integer num_detected) {
         llMessageLinked(1,0,"cam",llDetectedKey(0));
     }
 }
diff --git a/LSL/CameraButton.lslp b/LSL/CameraButton.lslp
@@ -1,8 +1,25 @@
+integer verbose = FALSE;
+
+string g_sTitle = "CameraScript-Button";     // title
+string g_sVersion = "1.11";            // version
+string g_sScriptName;
+
+
+$import MemoryManagement2.lslm(m_sTitle=g_sTitle, m_sScriptName=g_sScriptName, m_iVerbose=verbose);
+
+
+
 default
 {
-    touch_start(integer total_number)
-    {
-        llMessageLinked(LINK_ROOT, 0, "cam", llDetectedKey(0));
-    }
-}
+	state_entry()
+	{
+		//g_sScriptName = llGetScriptName();
+		MemRestrict(8192, FALSE);
+	}
+
 
+	touch_start(integer num_detected)
+	{
+		llMessageLinked(LINK_ROOT, 0, "cam", llDetectedKey(0));
+	}
+}