aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment
diff options
context:
space:
mode:
authorSean Dague2008-03-17 15:11:36 +0000
committerSean Dague2008-03-17 15:11:36 +0000
commitdba37a8722a375c77a31efa03c12c146126898d3 (patch)
tree89715aa67c3ba97d33ae1f5e50d31dbb952ce03b /OpenSim/Region/Environment
parent* Fixed prim creation in basic physics mode. ( BasicPhysics returns null prob... (diff)
downloadopensim-SC-dba37a8722a375c77a31efa03c12c146126898d3.zip
opensim-SC-dba37a8722a375c77a31efa03c12c146126898d3.tar.gz
opensim-SC-dba37a8722a375c77a31efa03c12c146126898d3.tar.bz2
opensim-SC-dba37a8722a375c77a31efa03c12c146126898d3.tar.xz
From: Alan M Webb <awebb@vnet.ibm.com>
Here's a diff of the changes I have made in support of the following LSL script functions. llSetScriptState llGetScriptState llCSV2List llListRandomize llList2ListStrided llListFindList llResetOtherScript llGetScriptName It was necessary to modify ExecutorBase in support of the ScriptState implementations. I also modified SceneObjectPart and SceneObjectPart.Inventory to corrects a quoting mismatch in the commentary that through off live parsing of the files. I also simplified the State definition at the start of BuiltinCommands.
Diffstat (limited to 'OpenSim/Region/Environment')
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs2
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectPart.cs2
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs
index 2b13751..4711748 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs
@@ -93,7 +93,7 @@ namespace OpenSim.Region.Environment.Scenes
93 /// Reset LLUUIDs for all the items in the prim's inventory. This involves either generating 93 /// Reset LLUUIDs for all the items in the prim's inventory. This involves either generating
94 /// new ones or setting existing UUIDs to the correct parent UUIDs 94 /// new ones or setting existing UUIDs to the correct parent UUIDs
95 /// </summary> 95 /// </summary>
96 /// <param name="linkNum'>Link number for the part</param> 96 /// <param name="linkNum">Link number for the part</param>
97 public void ResetInventoryIDs() 97 public void ResetInventoryIDs()
98 { 98 {
99 lock (TaskInventory) 99 lock (TaskInventory)
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
index e9d4c66..3d52119 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
@@ -1087,7 +1087,7 @@ namespace OpenSim.Region.Environment.Scenes
1087 /// Reset LLUUIDs for this part. This involves generate this part's own LLUUID and 1087 /// Reset LLUUIDs for this part. This involves generate this part's own LLUUID and
1088 /// generating new LLUUIDs for all the items in the inventory. 1088 /// generating new LLUUIDs for all the items in the inventory.
1089 /// </summary> 1089 /// </summary>
1090 /// <param name="linkNum'>Link number for the part</param> 1090 /// <param name="linkNum">Link number for the part</param>
1091 public void ResetIDs(int linkNum) 1091 public void ResetIDs(int linkNum)
1092 { 1092 {
1093 UUID = LLUUID.Random(); 1093 UUID = LLUUID.Random();