aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorTeravus Ovares2009-03-27 22:13:09 +0000
committerTeravus Ovares2009-03-27 22:13:09 +0000
commit52c482a7a7b297715cbcd7460edb1ad07d7a06c6 (patch)
tree67fbfb7d080f5c6d5575c1be39d8c92a46ab6360 /OpenSim/Framework
parent* refactor: call some EventManager triggers directly rather than through scene (diff)
downloadopensim-SC-52c482a7a7b297715cbcd7460edb1ad07d7a06c6.zip
opensim-SC-52c482a7a7b297715cbcd7460edb1ad07d7a06c6.tar.gz
opensim-SC-52c482a7a7b297715cbcd7460edb1ad07d7a06c6.tar.bz2
opensim-SC-52c482a7a7b297715cbcd7460edb1ad07d7a06c6.tar.xz
* This updates LibOMV to the current release 0.6.0 on March 19 2009
* Important: HttpServer.dll was changed to HttpServer_OpenSim.dll so that the HttpServer references do not conflict if you've copied the OpenMetaverse.Http.dll and requirements to the OpenSimulator bin folder. This means that if you reference HttpServer.dll in any projects, you will need to change the reference to HttpServer_OpenSim.dll. It still uses the Same HttpServer namespace though.
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/AvatarAppearance.cs2
-rw-r--r--OpenSim/Framework/PrimitiveBaseShape.cs2
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Framework/AvatarAppearance.cs b/OpenSim/Framework/AvatarAppearance.cs
index 8d0d699..ec31018 100644
--- a/OpenSim/Framework/AvatarAppearance.cs
+++ b/OpenSim/Framework/AvatarAppearance.cs
@@ -386,7 +386,7 @@ namespace OpenSim.Framework
386 h["owner"] = Owner.ToString(); 386 h["owner"] = Owner.ToString();
387 h["serial"] = Serial.ToString(); 387 h["serial"] = Serial.ToString();
388 h["visual_params"] = VisualParams; 388 h["visual_params"] = VisualParams;
389 h["texture"] = Texture.ToBytes(); 389 h["texture"] = Texture.GetBytes();
390 h["avatar_height"] = AvatarHeight.ToString(); 390 h["avatar_height"] = AvatarHeight.ToString();
391 h["body_item"] = BodyItem.ToString(); 391 h["body_item"] = BodyItem.ToString();
392 h["body_asset"] = BodyAsset.ToString(); 392 h["body_asset"] = BodyAsset.ToString();
diff --git a/OpenSim/Framework/PrimitiveBaseShape.cs b/OpenSim/Framework/PrimitiveBaseShape.cs
index 2dfc321..300e37c 100644
--- a/OpenSim/Framework/PrimitiveBaseShape.cs
+++ b/OpenSim/Framework/PrimitiveBaseShape.cs
@@ -201,7 +201,7 @@ namespace OpenSim.Framework
201 return new Primitive.TextureEntry(m_textureEntry, 0, m_textureEntry.Length); 201 return new Primitive.TextureEntry(m_textureEntry, 0, m_textureEntry.Length);
202 } 202 }
203 203
204 set { m_textureEntry = value.ToBytes(); } 204 set { m_textureEntry = value.GetBytes(); }
205 } 205 }
206 206
207 public byte[] TextureEntry 207 public byte[] TextureEntry