aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/AgentCircuitData.cs2
-rw-r--r--OpenSim/Framework/AvatarAppearance.cs21
-rw-r--r--OpenSim/Framework/ChildAgentDataUpdate.cs2
-rw-r--r--OpenSim/Framework/ISceneEntity.cs1
-rw-r--r--OpenSim/Framework/ISceneObject.cs6
5 files changed, 23 insertions, 9 deletions
diff --git a/OpenSim/Framework/AgentCircuitData.cs b/OpenSim/Framework/AgentCircuitData.cs
index 54e1bf7..57fb808 100644
--- a/OpenSim/Framework/AgentCircuitData.cs
+++ b/OpenSim/Framework/AgentCircuitData.cs
@@ -296,7 +296,7 @@ namespace OpenSim.Framework
296 if (args["start_pos"] != null) 296 if (args["start_pos"] != null)
297 Vector3.TryParse(args["start_pos"].AsString(), out startpos); 297 Vector3.TryParse(args["start_pos"].AsString(), out startpos);
298 298
299 m_log.InfoFormat("[AGENTCIRCUITDATA]: agentid={0}, child={1}, startpos={2}", AgentID, child, startpos); 299 //m_log.InfoFormat("[AGENTCIRCUITDATA]: agentid={0}, child={1}, startpos={2}", AgentID, child, startpos);
300 300
301 try 301 try
302 { 302 {
diff --git a/OpenSim/Framework/AvatarAppearance.cs b/OpenSim/Framework/AvatarAppearance.cs
index 6c2a954..4f598b0 100644
--- a/OpenSim/Framework/AvatarAppearance.cs
+++ b/OpenSim/Framework/AvatarAppearance.cs
@@ -249,10 +249,12 @@ namespace OpenSim.Framework
249 } 249 }
250 250
251 /// <summary> 251 /// <summary>
252 /// Set up appearance textures. 252 /// Set up appearance texture ids.
253 /// Returns boolean that indicates whether the new entries actually change the
254 /// existing values.
255 /// </summary> 253 /// </summary>
254 /// <returns>
255 /// True if any existing texture id was changed by the new data.
256 /// False if there were no changes or no existing texture ids.
257 /// </returns>
256 public virtual bool SetTextureEntries(Primitive.TextureEntry textureEntry) 258 public virtual bool SetTextureEntries(Primitive.TextureEntry textureEntry)
257 { 259 {
258 if (textureEntry == null) 260 if (textureEntry == null)
@@ -269,25 +271,30 @@ namespace OpenSim.Framework
269 271
270 if (newface == null) 272 if (newface == null)
271 { 273 {
272 if (oldface == null) continue; 274 if (oldface == null)
275 continue;
273 } 276 }
274 else 277 else
275 { 278 {
276 if (oldface != null && oldface.TextureID == newface.TextureID) continue; 279 if (oldface != null && oldface.TextureID == newface.TextureID)
280 continue;
277 } 281 }
278 282
279 changed = true; 283 changed = true;
280 } 284 }
281 285
282 m_texture = textureEntry; 286 m_texture = textureEntry;
287
283 return changed; 288 return changed;
284 } 289 }
285 290
286 /// <summary> 291 /// <summary>
287 /// Set up visual parameters for the avatar and refresh the avatar height 292 /// Set up visual parameters for the avatar and refresh the avatar height
288 /// Returns boolean that indicates whether the new entries actually change the
289 /// existing values.
290 /// </summary> 293 /// </summary>
294 /// <returns>
295 /// True if any existing visual parameter was changed by the new data.
296 /// False if there were no changes or no existing visual parameters.
297 /// </returns>
291 public virtual bool SetVisualParams(byte[] visualParams) 298 public virtual bool SetVisualParams(byte[] visualParams)
292 { 299 {
293 if (visualParams == null) 300 if (visualParams == null)
diff --git a/OpenSim/Framework/ChildAgentDataUpdate.cs b/OpenSim/Framework/ChildAgentDataUpdate.cs
index 1f22136..6d048f4 100644
--- a/OpenSim/Framework/ChildAgentDataUpdate.cs
+++ b/OpenSim/Framework/ChildAgentDataUpdate.cs
@@ -478,7 +478,7 @@ namespace OpenSim.Framework
478 /// <param name="hash"></param> 478 /// <param name="hash"></param>
479 public virtual void Unpack(OSDMap args, IScene scene) 479 public virtual void Unpack(OSDMap args, IScene scene)
480 { 480 {
481 m_log.InfoFormat("[CHILDAGENTDATAUPDATE] Unpack data"); 481 //m_log.InfoFormat("[CHILDAGENTDATAUPDATE] Unpack data");
482 482
483 if (args.ContainsKey("region_id")) 483 if (args.ContainsKey("region_id"))
484 UUID.TryParse(args["region_id"].AsString(), out RegionID); 484 UUID.TryParse(args["region_id"].AsString(), out RegionID);
diff --git a/OpenSim/Framework/ISceneEntity.cs b/OpenSim/Framework/ISceneEntity.cs
index c0ea302..a9f21d2 100644
--- a/OpenSim/Framework/ISceneEntity.cs
+++ b/OpenSim/Framework/ISceneEntity.cs
@@ -34,6 +34,7 @@ namespace OpenSim.Framework
34 string Name { get; set; } 34 string Name { get; set; }
35 UUID UUID { get; } 35 UUID UUID { get; }
36 uint LocalId { get; } 36 uint LocalId { get; }
37
37 Vector3 AbsolutePosition { get; } 38 Vector3 AbsolutePosition { get; }
38 } 39 }
39} 40}
diff --git a/OpenSim/Framework/ISceneObject.cs b/OpenSim/Framework/ISceneObject.cs
index 18631f1..afac9b8 100644
--- a/OpenSim/Framework/ISceneObject.cs
+++ b/OpenSim/Framework/ISceneObject.cs
@@ -33,6 +33,12 @@ namespace OpenSim.Framework
33 public interface ISceneObject 33 public interface ISceneObject
34 { 34 {
35 UUID UUID { get; } 35 UUID UUID { get; }
36
37 /// <summary>
38 /// The owner of this object.
39 /// </summary>
40 UUID OwnerID { get; set; }
41
36 ISceneObject CloneForNewScene(); 42 ISceneObject CloneForNewScene();
37 string ToXml2(); 43 string ToXml2();
38 string ExtraToXmlString(); 44 string ExtraToXmlString();