aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorMelanie2011-04-21 23:06:01 +0100
committerMelanie2011-04-21 23:06:01 +0100
commit0c68fbdb1aa746d1f18242f921bd2605271c06db (patch)
treec5a35a5723f4c73821c20773d6bc2897b92dcce8 /OpenSim
parentAdd fix a minor bug (diff)
parentMerge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff)
downloadopensim-SC_OLD-0c68fbdb1aa746d1f18242f921bd2605271c06db.zip
opensim-SC_OLD-0c68fbdb1aa746d1f18242f921bd2605271c06db.tar.gz
opensim-SC_OLD-0c68fbdb1aa746d1f18242f921bd2605271c06db.tar.bz2
opensim-SC_OLD-0c68fbdb1aa746d1f18242f921bd2605271c06db.tar.xz
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs21
-rw-r--r--OpenSim/Region/Framework/Scenes/Serialization/CoalescedSceneObjectsSerializer.cs47
-rw-r--r--OpenSim/Region/Framework/Scenes/UuidGatherer.cs18
-rw-r--r--OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs27
-rw-r--r--OpenSim/Region/Physics/Meshing/Meshmerizer.cs3
-rw-r--r--OpenSim/Services/FreeswitchService/FreeswitchService.cs8
6 files changed, 81 insertions, 43 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs
index 0b545c4..9f0ac4f 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs
@@ -77,16 +77,20 @@ namespace OpenSim.Region.Framework.Scenes
77 } 77 }
78 78
79 /// <summary> 79 /// <summary>
80 /// Add an inventory item to a prim in this group. 80 /// Add an inventory item from a user's inventory to a prim in this scene object.
81 /// </summary> 81 /// </summary>
82 /// <param name="remoteClient"></param> 82 /// <param name="remoteClient">The client adding the item.</param>
83 /// <param name="localID"></param> 83 /// <param name="localID">The local ID of the part receiving the add.</param>
84 /// <param name="item"></param> 84 /// <param name="item">The user inventory item being added.</param>
85 /// <param name="copyItemID">The item UUID that should be used by the new item.</param> 85 /// <param name="copyItemID">The item UUID that should be used by the new item.</param>
86 /// <returns></returns> 86 /// <returns></returns>
87 public bool AddInventoryItem(IClientAPI remoteClient, uint localID, 87 public bool AddInventoryItem(IClientAPI remoteClient, uint localID,
88 InventoryItemBase item, UUID copyItemID) 88 InventoryItemBase item, UUID copyItemID)
89 { 89 {
90// m_log.DebugFormat(
91// "[PRIM INVENTORY]: Adding inventory item {0} from {1} to part with local ID {2}",
92// item.Name, remoteClient.Name, localID);
93
90 UUID newItemId = (copyItemID != UUID.Zero) ? copyItemID : item.ID; 94 UUID newItemId = (copyItemID != UUID.Zero) ? copyItemID : item.ID;
91 95
92 SceneObjectPart part = GetChildPart(localID); 96 SceneObjectPart part = GetChildPart(localID);
@@ -128,15 +132,20 @@ namespace OpenSim.Region.Framework.Scenes
128 taskItem.GroupPermissions = item.GroupPermissions; 132 taskItem.GroupPermissions = item.GroupPermissions;
129 taskItem.NextPermissions = item.NextPermissions; 133 taskItem.NextPermissions = item.NextPermissions;
130 } 134 }
131 135
132 taskItem.Flags = item.Flags; 136 taskItem.Flags = item.Flags;
137
138// m_log.DebugFormat(
139// "[PRIM INVENTORY]: Flags are 0x{0:X} for item {1} added to part {2} by {3}",
140// taskItem.Flags, taskItem.Name, localID, remoteClient.Name);
141
133 // TODO: These are pending addition of those fields to TaskInventoryItem 142 // TODO: These are pending addition of those fields to TaskInventoryItem
134// taskItem.SalePrice = item.SalePrice; 143// taskItem.SalePrice = item.SalePrice;
135// taskItem.SaleType = item.SaleType; 144// taskItem.SaleType = item.SaleType;
136 taskItem.CreationDate = (uint)item.CreationDate; 145 taskItem.CreationDate = (uint)item.CreationDate;
137 146
138 bool addFromAllowedDrop = false; 147 bool addFromAllowedDrop = false;
139 if (remoteClient!=null) 148 if (remoteClient != null)
140 { 149 {
141 addFromAllowedDrop = remoteClient.AgentId != part.OwnerID; 150 addFromAllowedDrop = remoteClient.AgentId != part.OwnerID;
142 } 151 }
diff --git a/OpenSim/Region/Framework/Scenes/Serialization/CoalescedSceneObjectsSerializer.cs b/OpenSim/Region/Framework/Scenes/Serialization/CoalescedSceneObjectsSerializer.cs
index babcb54..55455cc 100644
--- a/OpenSim/Region/Framework/Scenes/Serialization/CoalescedSceneObjectsSerializer.cs
+++ b/OpenSim/Region/Framework/Scenes/Serialization/CoalescedSceneObjectsSerializer.cs
@@ -117,29 +117,40 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
117 { 117 {
118 using (XmlTextReader reader = new XmlTextReader(sr)) 118 using (XmlTextReader reader = new XmlTextReader(sr))
119 { 119 {
120 reader.Read(); 120 try
121 if (reader.Name != "CoalescedObject")
122 { 121 {
123// m_log.DebugFormat( 122 reader.Read();
124// "[COALESCED SCENE OBJECTS SERIALIZER]: TryFromXml() root element was {0} so returning false", 123 if (reader.Name != "CoalescedObject")
125// reader.Name); 124 {
125 // m_log.DebugFormat(
126 // "[COALESCED SCENE OBJECTS SERIALIZER]: TryFromXml() root element was {0} so returning false",
127 // reader.Name);
128
129 return false;
130 }
126 131
127 return false; 132 coa = new CoalescedSceneObjects(UUID.Zero);
128 } 133 reader.Read();
129 134
130 coa = new CoalescedSceneObjects(UUID.Zero); 135 while (reader.NodeType != XmlNodeType.EndElement && reader.Name != "CoalescedObject")
131 reader.Read();
132
133 while (reader.NodeType != XmlNodeType.EndElement && reader.Name != "CoalescedObject")
134 {
135 if (reader.Name == "SceneObjectGroup")
136 { 136 {
137 string soXml = reader.ReadOuterXml(); 137 if (reader.Name == "SceneObjectGroup")
138 coa.Add(SceneObjectSerializer.FromOriginalXmlFormat(soXml)); 138 {
139 string soXml = reader.ReadOuterXml();
140 coa.Add(SceneObjectSerializer.FromOriginalXmlFormat(soXml));
141 }
139 } 142 }
143
144 reader.ReadEndElement(); // CoalescedObject
140 } 145 }
141 146 catch (Exception e)
142 reader.ReadEndElement(); // CoalescedObject 147 {
148 m_log.ErrorFormat(
149 "[COALESCED SCENE OBJECTS SERIALIZER]: Deserialization of xml failed with {0} {1}",
150 e.Message, e.StackTrace);
151
152 return false;
153 }
143 } 154 }
144 } 155 }
145 156
diff --git a/OpenSim/Region/Framework/Scenes/UuidGatherer.cs b/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
index 3978a7d..fdfbc78 100644
--- a/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
+++ b/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
@@ -294,10 +294,20 @@ namespace OpenSim.Region.Framework.Scenes
294 if (null != objectAsset) 294 if (null != objectAsset)
295 { 295 {
296 string xml = Utils.BytesToString(objectAsset.Data); 296 string xml = Utils.BytesToString(objectAsset.Data);
297 SceneObjectGroup sog = SceneObjectSerializer.FromOriginalXmlFormat(xml); 297
298 298 CoalescedSceneObjects coa;
299 if (null != sog) 299 if (CoalescedSceneObjectsSerializer.TryFromXml(xml, out coa))
300 GatherAssetUuids(sog, assetUuids); 300 {
301 foreach (SceneObjectGroup sog in coa.Objects)
302 GatherAssetUuids(sog, assetUuids);
303 }
304 else
305 {
306 SceneObjectGroup sog = SceneObjectSerializer.FromOriginalXmlFormat(xml);
307
308 if (null != sog)
309 GatherAssetUuids(sog, assetUuids);
310 }
301 } 311 }
302 } 312 }
303 313
diff --git a/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs b/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs
index b59f6e1..4f1097e 100644
--- a/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs
@@ -391,7 +391,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
391 391
392 string r = LLSDHelpers.SerialiseLLSDReply(voiceAccountResponse); 392 string r = LLSDHelpers.SerialiseLLSDReply(voiceAccountResponse);
393 393
394 m_log.DebugFormat("[FreeSwitchVoice][PROVISIONVOICE]: avatar \"{0}\": {1}", avatarName, r); 394// m_log.DebugFormat("[FreeSwitchVoice][PROVISIONVOICE]: avatar \"{0}\": {1}", avatarName, r);
395 395
396 return r; 396 return r;
397 } 397 }
@@ -458,8 +458,8 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
458 458
459 if ((land.Flags & (uint)ParcelFlags.AllowVoiceChat) == 0) 459 if ((land.Flags & (uint)ParcelFlags.AllowVoiceChat) == 0)
460 { 460 {
461 m_log.DebugFormat("[FreeSwitchVoice][PARCELVOICE]: region \"{0}\": Parcel \"{1}\" ({2}): avatar \"{3}\": voice not enabled for parcel", 461// m_log.DebugFormat("[FreeSwitchVoice][PARCELVOICE]: region \"{0}\": Parcel \"{1}\" ({2}): avatar \"{3}\": voice not enabled for parcel",
462 scene.RegionInfo.RegionName, land.Name, land.LocalID, avatarName); 462// scene.RegionInfo.RegionName, land.Name, land.LocalID, avatarName);
463 channelUri = String.Empty; 463 channelUri = String.Empty;
464 } 464 }
465 else 465 else
@@ -474,8 +474,8 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
474 parcelVoiceInfo = new LLSDParcelVoiceInfoResponse(scene.RegionInfo.RegionName, land.LocalID, creds); 474 parcelVoiceInfo = new LLSDParcelVoiceInfoResponse(scene.RegionInfo.RegionName, land.LocalID, creds);
475 string r = LLSDHelpers.SerialiseLLSDReply(parcelVoiceInfo); 475 string r = LLSDHelpers.SerialiseLLSDReply(parcelVoiceInfo);
476 476
477 m_log.DebugFormat("[FreeSwitchVoice][PARCELVOICE]: region \"{0}\": Parcel \"{1}\" ({2}): avatar \"{3}\": {4}", 477// m_log.DebugFormat("[FreeSwitchVoice][PARCELVOICE]: region \"{0}\": Parcel \"{1}\" ({2}): avatar \"{3}\": {4}",
478 scene.RegionInfo.RegionName, land.Name, land.LocalID, avatarName, r); 478// scene.RegionInfo.RegionName, land.Name, land.LocalID, avatarName, r);
479 return r; 479 return r;
480 } 480 }
481 catch (Exception e) 481 catch (Exception e)
@@ -850,16 +850,25 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
850 850
851 Hashtable requestBody = ParseRequestBody((string)request["body"]); 851 Hashtable requestBody = ParseRequestBody((string)request["body"]);
852 852
853 string section = (string) requestBody["section"]; 853 string section = (string) requestBody["section"];
854
855 m_log.DebugFormat("[FreeSwitchVoice]: Received request for config section {0}", section);
856 854
857 if (section == "directory") 855 if (section == "directory")
856 {
857 string eventCallingFunction = (string)requestBody["Event-Calling-Function"];
858 m_log.DebugFormat(
859 "[FreeSwitchVoice]: Received request for config section directory, event calling function '{0}'",
860 eventCallingFunction);
861
858 response = m_FreeswitchService.HandleDirectoryRequest(requestBody); 862 response = m_FreeswitchService.HandleDirectoryRequest(requestBody);
863 }
859 else if (section == "dialplan") 864 else if (section == "dialplan")
865 {
866 m_log.DebugFormat("[FreeSwitchVoice]: Received request for config section dialplan");
867
860 response = m_FreeswitchService.HandleDialplanRequest(requestBody); 868 response = m_FreeswitchService.HandleDialplanRequest(requestBody);
869 }
861 else 870 else
862 m_log.WarnFormat("[FreeSwitchVoice]: Unknown section {0} was requested.", section); 871 m_log.WarnFormat("[FreeSwitchVoice]: Unknown section {0} was requested from config.", section);
863 872
864 return response; 873 return response;
865 } 874 }
diff --git a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
index 211a0a7..64774d8 100644
--- a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
+++ b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
@@ -84,10 +84,11 @@ namespace OpenSim.Region.Physics.Meshing
84 public Meshmerizer(IConfigSource config) 84 public Meshmerizer(IConfigSource config)
85 { 85 {
86 IConfig start_config = config.Configs["Startup"]; 86 IConfig start_config = config.Configs["Startup"];
87 IConfig mesh_config = config.Configs["Mesh"];
87 88
88 decodedSculptMapPath = start_config.GetString("DecodedSculptMapPath","j2kDecodeCache"); 89 decodedSculptMapPath = start_config.GetString("DecodedSculptMapPath","j2kDecodeCache");
89 cacheSculptMaps = start_config.GetBoolean("CacheSculptMaps", cacheSculptMaps); 90 cacheSculptMaps = start_config.GetBoolean("CacheSculptMaps", cacheSculptMaps);
90 useMeshiesPhysicsMesh = start_config.GetBoolean("UseMeshiesPhysicsMesh", useMeshiesPhysicsMesh); 91 useMeshiesPhysicsMesh = mesh_config.GetBoolean("UseMeshiesPhysicsMesh", useMeshiesPhysicsMesh);
91 92
92 try 93 try
93 { 94 {
diff --git a/OpenSim/Services/FreeswitchService/FreeswitchService.cs b/OpenSim/Services/FreeswitchService/FreeswitchService.cs
index 1ec89da..c3f1056 100644
--- a/OpenSim/Services/FreeswitchService/FreeswitchService.cs
+++ b/OpenSim/Services/FreeswitchService/FreeswitchService.cs
@@ -56,7 +56,7 @@ namespace OpenSim.Services.FreeswitchService
56 56
57 foreach (DictionaryEntry item in request) 57 foreach (DictionaryEntry item in request)
58 { 58 {
59 m_log.InfoFormat("[FreeSwitchDirectory]: requestBody item {0} {1}",item.Key, item.Value); 59// m_log.InfoFormat("[FreeSwitchDirectory]: requestBody item {0} {1}",item.Key, item.Value);
60 } 60 }
61 61
62 string requestcontext = (string) request["Hunt-Context"]; 62 string requestcontext = (string) request["Hunt-Context"];
@@ -146,10 +146,8 @@ namespace OpenSim.Services.FreeswitchService
146 //domain=9.20.151.43 146 //domain=9.20.151.43
147 //ip=9.167.220.137 // this is the correct IP rather than sip_contact_host above when through a vpn or NAT setup 147 //ip=9.167.220.137 // this is the correct IP rather than sip_contact_host above when through a vpn or NAT setup
148 148
149 foreach (DictionaryEntry item in request) 149// foreach (DictionaryEntry item in request)
150 { 150// m_log.DebugFormat("[FreeSwitchDirectory]: requestBody item {0} {1}", item.Key, item.Value);
151 m_log.DebugFormat("[FreeSwitchDirectory]: requestBody item {0} {1}", item.Key, item.Value);
152 }
153 151
154 string eventCallingFunction = (string) request["Event-Calling-Function"]; 152 string eventCallingFunction = (string) request["Event-Calling-Function"];
155 if (eventCallingFunction == null) 153 if (eventCallingFunction == null)