OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Kan-Ed fix series. Fix up llRezAtRoot and llRezObject, fix llCreateLink 

to send a full update and do a persistence save.
0.6.0-stable
Melanie Thielker 2008-09-17 23:50:21 +00:00
parent 386c3e41f0
commit 66febc47ad
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
View File

@ -2116,11 +2116,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
return; return;
m_host.AddScriptLPS(1); m_host.AddScriptLPS(1);
bool found = false;
// Instead of using return;, I'm using continue; because in our TaskInventory implementation
// it's possible to have two items with the same task inventory name.
// this is an easter egg of sorts.
foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory) foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
{ {
@ -2130,7 +2125,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
if (inv.Value.InvType != (int)InventoryType.Object) if (inv.Value.InvType != (int)InventoryType.Object)
{ {
llSay(0, "Unable to create requested object. Object is missing from database."); llSay(0, "Unable to create requested object. Object is missing from database.");
continue; return;
} }
Vector3 llpos = new Vector3((float)pos.x, (float)pos.y, (float)pos.z); Vector3 llpos = new Vector3((float)pos.x, (float)pos.y, (float)pos.z);
@ -2165,14 +2160,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
//Recoil. //Recoil.
llApplyImpulse(new LSL_Types.Vector3(llvel.X * groupmass, llvel.Y * groupmass, llvel.Z * groupmass), 0); llApplyImpulse(new LSL_Types.Vector3(llvel.X * groupmass, llvel.Y * groupmass, llvel.Z * groupmass), 0);
found = true;
// Variable script delay? (see (http://wiki.secondlife.com/wiki/LSL_Delay) // Variable script delay? (see (http://wiki.secondlife.com/wiki/LSL_Delay)
ScriptSleep((int)((groupmass * velmag) / 10)); ScriptSleep((int)((groupmass * velmag) / 10));
// ScriptSleep(100); // ScriptSleep(100);
break; return;
} }
} }
if (!found)
llSay(0, "Could not find object " + inventory); llSay(0, "Could not find object " + inventory);
} }
@ -2830,6 +2823,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
} }
parentPrim.TriggerScriptChangedEvent(Changed.LINK); parentPrim.TriggerScriptChangedEvent(Changed.LINK);
parentPrim.RootPart.AddFlag(PrimFlags.CreateSelected); parentPrim.RootPart.AddFlag(PrimFlags.CreateSelected);
parentPrim.HasGroupChanged = true;
parentPrim.ScheduleGroupForFullUpdate();
parentPrim.GetProperties(client); parentPrim.GetProperties(client);
ScriptSleep(1000); ScriptSleep(1000);