aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
authordahlia2010-10-26 21:20:18 -0700
committerdahlia2010-10-26 21:20:18 -0700
commita4e95c0717cf5bf8e1b7a33b2d95d58e0bacf389 (patch)
tree8e10af353afa5c301a250b2e3017234cee02cbe7 /OpenSim/Region/Framework
parentOverload Scene.NewUserConnection() to facilitate NPCs and other region specif... (diff)
parentFormatting cleanup. (diff)
downloadopensim-SC_OLD-a4e95c0717cf5bf8e1b7a33b2d95d58e0bacf389.zip
opensim-SC_OLD-a4e95c0717cf5bf8e1b7a33b2d95d58e0bacf389.tar.gz
opensim-SC_OLD-a4e95c0717cf5bf8e1b7a33b2d95d58e0bacf389.tar.bz2
opensim-SC_OLD-a4e95c0717cf5bf8e1b7a33b2d95d58e0bacf389.tar.xz
Merge branch 'master' of ssh://MyConnection01/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r--OpenSim/Region/Framework/Scenes/EventManager.cs6
-rw-r--r--OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs2
2 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/Framework/Scenes/EventManager.cs b/OpenSim/Region/Framework/Scenes/EventManager.cs
index 4feb3fc..c321a15 100644
--- a/OpenSim/Region/Framework/Scenes/EventManager.cs
+++ b/OpenSim/Region/Framework/Scenes/EventManager.cs
@@ -296,7 +296,7 @@ namespace OpenSim.Region.Framework.Scenes
296 /// ChatToClientsEvent is triggered via ChatModule (or 296 /// ChatToClientsEvent is triggered via ChatModule (or
297 /// substitutes thereof) when a chat message is actually sent to clients. Clients will only be sent a 297 /// substitutes thereof) when a chat message is actually sent to clients. Clients will only be sent a
298 /// received chat message if they satisfy various conditions (within audible range, etc.) 298 /// received chat message if they satisfy various conditions (within audible range, etc.)
299 /// </summary> 299 /// </summary>
300 public delegate void ChatToClientsEvent( 300 public delegate void ChatToClientsEvent(
301 UUID senderID, HashSet<UUID> receiverIDs, 301 UUID senderID, HashSet<UUID> receiverIDs,
302 string message, ChatTypeEnum type, Vector3 fromPos, string fromName, 302 string message, ChatTypeEnum type, Vector3 fromPos, string fromName,
@@ -1636,8 +1636,8 @@ namespace OpenSim.Region.Framework.Scenes
1636 e.Message, e.StackTrace); 1636 e.Message, e.StackTrace);
1637 } 1637 }
1638 } 1638 }
1639 } 1639 }
1640 } 1640 }
1641 1641
1642 public void TriggerOnChatBroadcast(Object sender, OSChatMessage chat) 1642 public void TriggerOnChatBroadcast(Object sender, OSChatMessage chat)
1643 { 1643 {
diff --git a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
index 95908fc..e661ca9 100644
--- a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
+++ b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
@@ -804,7 +804,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
804 private static void ProcessShpTextureEntry(PrimitiveBaseShape shp, XmlTextReader reader) 804 private static void ProcessShpTextureEntry(PrimitiveBaseShape shp, XmlTextReader reader)
805 { 805 {
806 byte[] teData = Convert.FromBase64String(reader.ReadElementString("TextureEntry")); 806 byte[] teData = Convert.FromBase64String(reader.ReadElementString("TextureEntry"));
807 shp.Textures = new Primitive.TextureEntry(teData, 0, teData.Length); 807 shp.Textures = new Primitive.TextureEntry(teData, 0, teData.Length);
808 } 808 }
809 809
810 private static void ProcessShpExtraParams(PrimitiveBaseShape shp, XmlTextReader reader) 810 private static void ProcessShpExtraParams(PrimitiveBaseShape shp, XmlTextReader reader)