aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Framework/PacketPool.cs4
-rw-r--r--OpenSim/Framework/SurfaceTouchEventArgs.cs34
-rw-r--r--OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs27
-rw-r--r--OpenSim/Region/Environment/Scenes/ScenePresence.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs8
5 files changed, 39 insertions, 36 deletions
diff --git a/OpenSim/Framework/PacketPool.cs b/OpenSim/Framework/PacketPool.cs
index 1b486aa..807403e 100644
--- a/OpenSim/Framework/PacketPool.cs
+++ b/OpenSim/Framework/PacketPool.cs
@@ -131,10 +131,10 @@ namespace OpenSim.Framework
131 /// <param name="packet"></param> 131 /// <param name="packet"></param>
132 public void ReturnPacket(Packet packet) 132 public void ReturnPacket(Packet packet)
133 { 133 {
134 if(!packetPoolEnabled) 134 if (!packetPoolEnabled)
135 return; 135 return;
136 136
137 switch(packet.Type) 137 switch (packet.Type)
138 { 138 {
139 // List pooling packets here 139 // List pooling packets here
140 case PacketType.PacketAck: 140 case PacketType.PacketAck:
diff --git a/OpenSim/Framework/SurfaceTouchEventArgs.cs b/OpenSim/Framework/SurfaceTouchEventArgs.cs
index f34d8ba..1fc83c2 100644
--- a/OpenSim/Framework/SurfaceTouchEventArgs.cs
+++ b/OpenSim/Framework/SurfaceTouchEventArgs.cs
@@ -1,17 +1,17 @@
1using System; 1using System;
2using System.Collections.Generic; 2using System.Collections.Generic;
3using System.Text; 3using System.Text;
4using OpenMetaverse; 4using OpenMetaverse;
5 5
6namespace OpenSim.Framework 6namespace OpenSim.Framework
7{ 7{
8 public class SurfaceTouchEventArgs 8 public class SurfaceTouchEventArgs
9 { 9 {
10 public Vector3 Binormal; 10 public Vector3 Binormal;
11 public int FaceIndex; 11 public int FaceIndex;
12 public Vector3 Normal; 12 public Vector3 Normal;
13 public Vector3 Position; 13 public Vector3 Position;
14 public Vector3 STCoord; 14 public Vector3 STCoord;
15 public Vector3 UVCoord; 15 public Vector3 UVCoord;
16 } 16 }
17} 17}
diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs
index 88e1d24..b001b42 100644
--- a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs
+++ b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs
@@ -154,18 +154,21 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
154 part.SitTargetOrientation = new Quaternion(0,0,0,1); 154 part.SitTargetOrientation = new Quaternion(0,0,0,1);
155 part.SitTargetPosition = new Vector3(0,0,0); 155 part.SitTargetPosition = new Vector3(0,0,0);
156 156
157 // Fix ownership/creator of inventory items 157 // Fix ownership/creator of inventory items
158 // Not doing so results in inventory items 158 // Not doing so results in inventory items
159 // being no copy/no mod for everyone 159 // being no copy/no mod for everyone
160 TaskInventoryDictionary inv = part.TaskInventory; 160 TaskInventoryDictionary inv = part.TaskInventory;
161 foreach (KeyValuePair<UUID, TaskInventoryItem> kvp in inv) { 161 foreach (KeyValuePair<UUID, TaskInventoryItem> kvp in inv)
162 if (!resolveUserUuid(kvp.Value.OwnerID)) { 162 {
163 kvp.Value.OwnerID = masterAvatarId; 163 if (!resolveUserUuid(kvp.Value.OwnerID))
164 } 164 {
165 if (!resolveUserUuid(kvp.Value.CreatorID)) { 165 kvp.Value.OwnerID = masterAvatarId;
166 kvp.Value.CreatorID = masterAvatarId; 166 }
167 } 167 if (!resolveUserUuid(kvp.Value.CreatorID))
168 } 168 {
169 kvp.Value.CreatorID = masterAvatarId;
170 }
171 }
169 } 172 }
170 173
171 if (m_scene.AddRestoredSceneObject(sceneObject, true, false)) 174 if (m_scene.AddRestoredSceneObject(sceneObject, true, false))
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index 1d122d2..8120c62 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -249,7 +249,7 @@ namespace OpenSim.Region.Environment.Scenes
249 { 249 {
250 Vector3 a = new Vector3(m_CameraAtAxis.X, m_CameraAtAxis.Y, 0); 250 Vector3 a = new Vector3(m_CameraAtAxis.X, m_CameraAtAxis.Y, 0);
251 251
252 if(a == Vector3.Zero) 252 if (a == Vector3.Zero)
253 return a; 253 return a;
254 254
255 return Util.GetNormalizedVector(a); 255 return Util.GetNormalizedVector(a);
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 447a4fb..428aeb6 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -7366,7 +7366,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
7366 7366
7367 // now send to all (non-child) agents 7367 // now send to all (non-child) agents
7368 List<ScenePresence> agents = World.GetAvatars(); 7368 List<ScenePresence> agents = World.GetAvatars();
7369 foreach(ScenePresence agent in agents) 7369 foreach (ScenePresence agent in agents)
7370 { 7370 {
7371 agent.ControllingClient.SendParcelMediaUpdate(landData.MediaURL, 7371 agent.ControllingClient.SendParcelMediaUpdate(landData.MediaURL,
7372 landData.MediaID, 7372 landData.MediaID,
@@ -7377,7 +7377,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
7377 1); // TODO do some LOOP logic here 7377 1); // TODO do some LOOP logic here
7378 } 7378 }
7379 } 7379 }
7380 else if(!presence.IsChildAgent) 7380 else if (!presence.IsChildAgent)
7381 { 7381 {
7382 // we only send to one (root) agent 7382 // we only send to one (root) agent
7383 presence.ControllingClient.SendParcelMediaUpdate(url, 7383 presence.ControllingClient.SendParcelMediaUpdate(url,
@@ -7397,14 +7397,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
7397 { 7397 {
7398 // send to all (non-child) agents 7398 // send to all (non-child) agents
7399 List<ScenePresence> agents = World.GetAvatars(); 7399 List<ScenePresence> agents = World.GetAvatars();
7400 foreach(ScenePresence agent in agents) 7400 foreach (ScenePresence agent in agents)
7401 { 7401 {
7402 agent.ControllingClient.SendParcelMediaCommand(0x4, // TODO what is this? 7402 agent.ControllingClient.SendParcelMediaCommand(0x4, // TODO what is this?
7403 (ParcelMediaCommandEnum)commandToSend, 7403 (ParcelMediaCommandEnum)commandToSend,
7404 time); 7404 time);
7405 } 7405 }
7406 } 7406 }
7407 else if(!presence.IsChildAgent) 7407 else if (!presence.IsChildAgent)
7408 { 7408 {
7409 presence.ControllingClient.SendParcelMediaCommand(0x4, // TODO what is this? 7409 presence.ControllingClient.SendParcelMediaCommand(0x4, // TODO what is this?
7410 (ParcelMediaCommandEnum)commandToSend, 7410 (ParcelMediaCommandEnum)commandToSend,