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

Update svn properties, minor formatting cleanup.

0.6.0-stable
Jeff Ames 2008-10-12 03:16:49 +00:00
parent 166690d539
commit fdec8390c1
5 changed files with 39 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Framework/PacketPool.cs
View File

@ -131,10 +131,10 @@ namespace OpenSim.Framework
/// <param name="packet"></param> /// <param name="packet"></param>
public void ReturnPacket(Packet packet) public void ReturnPacket(Packet packet)
{ {
if(!packetPoolEnabled) if (!packetPoolEnabled)
return; return;
switch(packet.Type) switch (packet.Type)
{ {
// List pooling packets here // List pooling packets here
case PacketType.PacketAck: case PacketType.PacketAck:

34
OpenSim/Framework/SurfaceTouchEventArgs.cs
View File

@ -1,17 +1,17 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Text; using System.Text;
using OpenMetaverse; using OpenMetaverse;
namespace OpenSim.Framework namespace OpenSim.Framework
{ {
public class SurfaceTouchEventArgs public class SurfaceTouchEventArgs
{ {
public Vector3 Binormal; public Vector3 Binormal;
public int FaceIndex; public int FaceIndex;
public Vector3 Normal; public Vector3 Normal;
public Vector3 Position; public Vector3 Position;
public Vector3 STCoord; public Vector3 STCoord;
public Vector3 UVCoord; public Vector3 UVCoord;
} }
} }

27
OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs
View File

@ -154,18 +154,21 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
part.SitTargetOrientation = new Quaternion(0,0,0,1); part.SitTargetOrientation = new Quaternion(0,0,0,1);
part.SitTargetPosition = new Vector3(0,0,0); part.SitTargetPosition = new Vector3(0,0,0);
// Fix ownership/creator of inventory items // Fix ownership/creator of inventory items
// Not doing so results in inventory items // Not doing so results in inventory items
// being no copy/no mod for everyone // being no copy/no mod for everyone
TaskInventoryDictionary inv = part.TaskInventory; TaskInventoryDictionary inv = part.TaskInventory;
foreach (KeyValuePair<UUID, TaskInventoryItem> kvp in inv) { foreach (KeyValuePair<UUID, TaskInventoryItem> kvp in inv)
if (!resolveUserUuid(kvp.Value.OwnerID)) { {
kvp.Value.OwnerID = masterAvatarId; if (!resolveUserUuid(kvp.Value.OwnerID))
} {
if (!resolveUserUuid(kvp.Value.CreatorID)) { kvp.Value.OwnerID = masterAvatarId;
kvp.Value.CreatorID = masterAvatarId; }
} if (!resolveUserUuid(kvp.Value.CreatorID))
} {
kvp.Value.CreatorID = masterAvatarId;
}
}
} }
if (m_scene.AddRestoredSceneObject(sceneObject, true, false)) if (m_scene.AddRestoredSceneObject(sceneObject, true, false))

2
OpenSim/Region/Environment/Scenes/ScenePresence.cs
View File

@ -249,7 +249,7 @@ namespace OpenSim.Region.Environment.Scenes
{ {
Vector3 a = new Vector3(m_CameraAtAxis.X, m_CameraAtAxis.Y, 0); Vector3 a = new Vector3(m_CameraAtAxis.X, m_CameraAtAxis.Y, 0);
if(a == Vector3.Zero) if (a == Vector3.Zero)
return a; return a;
return Util.GetNormalizedVector(a); return Util.GetNormalizedVector(a);

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

@ -7366,7 +7366,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
// now send to all (non-child) agents // now send to all (non-child) agents
List<ScenePresence> agents = World.GetAvatars(); List<ScenePresence> agents = World.GetAvatars();
foreach(ScenePresence agent in agents) foreach (ScenePresence agent in agents)
{ {
agent.ControllingClient.SendParcelMediaUpdate(landData.MediaURL, agent.ControllingClient.SendParcelMediaUpdate(landData.MediaURL,
landData.MediaID, landData.MediaID,
@ -7377,7 +7377,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1); // TODO do some LOOP logic here 1); // TODO do some LOOP logic here
} }
} }
else if(!presence.IsChildAgent) else if (!presence.IsChildAgent)
{ {
// we only send to one (root) agent // we only send to one (root) agent
presence.ControllingClient.SendParcelMediaUpdate(url, presence.ControllingClient.SendParcelMediaUpdate(url,
@ -7397,14 +7397,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
{ {
// send to all (non-child) agents // send to all (non-child) agents
List<ScenePresence> agents = World.GetAvatars(); List<ScenePresence> agents = World.GetAvatars();
foreach(ScenePresence agent in agents) foreach (ScenePresence agent in agents)
{ {
agent.ControllingClient.SendParcelMediaCommand(0x4, // TODO what is this? agent.ControllingClient.SendParcelMediaCommand(0x4, // TODO what is this?
(ParcelMediaCommandEnum)commandToSend, (ParcelMediaCommandEnum)commandToSend,
time); time);
} }
} }
else if(!presence.IsChildAgent) else if (!presence.IsChildAgent)
{ {
presence.ControllingClient.SendParcelMediaCommand(0x4, // TODO what is this? presence.ControllingClient.SendParcelMediaCommand(0x4, // TODO what is this?
(ParcelMediaCommandEnum)commandToSend, (ParcelMediaCommandEnum)commandToSend,