diff options
author | Justin Clarke Casey | 2009-03-05 19:32:27 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2009-03-05 19:32:27 +0000 |
commit | 6c735e0828063dd6e83dc6bd4c35266dd948035e (patch) | |
tree | 9593d8bf7bd700d364924d1d13d51bd564cebb8d /OpenSim/Region/Framework | |
parent | * remove now unused serialization code (diff) | |
download | opensim-SC_OLD-6c735e0828063dd6e83dc6bd4c35266dd948035e.zip opensim-SC_OLD-6c735e0828063dd6e83dc6bd4c35266dd948035e.tar.gz opensim-SC_OLD-6c735e0828063dd6e83dc6bd4c35266dd948035e.tar.bz2 opensim-SC_OLD-6c735e0828063dd6e83dc6bd4c35266dd948035e.tar.xz |
* Replace some string to byte conversions for object/item name/description fields with the LLUtil function that prevents the max string size from being breached
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs index db322b4..df6672d 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs | |||
@@ -68,8 +68,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
68 | EventManager.TriggerOnChatBroadcast(this, args); | 68 | EventManager.TriggerOnChatBroadcast(this, args); |
69 | else | 69 | else |
70 | EventManager.TriggerOnChatFromWorld(this, args); | 70 | EventManager.TriggerOnChatFromWorld(this, args); |
71 | |||
72 | } | 71 | } |
72 | |||
73 | /// <summary> | 73 | /// <summary> |
74 | /// | 74 | /// |
75 | /// </summary> | 75 | /// </summary> |
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs index 45ecdc5..4f61342 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |||
@@ -2190,7 +2190,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
2190 | 2190 | ||
2191 | private void LinkNonRootPart(SceneObjectPart part, Vector3 oldGroupPosition, Quaternion oldGroupRotation, int linkNum) | 2191 | private void LinkNonRootPart(SceneObjectPart part, Vector3 oldGroupPosition, Quaternion oldGroupRotation, int linkNum) |
2192 | { | 2192 | { |
2193 | |||
2194 | Quaternion parentRot = oldGroupRotation; | 2193 | Quaternion parentRot = oldGroupRotation; |
2195 | Quaternion oldRot = part.RotationOffset; | 2194 | Quaternion oldRot = part.RotationOffset; |
2196 | Quaternion worldRot = parentRot * oldRot; | 2195 | Quaternion worldRot = parentRot * oldRot; |