aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Framework/Console/ConsoleBase.cs2
-rw-r--r--OpenSim/Framework/Console/LocalConsole.cs2
-rw-r--r--OpenSim/Framework/Console/RemoteConsole.cs2
-rw-r--r--OpenSim/Framework/InventoryItemBase.cs13
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/J2KImage.cs25
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs1
-rw-r--r--OpenSim/Region/Framework/Scenes/RegionStatsHandler.cs12
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs7
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneBase.cs4
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPart.cs2
-rw-r--r--OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs7
11 files changed, 35 insertions, 42 deletions
diff --git a/OpenSim/Framework/Console/ConsoleBase.cs b/OpenSim/Framework/Console/ConsoleBase.cs
index 30493fc..dd3c145 100644
--- a/OpenSim/Framework/Console/ConsoleBase.cs
+++ b/OpenSim/Framework/Console/ConsoleBase.cs
@@ -37,7 +37,7 @@ namespace OpenSim.Framework.Console
37{ 37{
38 public class ConsoleBase 38 public class ConsoleBase
39 { 39 {
40 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 40// private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
41 41
42 protected string prompt = "# "; 42 protected string prompt = "# ";
43 43
diff --git a/OpenSim/Framework/Console/LocalConsole.cs b/OpenSim/Framework/Console/LocalConsole.cs
index 2344ad2..22f10fc 100644
--- a/OpenSim/Framework/Console/LocalConsole.cs
+++ b/OpenSim/Framework/Console/LocalConsole.cs
@@ -39,7 +39,7 @@ namespace OpenSim.Framework.Console
39 // 39 //
40 public class LocalConsole : CommandConsole 40 public class LocalConsole : CommandConsole
41 { 41 {
42 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 42// private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
43 43
44 private readonly object m_syncRoot = new object(); 44 private readonly object m_syncRoot = new object();
45 45
diff --git a/OpenSim/Framework/Console/RemoteConsole.cs b/OpenSim/Framework/Console/RemoteConsole.cs
index 71f075e..19c3ab1 100644
--- a/OpenSim/Framework/Console/RemoteConsole.cs
+++ b/OpenSim/Framework/Console/RemoteConsole.cs
@@ -41,7 +41,7 @@ namespace OpenSim.Framework.Console
41 // 41 //
42 public class RemoteConsole : CommandConsole 42 public class RemoteConsole : CommandConsole
43 { 43 {
44 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 44// private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
45 45
46 private IHttpServer m_Server = null; 46 private IHttpServer m_Server = null;
47 private IConfigSource m_Config = null; 47 private IConfigSource m_Config = null;
diff --git a/OpenSim/Framework/InventoryItemBase.cs b/OpenSim/Framework/InventoryItemBase.cs
index ce3dc63..b14ce7f 100644
--- a/OpenSim/Framework/InventoryItemBase.cs
+++ b/OpenSim/Framework/InventoryItemBase.cs
@@ -33,7 +33,7 @@ namespace OpenSim.Framework
33 /// <summary> 33 /// <summary>
34 /// Inventory Item - contains all the properties associated with an individual inventory piece. 34 /// Inventory Item - contains all the properties associated with an individual inventory piece.
35 /// </summary> 35 /// </summary>
36 public class InventoryItemBase : InventoryNodeBase 36 public class InventoryItemBase : InventoryNodeBase, ICloneable
37 { 37 {
38 /// <summary> 38 /// <summary>
39 /// The inventory type of the item. This is slightly different from the asset type in some situations. 39 /// The inventory type of the item. This is slightly different from the asset type in some situations.
@@ -143,5 +143,16 @@ namespace OpenSim.Framework
143 { 143 {
144 CreationDate = (int)(DateTime.UtcNow - new DateTime(1970, 1, 1)).TotalSeconds; 144 CreationDate = (int)(DateTime.UtcNow - new DateTime(1970, 1, 1)).TotalSeconds;
145 } 145 }
146
147 public object Clone()
148 {
149 InventoryItemBase clone = new InventoryItemBase();
150 clone.AssetID = AssetID;
151 clone.AssetType = AssetType;
152 clone.BasePermissions = BasePermissions;
153 clone.CreationDate = CreationDate;
154 clone.CreatorId = CreatorId;
155
156 }
146 } 157 }
147} 158}
diff --git a/OpenSim/Region/ClientStack/LindenUDP/J2KImage.cs b/OpenSim/Region/ClientStack/LindenUDP/J2KImage.cs
index 6878fe5..1882005 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/J2KImage.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/J2KImage.cs
@@ -36,20 +36,13 @@ using System.Reflection;
36 36
37namespace OpenSim.Region.ClientStack.LindenUDP 37namespace OpenSim.Region.ClientStack.LindenUDP
38{ 38{
39 /* 39 /// <summary>
40 * 40 /// We use this class to store image data and associated request data and attributes
41 * J2KImage 41 /// </summary>
42 *
43 * We use this class to store image data and associated request data and attributes
44 *
45 *
46 *
47 */
48
49 public class J2KImage 42 public class J2KImage
50 { 43 {
51
52 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 44 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
45
53 public double m_designatedPriorityKey; 46 public double m_designatedPriorityKey;
54 public double m_requestedPriority = 0.0d; 47 public double m_requestedPriority = 0.0d;
55 public uint m_lastSequence = 0; 48 public uint m_lastSequence = 0;
@@ -107,7 +100,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
107 { 100 {
108 return (ushort)(((m_asset.Data.Length - cFirstPacketSize + cImagePacketSize - 1) / cImagePacketSize) + 1); 101 return (ushort)(((m_asset.Data.Length - cFirstPacketSize + cImagePacketSize - 1) / cImagePacketSize) + 1);
109 } 102 }
110 catch(Exception e) 103 catch (Exception)
111 { 104 {
112 // If the asset is missing/destroyed/truncated, we will land 105 // If the asset is missing/destroyed/truncated, we will land
113 // here 106 // here
@@ -223,9 +216,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
223 } 216 }
224 } 217 }
225 218
226 //It's concievable that the client might request packet one 219 // It's concievable that the client might request packet one
227 //from a one packet image, which is really packet 0, 220 // from a one packet image, which is really packet 0,
228 //which would leave us with a negative imagePacketSize.. 221 // which would leave us with a negative imagePacketSize..
229 if (imagePacketSize > 0) 222 if (imagePacketSize > 0)
230 { 223 {
231 byte[] imageData = new byte[imagePacketSize]; 224 byte[] imageData = new byte[imagePacketSize];
@@ -252,7 +245,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
252 return true; 245 return true;
253 } 246 }
254 } 247 }
255 catch (Exception e) 248 catch (Exception)
256 { 249 {
257 return false; 250 return false;
258 } 251 }
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs
index 9c45fd2..0144136 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs
@@ -124,6 +124,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
124 protected void SaveInvItem(InventoryItemBase inventoryItem, string path) 124 protected void SaveInvItem(InventoryItemBase inventoryItem, string path)
125 { 125 {
126 string filename = string.Format("{0}{1}_{2}.xml", path, inventoryItem.Name, inventoryItem.ID); 126 string filename = string.Format("{0}{1}_{2}.xml", path, inventoryItem.Name, inventoryItem.ID);
127
127 string serialization = UserInventoryItemSerializer.Serialize(inventoryItem); 128 string serialization = UserInventoryItemSerializer.Serialize(inventoryItem);
128 m_archive.WriteFile(filename, serialization); 129 m_archive.WriteFile(filename, serialization);
129 130
diff --git a/OpenSim/Region/Framework/Scenes/RegionStatsHandler.cs b/OpenSim/Region/Framework/Scenes/RegionStatsHandler.cs
index f521490..4ef5221 100644
--- a/OpenSim/Region/Framework/Scenes/RegionStatsHandler.cs
+++ b/OpenSim/Region/Framework/Scenes/RegionStatsHandler.cs
@@ -53,16 +53,15 @@ namespace OpenSim.Region.Framework.Scenes
53 53
54 54
55 public class RegionStatsHandler : IStreamedRequestHandler 55 public class RegionStatsHandler : IStreamedRequestHandler
56 { 56 {
57
58 private string osRXStatsURI = String.Empty; 57 private string osRXStatsURI = String.Empty;
59 private string osXStatsURI = String.Empty; 58 private string osXStatsURI = String.Empty;
60 private string osSecret = String.Empty; 59 //private string osSecret = String.Empty;
61 private OpenSim.Framework.RegionInfo regionInfo; 60 private OpenSim.Framework.RegionInfo regionInfo;
62 public string localZone = TimeZone.CurrentTimeZone.StandardName; 61 public string localZone = TimeZone.CurrentTimeZone.StandardName;
63 public TimeSpan utcOffset = TimeZone.CurrentTimeZone.GetUtcOffset(DateTime.Now); 62 public TimeSpan utcOffset = TimeZone.CurrentTimeZone.GetUtcOffset(DateTime.Now);
64 63
65 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 64 //private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
66 65
67 public RegionStatsHandler(OpenSim.Framework.RegionInfo region_info ) 66 public RegionStatsHandler(OpenSim.Framework.RegionInfo region_info )
68 { 67 {
@@ -94,10 +93,9 @@ namespace OpenSim.Region.Framework.Scenes
94 } 93 }
95 94
96 private string Report() 95 private string Report()
97 { 96 {
98
99 OSDMap args = new OSDMap(30); 97 OSDMap args = new OSDMap(30);
100 int time = Util.ToUnixTime( DateTime.Now ); 98 //int time = Util.ToUnixTime( DateTime.Now );
101 args["OSStatsURI"] = OSD.FromString("http://" + regionInfo.ExternalHostName + ":" + regionInfo.HttpPort + "/" + osXStatsURI + "/"); 99 args["OSStatsURI"] = OSD.FromString("http://" + regionInfo.ExternalHostName + ":" + regionInfo.HttpPort + "/" + osXStatsURI + "/");
102 args["TimeZoneName"] = OSD.FromString(localZone); 100 args["TimeZoneName"] = OSD.FromString(localZone);
103 args["TimeZoneOffs"] = OSD.FromReal(utcOffset.TotalHours); 101 args["TimeZoneOffs"] = OSD.FromReal(utcOffset.TotalHours);
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 9f99305..4dc1661 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -148,8 +148,6 @@ namespace OpenSim.Region.Framework.Scenes
148 protected float m_timespan = 0.089f; 148 protected float m_timespan = 0.089f;
149 protected DateTime m_lastupdate = DateTime.Now; 149 protected DateTime m_lastupdate = DateTime.Now;
150 150
151 protected float m_timedilation = 1.0f;
152
153 private int m_update_physics = 1; 151 private int m_update_physics = 1;
154 private int m_update_entitymovement = 1; 152 private int m_update_entitymovement = 1;
155 private int m_update_entities = 1; // Run through all objects checking for updates 153 private int m_update_entities = 1; // Run through all objects checking for updates
@@ -230,11 +228,6 @@ namespace OpenSim.Region.Framework.Scenes
230 get { return m_sceneGraph.m_syncRoot; } 228 get { return m_sceneGraph.m_syncRoot; }
231 } 229 }
232 230
233 public float TimeDilation
234 {
235 get { return m_timedilation; }
236 }
237
238 public int MaxPrimsPerFrame 231 public int MaxPrimsPerFrame
239 { 232 {
240 get { return m_maxPrimsPerFrame; } 233 get { return m_maxPrimsPerFrame; }
diff --git a/OpenSim/Region/Framework/Scenes/SceneBase.cs b/OpenSim/Region/Framework/Scenes/SceneBase.cs
index 9d8582f..6510a0c 100644
--- a/OpenSim/Region/Framework/Scenes/SceneBase.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneBase.cs
@@ -110,14 +110,14 @@ namespace OpenSim.Region.Framework.Scenes
110 110
111 public float TimeDilation 111 public float TimeDilation
112 { 112 {
113 get { return 1.0f; } 113 get { return m_timedilation; }
114 } 114 }
115 protected float m_timedilation = 1.0f;
115 116
116 protected ulong m_regionHandle; 117 protected ulong m_regionHandle;
117 protected string m_regionName; 118 protected string m_regionName;
118 protected RegionInfo m_regInfo; 119 protected RegionInfo m_regInfo;
119 120
120 //public TerrainEngine Terrain;
121 public ITerrainChannel Heightmap; 121 public ITerrainChannel Heightmap;
122 122
123 /// <value> 123 /// <value>
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index bca1a65..6b5883e 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -1361,7 +1361,7 @@ if (m_shape != null) {
1361 /// <returns></returns> 1361 /// <returns></returns>
1362 public SceneObjectPart Copy(uint localID, UUID AgentID, UUID GroupID, int linkNum, bool userExposed) 1362 public SceneObjectPart Copy(uint localID, UUID AgentID, UUID GroupID, int linkNum, bool userExposed)
1363 { 1363 {
1364 SceneObjectPart dupe = (SceneObjectPart) MemberwiseClone(); 1364 SceneObjectPart dupe = (SceneObjectPart)MemberwiseClone();
1365 dupe.m_shape = m_shape.Copy(); 1365 dupe.m_shape = m_shape.Copy();
1366 dupe.m_regionHandle = m_regionHandle; 1366 dupe.m_regionHandle = m_regionHandle;
1367 if (userExposed) 1367 if (userExposed)
diff --git a/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs b/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs
index e04b1ba..ddd0c12 100644
--- a/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs
@@ -594,7 +594,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
594 return response; 594 return response;
595 595
596 string auth_token = (string)requestBody["auth_token"]; 596 string auth_token = (string)requestBody["auth_token"];
597 string[] auth_tokenvals = auth_token.Split(':'); 597 //string[] auth_tokenvals = auth_token.Split(':');
598 //string username = auth_tokenvals[0]; 598 //string username = auth_tokenvals[0];
599 int strcount = 0; 599 int strcount = 0;
600 600
@@ -643,9 +643,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
643 <b2g_group_id></b2g_group_id> 643 <b2g_group_id></b2g_group_id>
644 </level3>", ids[i],i,m_freeSwitchRealm,dt)); 644 </level3>", ids[i],i,m_freeSwitchRealm,dt));
645 } 645 }
646 646
647
648
649 resp.Append("</buddies><groups></groups></body></level0></response>"); 647 resp.Append("</buddies><groups></groups></body></level0></response>");
650 648
651 response["str_response_string"] = resp.ToString(); 649 response["str_response_string"] = resp.ToString();
@@ -716,7 +714,6 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
716 */ 714 */
717 } 715 }
718 716
719
720 public Hashtable FreeSwitchConfigHTTPHandler(Hashtable request) 717 public Hashtable FreeSwitchConfigHTTPHandler(Hashtable request)
721 { 718 {
722 m_log.DebugFormat("[FreeSwitchVoice] FreeSwitchConfigHTTPHandler called with {0}", (string)request["body"]); 719 m_log.DebugFormat("[FreeSwitchVoice] FreeSwitchConfigHTTPHandler called with {0}", (string)request["body"]);