diff options
author | Justin Clarke Casey | 2008-01-07 03:09:00 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-01-07 03:09:00 +0000 |
commit | eadfbf3ba294a36280e52e174aeaea2ae7fca6f0 (patch) | |
tree | e699475629b93ba60dc5a85b741391287f88531f | |
parent | Refactor Scene.Inventory.RezScript to use newer script starting code (diff) | |
download | opensim-SC-eadfbf3ba294a36280e52e174aeaea2ae7fca6f0.zip opensim-SC-eadfbf3ba294a36280e52e174aeaea2ae7fca6f0.tar.gz opensim-SC-eadfbf3ba294a36280e52e174aeaea2ae7fca6f0.tar.bz2 opensim-SC-eadfbf3ba294a36280e52e174aeaea2ae7fca6f0.tar.xz |
Very minor refactoring. Remove unused prim inventory bool returns for now
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.Inventory.cs | 1 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs | 8 |
2 files changed, 2 insertions, 7 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs index bfde643..2e8f5f7 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs | |||
@@ -562,7 +562,6 @@ namespace OpenSim.Region.Environment.Scenes | |||
562 | SceneObjectGroup group = GetGroupByPrim(localID); | 562 | SceneObjectGroup group = GetGroupByPrim(localID); |
563 | if (group != null) | 563 | if (group != null) |
564 | { | 564 | { |
565 | // TODO: do we care about the value of this bool? | ||
566 | group.AddInventoryItem(remoteClient, localID, item, copyID); | 565 | group.AddInventoryItem(remoteClient, localID, item, copyID); |
567 | group.StartScript(localID, copyID); | 566 | group.StartScript(localID, copyID); |
568 | group.GetProperites(remoteClient); | 567 | group.GetProperites(remoteClient); |
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs index 98cd3af..c282780 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs | |||
@@ -100,8 +100,8 @@ namespace OpenSim.Region.Environment.Scenes | |||
100 | /// Start a script which is in this prim's inventory. | 100 | /// Start a script which is in this prim's inventory. |
101 | /// </summary> | 101 | /// </summary> |
102 | /// <param name="item"></param> | 102 | /// <param name="item"></param> |
103 | /// <returns>true if script asset was found, false if it wasn't</returns> | 103 | /// <returns></returns> |
104 | public bool StartScript(TaskInventoryItem item) | 104 | public void StartScript(TaskInventoryItem item) |
105 | { | 105 | { |
106 | // MainLog.Instance.Verbose( | 106 | // MainLog.Instance.Verbose( |
107 | // "PRIMINVENTORY", | 107 | // "PRIMINVENTORY", |
@@ -114,8 +114,6 @@ namespace OpenSim.Region.Environment.Scenes | |||
114 | { | 114 | { |
115 | string script = Helpers.FieldToUTF8String(rezAsset.Data); | 115 | string script = Helpers.FieldToUTF8String(rezAsset.Data); |
116 | m_parentGroup.Scene.EventManager.TriggerRezScript(LocalID, item.item_id, script); | 116 | m_parentGroup.Scene.EventManager.TriggerRezScript(LocalID, item.item_id, script); |
117 | |||
118 | return true; | ||
119 | } | 117 | } |
120 | else | 118 | else |
121 | { | 119 | { |
@@ -124,8 +122,6 @@ namespace OpenSim.Region.Environment.Scenes | |||
124 | "Couldn't start script {0}, {1} since asset ID {2} could not be found", | 122 | "Couldn't start script {0}, {1} since asset ID {2} could not be found", |
125 | item.name, item.item_id, item.asset_id); | 123 | item.name, item.item_id, item.asset_id); |
126 | } | 124 | } |
127 | |||
128 | return false; | ||
129 | } | 125 | } |
130 | 126 | ||
131 | /// <summary> | 127 | /// <summary> |