aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes
diff options
context:
space:
mode:
authorDr Scofield2008-09-02 12:07:23 +0000
committerDr Scofield2008-09-02 12:07:23 +0000
commit109aa00150aea01ba32620b4d965edd459827ff7 (patch)
tree07699c55770d6f3a3cb220e0320f1aab434f062d /OpenSim/Region/Environment/Scenes
parentFix regex for string->int cast to accept leading spaces and a sign (diff)
downloadopensim-SC-109aa00150aea01ba32620b4d965edd459827ff7.zip
opensim-SC-109aa00150aea01ba32620b4d965edd459827ff7.tar.gz
opensim-SC-109aa00150aea01ba32620b4d965edd459827ff7.tar.bz2
opensim-SC-109aa00150aea01ba32620b4d965edd459827ff7.tar.xz
fix: PostInitialise() not being called on script engines (nasty one that)
cleanup: warnings, readability
Diffstat (limited to 'OpenSim/Region/Environment/Scenes')
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs46
1 files changed, 24 insertions, 22 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs
index eb6b9cc..3bfe7e9 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs
@@ -164,10 +164,11 @@ namespace OpenSim.Region.Environment.Scenes
164 /// <returns></returns> 164 /// <returns></returns>
165 public void CreateScriptInstance(TaskInventoryItem item, int startParam, bool postOnRez) 165 public void CreateScriptInstance(TaskInventoryItem item, int startParam, bool postOnRez)
166 { 166 {
167 // m_log.InfoFormat( 167 // m_log.InfoFormat(
168 // "[PRIM INVENTORY]: " + 168 // "[PRIM INVENTORY]: " +
169 // "Starting script {0}, {1} in prim {2}, {3}", 169 // "Starting script {0}, {1} in prim {2}, {3}",
170 // item.Name, item.ItemID, Name, UUID); 170 // item.Name, item.ItemID, Name, UUID);
171
171 if (!m_parentGroup.Scene.ExternalChecks.ExternalChecksCanRunScript(item.ItemID, UUID, item.OwnerID)) 172 if (!m_parentGroup.Scene.ExternalChecks.ExternalChecksCanRunScript(item.ItemID, UUID, item.OwnerID))
172 return; 173 return;
173 174
@@ -178,24 +179,25 @@ namespace OpenSim.Region.Environment.Scenes
178 AssetCache cache = m_parentGroup.Scene.AssetCache; 179 AssetCache cache = m_parentGroup.Scene.AssetCache;
179 180
180 cache.GetAsset(item.AssetID, delegate(LLUUID assetID, AssetBase asset) 181 cache.GetAsset(item.AssetID, delegate(LLUUID assetID, AssetBase asset)
181 { 182 {
182 if (null == asset) 183 if (null == asset)
183 { 184 {
184 m_log.ErrorFormat( 185 m_log.ErrorFormat(
185 "[PRIM INVENTORY]: " + 186 "[PRIM INVENTORY]: " +
186 "Couldn't start script {0}, {1} since asset ID {2} could not be found", 187 "Couldn't start script {0}, {1} since asset ID {2} could not be found",
187 item.Name, item.ItemID, item.AssetID); 188 item.Name, item.ItemID, item.AssetID);
188 } 189 }
189 else 190 else
190 { 191 {
191 m_taskInventory[item.ItemID].PermsMask = 0; 192 m_taskInventory[item.ItemID].PermsMask = 0;
192 m_taskInventory[item.ItemID].PermsGranter = LLUUID.Zero; 193 m_taskInventory[item.ItemID].PermsGranter = LLUUID.Zero;
193 string script = Helpers.FieldToUTF8String(asset.Data); 194 string script = Helpers.FieldToUTF8String(asset.Data);
194 m_parentGroup.Scene.EventManager.TriggerRezScript(LocalId, item.ItemID,script, startParam, postOnRez); 195 m_parentGroup.Scene.EventManager.TriggerRezScript(LocalId, item.ItemID, script,
195 m_parentGroup.AddActiveScriptCount(1); 196 startParam, postOnRez);
196 ScheduleFullUpdate(); 197 m_parentGroup.AddActiveScriptCount(1);
197 } 198 ScheduleFullUpdate();
198 }, false); 199 }
200 }, false);
199 } 201 }
200 } 202 }
201 203