aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/OpenSim.Region/World/Entities/Primitive.cs
diff options
context:
space:
mode:
authorMW2007-06-12 15:53:19 +0000
committerMW2007-06-12 15:53:19 +0000
commit585f9f0d549e5ef9f4040de206a2376528d2c63f (patch)
tree7f73eb5d62d97e837c08af9f6ba9ded99b792288 /OpenSim/OpenSim.Region/World/Entities/Primitive.cs
parentDeleted old AssetCache.cs file. (diff)
downloadopensim-SC-585f9f0d549e5ef9f4040de206a2376528d2c63f.zip
opensim-SC-585f9f0d549e5ef9f4040de206a2376528d2c63f.tar.gz
opensim-SC-585f9f0d549e5ef9f4040de206a2376528d2c63f.tar.bz2
opensim-SC-585f9f0d549e5ef9f4040de206a2376528d2c63f.tar.xz
Work on Primitive class.
Diffstat (limited to '')
-rw-r--r--OpenSim/OpenSim.Region/World/Entities/Primitive.cs23
1 files changed, 20 insertions, 3 deletions
diff --git a/OpenSim/OpenSim.Region/World/Entities/Primitive.cs b/OpenSim/OpenSim.Region/World/Entities/Primitive.cs
index 0680eb3..3d915a1 100644
--- a/OpenSim/OpenSim.Region/World/Entities/Primitive.cs
+++ b/OpenSim/OpenSim.Region/World/Entities/Primitive.cs
@@ -93,7 +93,7 @@ namespace OpenSim.Region
93 /// <param name="clientThreads"></param> 93 /// <param name="clientThreads"></param>
94 /// <param name="regionHandle"></param> 94 /// <param name="regionHandle"></param>
95 /// <param name="world"></param> 95 /// <param name="world"></param>
96 public Primitive(Dictionary<uint, IClientAPI> clientThreads, ulong regionHandle, World world) 96 public Primitive( ulong regionHandle, World world)
97 { 97 {
98 // m_clientThreads = clientThreads; 98 // m_clientThreads = clientThreads;
99 m_regionHandle = regionHandle; 99 m_regionHandle = regionHandle;
@@ -104,13 +104,30 @@ namespace OpenSim.Region
104 /// <summary> 104 /// <summary>
105 /// 105 ///
106 /// </summary> 106 /// </summary>
107 /// <param name="regionHandle"></param>
108 /// <param name="world"></param>
109 /// <param name="addPacket"></param>
110 /// <param name="ownerID"></param>
111 /// <param name="localID"></param>
112 public Primitive(ulong regionHandle, World world, ObjectAddPacket addPacket, LLUUID ownerID, uint localID)
113 {
114 // m_clientThreads = clientThreads;
115 m_regionHandle = regionHandle;
116 m_world = world;
117 inventoryItems = new Dictionary<LLUUID, InventoryItem>();
118 this.CreateFromPacket(addPacket, ownerID, localID);
119 }
120
121 /// <summary>
122 ///
123 /// </summary>
107 /// <param name="clientThreads"></param> 124 /// <param name="clientThreads"></param>
108 /// <param name="regionHandle"></param> 125 /// <param name="regionHandle"></param>
109 /// <param name="world"></param> 126 /// <param name="world"></param>
110 /// <param name="owner"></param> 127 /// <param name="owner"></param>
111 /// <param name="fullID"></param> 128 /// <param name="fullID"></param>
112 /// <param name="localID"></param> 129 /// <param name="localID"></param>
113 public Primitive(Dictionary<uint, IClientAPI> clientThreads, ulong regionHandle, World world, LLUUID owner, LLUUID fullID, uint localID) 130 public Primitive( ulong regionHandle, World world, LLUUID owner, LLUUID fullID, uint localID)
114 { 131 {
115 // m_clientThreads = clientThreads; 132 // m_clientThreads = clientThreads;
116 m_regionHandle = regionHandle; 133 m_regionHandle = regionHandle;
@@ -132,7 +149,7 @@ namespace OpenSim.Region
132 /// <param name="owner"></param> 149 /// <param name="owner"></param>
133 /// <param name="localID"></param> 150 /// <param name="localID"></param>
134 /// <param name="position"></param> 151 /// <param name="position"></param>
135 public Primitive(Dictionary<uint, IClientAPI> clientThreads, ulong regionHandle, World world, LLUUID owner, uint localID, LLVector3 position) 152 public Primitive( ulong regionHandle, World world, LLUUID owner, uint localID, LLVector3 position)
136 { 153 {
137 //m_clientThreads = clientThreads; 154 //m_clientThreads = clientThreads;
138 m_regionHandle = regionHandle; 155 m_regionHandle = regionHandle;