aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/General/Interfaces/IClientAPI.cs2
-rw-r--r--OpenSim/Framework/General/Types/PrimitiveBaseShape.cs1
-rw-r--r--OpenSim/Framework/Servers/CheckSumServer.cs9
3 files changed, 8 insertions, 4 deletions
diff --git a/OpenSim/Framework/General/Interfaces/IClientAPI.cs b/OpenSim/Framework/General/Interfaces/IClientAPI.cs
index b5a0a0b..c3291c4 100644
--- a/OpenSim/Framework/General/Interfaces/IClientAPI.cs
+++ b/OpenSim/Framework/General/Interfaces/IClientAPI.cs
@@ -56,6 +56,7 @@ namespace OpenSim.Framework.Interfaces
56 public delegate void UpdatePrimTexture(uint localID, byte[] texture, IClientAPI remoteClient); 56 public delegate void UpdatePrimTexture(uint localID, byte[] texture, IClientAPI remoteClient);
57 public delegate void UpdateVector(uint localID, LLVector3 pos, IClientAPI remoteClient); 57 public delegate void UpdateVector(uint localID, LLVector3 pos, IClientAPI remoteClient);
58 public delegate void UpdatePrimRotation(uint localID, LLQuaternion rot, IClientAPI remoteClient); 58 public delegate void UpdatePrimRotation(uint localID, LLQuaternion rot, IClientAPI remoteClient);
59 public delegate void UpdatePrimGroupRotation(uint localID,LLVector3 pos, LLQuaternion rot, IClientAPI remoteClient);
59 public delegate void StatusChange(bool status); 60 public delegate void StatusChange(bool status);
60 public delegate void NewAvatar(IClientAPI remoteClient, LLUUID agentID, bool status); 61 public delegate void NewAvatar(IClientAPI remoteClient, LLUUID agentID, bool status);
61 public delegate void UpdateAgent(IClientAPI remoteClient, uint flags, LLQuaternion bodyRotation); 62 public delegate void UpdateAgent(IClientAPI remoteClient, uint flags, LLQuaternion bodyRotation);
@@ -100,6 +101,7 @@ namespace OpenSim.Framework.Interfaces
100 event UpdatePrimTexture OnUpdatePrimTexture; 101 event UpdatePrimTexture OnUpdatePrimTexture;
101 event UpdateVector OnUpdatePrimPosition; 102 event UpdateVector OnUpdatePrimPosition;
102 event UpdatePrimRotation OnUpdatePrimRotation; 103 event UpdatePrimRotation OnUpdatePrimRotation;
104 event UpdatePrimGroupRotation OnUpdatePrimGroupRotation;
103 event UpdateVector OnUpdatePrimScale; 105 event UpdateVector OnUpdatePrimScale;
104 event StatusChange OnChildAgentStatus; 106 event StatusChange OnChildAgentStatus;
105 event GenericCall2 OnStopMovement; 107 event GenericCall2 OnStopMovement;
diff --git a/OpenSim/Framework/General/Types/PrimitiveBaseShape.cs b/OpenSim/Framework/General/Types/PrimitiveBaseShape.cs
index 1357e06..a6671d1 100644
--- a/OpenSim/Framework/General/Types/PrimitiveBaseShape.cs
+++ b/OpenSim/Framework/General/Types/PrimitiveBaseShape.cs
@@ -12,6 +12,7 @@ namespace OpenSim.Framework.Types
12 Prism, 12 Prism,
13 Scuplted, 13 Scuplted,
14 Cylinder, 14 Cylinder,
15 Foliage,
15 Unknown 16 Unknown
16 } 17 }
17 18
diff --git a/OpenSim/Framework/Servers/CheckSumServer.cs b/OpenSim/Framework/Servers/CheckSumServer.cs
index 104de94..89ec095 100644
--- a/OpenSim/Framework/Servers/CheckSumServer.cs
+++ b/OpenSim/Framework/Servers/CheckSumServer.cs
@@ -26,8 +26,8 @@
26* 26*
27*/ 27*/
28namespace OpenSim.Framework.Servers 28namespace OpenSim.Framework.Servers
29{ 29{/*
30/* public class CheckSumServer : UDPServerBase 30 public class CheckSumServer : UDPServerBase
31 { 31 {
32 //protected ConsoleBase m_log; 32 //protected ConsoleBase m_log;
33 33
@@ -121,6 +121,7 @@ namespace OpenSim.Framework.Servers
121 { 121 {
122 this.Server.SendTo(buffer, size, flags, endp); 122 this.Server.SendTo(buffer, size, flags, endp);
123 } 123 }
124 * 124 * }
125 }*/ 125 */
126
126} \ No newline at end of file 127} \ No newline at end of file