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

Revert "From: Chris Yeoh <cyeoh@au1.ibm.com>" 

This reverts r9666. for some reason the mysql update does not work.
0.6.6-post-fixes
Dr Scofield 2009-05-25 11:32:31 +00:00
parent 0bff818d39
commit c18c1f6c7c
4 changed files with 6 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
OpenSim/Data/MySQL/MySQLRegionData.cs
View File

@ -196,7 +196,6 @@ namespace OpenSim.Data.MySQL
"ColorR, ColorG, ColorB, ColorA, "+
"ParticleSystem, ClickAction, Material, "+
"CollisionSound, CollisionSoundVolume, "+
"PassTouches, "+
"LinkNumber) values (" + "?UUID, "+
"?CreationDate, ?Name, ?Text, "+
"?Description, ?SitName, ?TouchName, "+
@ -228,7 +227,7 @@ namespace OpenSim.Data.MySQL
"?SaleType, ?ColorR, ?ColorG, "+
"?ColorB, ?ColorA, ?ParticleSystem, "+
"?ClickAction, ?Material, ?CollisionSound, "+
"?CollisionSoundVolume, ?PassTouches, ?LinkNumber)";
"?CollisionSoundVolume, ?LinkNumber)";
FillPrimCommand(cmd, prim, obj.UUID, regionUUID);
@ -951,9 +950,6 @@ namespace OpenSim.Data.MySQL
prim.CollisionSound = new UUID(row["CollisionSound"].ToString());
prim.CollisionSoundVolume = Convert.ToSingle(row["CollisionSoundVolume"]);
if (Convert.ToInt16(row["PassTouches"]) != 0)
prim.PassTouches = true;
prim.LinkNum = Convert.ToInt32(row["LinkNumber"]);
return prim;
@ -1276,12 +1272,6 @@ namespace OpenSim.Data.MySQL
cmd.Parameters.AddWithValue("CollisionSound", prim.CollisionSound.ToString());
cmd.Parameters.AddWithValue("CollisionSoundVolume", prim.CollisionSoundVolume);
if (prim.PassTouches)
cmd.Parameters.AddWithValue("PassTouches", 1);
else
cmd.Parameters.AddWithValue("PassTouches", 0);
cmd.Parameters.AddWithValue("LinkNumber", prim.LinkNum);
}
@ -1544,4 +1534,4 @@ namespace OpenSim.Data.MySQL
}
}
}
}
}

10
OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
View File

@ -251,16 +251,10 @@ namespace OpenSim.Region.Framework.Scenes
// If the touched prim handles touches, deliver it
// If not, deliver to root prim
if ((part.ScriptEvents & scriptEvents.touch_start) != 0)
if ((part.ScriptEvents & scriptEvents.touch_start) != 0)
EventManager.TriggerObjectGrab(part.LocalId, 0, part.OffsetPosition, remoteClient, surfaceArg);
// Deliver to the root prim if the touched prim doesn't handle touches
// or if we're meant to pass on touches anyway. Don't send to root prim
// if prim touched is the root prim as we just did it
if (((part.ScriptEvents & scriptEvents.touch_start) == 0) ||
(part.PassTouches && (part.LocalId != obj.RootPart.LocalId)))
{
else
EventManager.TriggerObjectGrab(obj.RootPart.LocalId, part.LocalId, part.OffsetPosition, remoteClient, surfaceArg);
}
return;
}

15
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
View File

@ -102,6 +102,7 @@ namespace OpenSim.Region.Framework.Scenes
#region Fields
[XmlIgnore]
public bool AllowedDrop = false;
[XmlIgnore]
@ -215,9 +216,6 @@ namespace OpenSim.Region.Framework.Scenes
private readonly UndoStack<UndoState> m_undo = new UndoStack<UndoState>(5);
private UUID _creatorID;
private bool m_passTouches = false;
/// <summary>
/// Only used internally to schedule client updates.
/// 0 - no update is scheduled
@ -433,17 +431,6 @@ namespace OpenSim.Region.Framework.Scenes
}
}
public bool PassTouches
{
get { return m_passTouches; }
set
{
m_passTouches = value;
if (ParentGroup != null)
ParentGroup.HasGroupChanged = true;
}
}
public ulong RegionHandle
{
get { return m_regionHandle; }

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

@ -3705,10 +3705,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
public void llPassTouches(int pass)
{
m_host.AddScriptLPS(1);
if (pass != 0)
m_host.PassTouches = true;
else
m_host.PassTouches = false;
NotImplemented("llPassTouches");
}
public LSL_String llRequestAgentData(string id, int data)