diff options
author | lbsa71 | 2007-12-27 14:00:30 +0000 |
---|---|---|
committer | lbsa71 | 2007-12-27 14:00:30 +0000 |
commit | 87e2a694e200f5774f71d38041247912b5ccf98d (patch) | |
tree | e5669eb91e90e378442353242821ba3dad0f1ab2 /OpenSim/Region/Environment/Scenes | |
parent | * Fixed the matching logic error on the LLQuat to axiom quat :P (diff) | |
download | opensim-SC_OLD-87e2a694e200f5774f71d38041247912b5ccf98d.zip opensim-SC_OLD-87e2a694e200f5774f71d38041247912b5ccf98d.tar.gz opensim-SC_OLD-87e2a694e200f5774f71d38041247912b5ccf98d.tar.bz2 opensim-SC_OLD-87e2a694e200f5774f71d38041247912b5ccf98d.tar.xz |
* AssetServerBase: _ProcessRequest is now called GetAsset
* PrimitiveBaseShape: The textures are now exposed as a 'TextureEntry Textures'; all serialization still using the 'byte[] TextureEntry' for backwards compatibility.
* Scene: Re-added AddTree, since the Tree type isn't gone from libsl, merely relocated.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.cs | 7 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneObjectPart.cs | 2 |
2 files changed, 4 insertions, 5 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs index 2a25316..0144c4c 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.cs | |||
@@ -1006,19 +1006,18 @@ namespace OpenSim.Region.Environment.Scenes | |||
1006 | } | 1006 | } |
1007 | } | 1007 | } |
1008 | 1008 | ||
1009 | /* Tree has been removed from libSL | ||
1010 | public void AddTree(LLVector3 scale, LLQuaternion rotation, LLVector3 position, | 1009 | public void AddTree(LLVector3 scale, LLQuaternion rotation, LLVector3 position, |
1011 | libsecondlife.ObjectManager.Tree treeType, bool newTree) | 1010 | Tree treeType, bool newTree) |
1012 | { | 1011 | { |
1013 | PrimitiveBaseShape treeShape = new PrimitiveBaseShape(); | 1012 | PrimitiveBaseShape treeShape = new PrimitiveBaseShape(); |
1014 | treeShape.PathCurve = 16; | 1013 | treeShape.PathCurve = 16; |
1015 | treeShape.PathEnd = 49900; | 1014 | treeShape.PathEnd = 49900; |
1016 | treeShape.PCode = newTree ? (byte)libsecondlife.ObjectManager.PCode.NewTree : (byte)libsecondlife.ObjectManager.PCode.Tree; | 1015 | treeShape.PCode = newTree ? (byte)PCode.NewTree : (byte)PCode.Tree; |
1017 | treeShape.Scale = scale; | 1016 | treeShape.Scale = scale; |
1018 | treeShape.State = (byte)treeType; | 1017 | treeShape.State = (byte)treeType; |
1019 | AddNewPrim(LLUUID.Random(), position, rotation, treeShape); | 1018 | AddNewPrim(LLUUID.Random(), position, rotation, treeShape); |
1020 | } | 1019 | } |
1021 | */ | 1020 | |
1022 | public void RemovePrim(uint localID, LLUUID avatar_deleter) | 1021 | public void RemovePrim(uint localID, LLUUID avatar_deleter) |
1023 | { | 1022 | { |
1024 | m_innerScene.RemovePrim(localID, avatar_deleter); | 1023 | m_innerScene.RemovePrim(localID, avatar_deleter); |
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs index e8ff007..29a163b 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs | |||
@@ -1323,7 +1323,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
1323 | /// <param name="textureEntry"></param> | 1323 | /// <param name="textureEntry"></param> |
1324 | public void UpdateTextureEntry(byte[] textureEntry) | 1324 | public void UpdateTextureEntry(byte[] textureEntry) |
1325 | { | 1325 | { |
1326 | m_shape.TextureEntry = textureEntry; | 1326 | m_shape.Textures = new LLObject.TextureEntry( textureEntry, 0, textureEntry.Length ); |
1327 | ScheduleFullUpdate(); | 1327 | ScheduleFullUpdate(); |
1328 | } | 1328 | } |
1329 | 1329 | ||