aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorlbsa712007-08-06 12:49:08 +0000
committerlbsa712007-08-06 12:49:08 +0000
commit95de99ff0a2f1d810c3f3dffc7a55cee98d5f28f (patch)
treea441b5906df6b6a665c91696d38587f3f8c8d615 /OpenSim/Framework
parent* SimpleApp works again: (diff)
downloadopensim-SC_OLD-95de99ff0a2f1d810c3f3dffc7a55cee98d5f28f.zip
opensim-SC_OLD-95de99ff0a2f1d810c3f3dffc7a55cee98d5f28f.tar.gz
opensim-SC_OLD-95de99ff0a2f1d810c3f3dffc7a55cee98d5f28f.tar.bz2
opensim-SC_OLD-95de99ff0a2f1d810c3f3dffc7a55cee98d5f28f.tar.xz
* Now we have boxes. Yay!
* Removed unused SendPrimitiveToClient that didn't have rot.
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/General/Interfaces/IClientAPI.cs3
-rw-r--r--OpenSim/Framework/General/NullClientAPI.cs3
-rw-r--r--OpenSim/Framework/General/Types/PrimitiveBaseShape.cs8
3 files changed, 5 insertions, 9 deletions
diff --git a/OpenSim/Framework/General/Interfaces/IClientAPI.cs b/OpenSim/Framework/General/Interfaces/IClientAPI.cs
index 5320196..da4e03b 100644
--- a/OpenSim/Framework/General/Interfaces/IClientAPI.cs
+++ b/OpenSim/Framework/General/Interfaces/IClientAPI.cs
@@ -199,8 +199,7 @@ namespace OpenSim.Framework.Interfaces
199 void SendAvatarTerseUpdate(ulong regionHandle, ushort timeDilation, uint localID, LLVector3 position, LLVector3 velocity); 199 void SendAvatarTerseUpdate(ulong regionHandle, ushort timeDilation, uint localID, LLVector3 position, LLVector3 velocity);
200 200
201 void AttachObject(uint localID, LLQuaternion rotation, byte attachPoint); 201 void AttachObject(uint localID, LLQuaternion rotation, byte attachPoint);
202 void SendPrimitiveToClient(ulong regionHandle, ushort timeDilation, uint localID, PrimitiveBaseShape primShape, LLVector3 pos, LLQuaternion rotation, uint flags, LLUUID objectID, LLUUID ownerID, string text, uint parentID, byte[] particleSystem); 202 void SendPrimitiveToClient(ulong regionHandle, ushort timeDilation, uint localID, PrimitiveBaseShape primShape, LLVector3 pos, uint flags, LLUUID objectID, LLUUID ownerID, string text, uint parentID, byte[] particleSystem, LLQuaternion rotation);
203 void SendPrimitiveToClient(ulong regionHandle, ushort timeDilation, uint localID, PrimitiveBaseShape primShape, LLVector3 pos, uint flags, LLUUID objectID, LLUUID ownerID, string text, uint parentID, byte[] particleSystem);
204 void SendPrimTerseUpdate(ulong regionHandle, ushort timeDilation, uint localID, LLVector3 position, LLQuaternion rotation); 203 void SendPrimTerseUpdate(ulong regionHandle, ushort timeDilation, uint localID, LLVector3 position, LLQuaternion rotation);
205 204
206 void SendInventoryFolderDetails(LLUUID ownerID, LLUUID folderID, List<InventoryItemBase> items); 205 void SendInventoryFolderDetails(LLUUID ownerID, LLUUID folderID, List<InventoryItemBase> items);
diff --git a/OpenSim/Framework/General/NullClientAPI.cs b/OpenSim/Framework/General/NullClientAPI.cs
index 017828e..bc98cc1 100644
--- a/OpenSim/Framework/General/NullClientAPI.cs
+++ b/OpenSim/Framework/General/NullClientAPI.cs
@@ -130,8 +130,7 @@ namespace OpenSim.Framework
130 public virtual void SendAvatarTerseUpdate(ulong regionHandle, ushort timeDilation, uint localID, LLVector3 position, LLVector3 velocity){} 130 public virtual void SendAvatarTerseUpdate(ulong regionHandle, ushort timeDilation, uint localID, LLVector3 position, LLVector3 velocity){}
131 131
132 public virtual void AttachObject(uint localID, LLQuaternion rotation, byte attachPoint){} 132 public virtual void AttachObject(uint localID, LLQuaternion rotation, byte attachPoint){}
133 public virtual void SendPrimitiveToClient(ulong regionHandle, ushort timeDilation, uint localID, PrimitiveBaseShape primShape, LLVector3 pos, LLQuaternion rotation, uint flags, LLUUID objectID, LLUUID ownerID, string text, uint parentID, byte[] particleSystem){} 133 public virtual void SendPrimitiveToClient(ulong regionHandle, ushort timeDilation, uint localID, PrimitiveBaseShape primShape, LLVector3 pos, uint flags, LLUUID objectID, LLUUID ownerID, string text, uint parentID, byte[] particleSystem, LLQuaternion rotation){}
134 public virtual void SendPrimitiveToClient(ulong regionHandle, ushort timeDilation, uint localID, PrimitiveBaseShape primShape, LLVector3 pos, uint flags, LLUUID objectID, LLUUID ownerID, string text, uint parentID, byte[] particleSystem){}
135 public virtual void SendPrimTerseUpdate(ulong regionHandle, ushort timeDilation, uint localID, LLVector3 position, LLQuaternion rotation){} 134 public virtual void SendPrimTerseUpdate(ulong regionHandle, ushort timeDilation, uint localID, LLVector3 position, LLQuaternion rotation){}
136 135
137 public virtual void SendInventoryFolderDetails(LLUUID ownerID, LLUUID folderID, List<InventoryItemBase> items){} 136 public virtual void SendInventoryFolderDetails(LLUUID ownerID, LLUUID folderID, List<InventoryItemBase> items){}
diff --git a/OpenSim/Framework/General/Types/PrimitiveBaseShape.cs b/OpenSim/Framework/General/Types/PrimitiveBaseShape.cs
index 1938a90..340947b 100644
--- a/OpenSim/Framework/General/Types/PrimitiveBaseShape.cs
+++ b/OpenSim/Framework/General/Types/PrimitiveBaseShape.cs
@@ -73,7 +73,7 @@ namespace OpenSim.Framework.Types
73 ExtraParams = new byte[1]; 73 ExtraParams = new byte[1];
74 TextureEntry = m_defaultTextureEntry; 74 TextureEntry = m_defaultTextureEntry;
75 } 75 }
76 76
77 //void returns need to change of course 77 //void returns need to change of course
78 public virtual void GetMesh() 78 public virtual void GetMesh()
79 { 79 {
@@ -94,6 +94,8 @@ namespace OpenSim.Framework.Types
94 PathCurve = 16; 94 PathCurve = 16;
95 ProfileCurve = 1; 95 ProfileCurve = 1;
96 PCode = 9; 96 PCode = 9;
97 PathScaleX = 100;
98 PathScaleY = 100;
97 } 99 }
98 100
99 public static BoxShape Default 101 public static BoxShape Default
@@ -103,10 +105,6 @@ namespace OpenSim.Framework.Types
103 BoxShape boxShape = new BoxShape(); 105 BoxShape boxShape = new BoxShape();
104 106
105 boxShape.Scale = new LLVector3(0.5f, 0.5f, 0.5f); 107 boxShape.Scale = new LLVector3(0.5f, 0.5f, 0.5f);
106
107 //boxShape.PathTaperX = 1;
108 //boxShape.PathTaperY = 1;
109 boxShape.PathSkew = 1;
110 108
111 return boxShape; 109 return boxShape;
112 } 110 }