aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Data/MySQL/MySQLFramework.cs29
-rw-r--r--OpenSim/Data/MySQL/MySQLSimulationData.cs101
-rw-r--r--OpenSim/Data/MySQL/MySQLUserAccountData.cs6
-rw-r--r--OpenSim/Data/MySQL/MySQLUserProfilesData.cs1
-rw-r--r--OpenSim/Data/MySQL/Resources/RegionStore.migrations4
-rw-r--r--OpenSim/Data/MySQL/Resources/UserProfiles.migrations3
-rw-r--r--OpenSim/Data/PGSQL/Resources/UserProfiles.migrations3
-rw-r--r--OpenSim/Data/SQLite/Resources/UserProfiles.migrations12
-rw-r--r--OpenSim/Framework/Communications/RestClient.cs8
-rw-r--r--OpenSim/Framework/Console/CommandConsole.cs2
-rwxr-xr-xOpenSim/Framework/Monitoring/SimExtraStatsCollector.cs8
-rw-r--r--OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs56
-rw-r--r--OpenSim/Framework/VersionInfo.cs2
-rw-r--r--OpenSim/Framework/WebUtil.cs18
-rw-r--r--OpenSim/Region/Application/OpenSimBase.cs5
-rw-r--r--OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCapsModule.cs4
-rw-r--r--OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs12
-rw-r--r--OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueHelper.cs2
-rw-r--r--OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs3
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs20
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/MapImage/MapImageServiceModule.cs2
-rw-r--r--OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs6
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs58
-rwxr-xr-xOpenSim/Region/Framework/Scenes/SimStatsReporter.cs2
-rw-r--r--OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs2
25 files changed, 117 insertions, 252 deletions
diff --git a/OpenSim/Data/MySQL/MySQLFramework.cs b/OpenSim/Data/MySQL/MySQLFramework.cs
index a522912..34791cf 100644
--- a/OpenSim/Data/MySQL/MySQLFramework.cs
+++ b/OpenSim/Data/MySQL/MySQLFramework.cs
@@ -60,32 +60,31 @@ namespace OpenSim.Data.MySQL
60 protected int ExecuteNonQuery(MySqlCommand cmd) 60 protected int ExecuteNonQuery(MySqlCommand cmd)
61 { 61 {
62 lock (m_dbLock) 62 lock (m_dbLock)
63 using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
64 { 63 {
65 dbcon.Open(); 64 using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
66 cmd.Connection = dbcon;
67
68 try
69 { 65 {
70 dbcon.Open();
71 cmd.Connection = dbcon;
72
73 try 66 try
74 { 67 {
75 return cmd.ExecuteNonQuery(); 68 dbcon.Open();
69 cmd.Connection = dbcon;
70
71 try
72 {
73 return cmd.ExecuteNonQuery();
74 }
75 catch (Exception e)
76 {
77 m_log.Error(e.Message, e);
78 m_log.Error(Environment.StackTrace.ToString());
79 return 0;
80 }
76 } 81 }
77 catch (Exception e) 82 catch (Exception e)
78 { 83 {
79 m_log.Error(e.Message, e); 84 m_log.Error(e.Message, e);
80 m_log.Error(Environment.StackTrace.ToString());
81 return 0; 85 return 0;
82 } 86 }
83 } 87 }
84 catch (Exception e)
85 {
86 m_log.Error(e.Message, e);
87 return 0;
88 }
89 } 88 }
90 } 89 }
91 } 90 }
diff --git a/OpenSim/Data/MySQL/MySQLSimulationData.cs b/OpenSim/Data/MySQL/MySQLSimulationData.cs
index 549d129..a62d347 100644
--- a/OpenSim/Data/MySQL/MySQLSimulationData.cs
+++ b/OpenSim/Data/MySQL/MySQLSimulationData.cs
@@ -1089,42 +1089,43 @@ namespace OpenSim.Data.MySQL
1089 using (MySqlCommand cmd = dbcon.CreateCommand()) 1089 using (MySqlCommand cmd = dbcon.CreateCommand())
1090 { 1090 {
1091 cmd.CommandText = "replace into regionsettings (regionUUID, " + 1091 cmd.CommandText = "replace into regionsettings (regionUUID, " +
1092 "block_terraform, block_fly, allow_damage, " + 1092 "block_terraform, block_fly, allow_damage, " +
1093 "restrict_pushing, allow_land_resell, " + 1093 "restrict_pushing, allow_land_resell, " +
1094 "allow_land_join_divide, block_show_in_search, " + 1094 "allow_land_join_divide, block_show_in_search, " +
1095 "agent_limit, object_bonus, maturity, " + 1095 "agent_limit, object_bonus, maturity, " +
1096 "disable_scripts, disable_collisions, " + 1096 "disable_scripts, disable_collisions, " +
1097 "disable_physics, terrain_texture_1, " + 1097 "disable_physics, terrain_texture_1, " +
1098 "terrain_texture_2, terrain_texture_3, " + 1098 "terrain_texture_2, terrain_texture_3, " +
1099 "terrain_texture_4, elevation_1_nw, " + 1099 "terrain_texture_4, elevation_1_nw, " +
1100 "elevation_2_nw, elevation_1_ne, " + 1100 "elevation_2_nw, elevation_1_ne, " +
1101 "elevation_2_ne, elevation_1_se, " + 1101 "elevation_2_ne, elevation_1_se, " +
1102 "elevation_2_se, elevation_1_sw, " + 1102 "elevation_2_se, elevation_1_sw, " +
1103 "elevation_2_sw, water_height, " + 1103 "elevation_2_sw, water_height, " +
1104 "terrain_raise_limit, terrain_lower_limit, " + 1104 "terrain_raise_limit, terrain_lower_limit, " +
1105 "use_estate_sun, fixed_sun, sun_position, " + 1105 "use_estate_sun, fixed_sun, sun_position, " +
1106 "covenant, covenant_datetime, Sandbox, sunvectorx, sunvectory, " + 1106 "covenant, covenant_datetime, Sandbox, sunvectorx, sunvectory, " +
1107 "sunvectorz, loaded_creation_datetime, " + 1107 "sunvectorz, loaded_creation_datetime, " +
1108 "loaded_creation_id, map_tile_ID, block_search, casino, " + 1108 "loaded_creation_id, map_tile_ID, block_search, casino, " +
1109 "TelehubObject, parcel_tile_ID) " + 1109 "TelehubObject, parcel_tile_ID) " +
1110 "values (?RegionUUID, ?BlockTerraform, " + 1110 "values (?RegionUUID, ?BlockTerraform, " +
1111 "?BlockFly, ?AllowDamage, ?RestrictPushing, " + 1111 "?BlockFly, ?AllowDamage, ?RestrictPushing, " +
1112 "?AllowLandResell, ?AllowLandJoinDivide, " + 1112 "?AllowLandResell, ?AllowLandJoinDivide, " +
1113 "?BlockShowInSearch, ?AgentLimit, ?ObjectBonus, " + 1113 "?BlockShowInSearch, ?AgentLimit, ?ObjectBonus, " +
1114 "?Maturity, ?DisableScripts, ?DisableCollisions, " + 1114 "?Maturity, ?DisableScripts, ?DisableCollisions, " +
1115 "?DisablePhysics, ?TerrainTexture1, " + 1115 "?DisablePhysics, ?TerrainTexture1, " +
1116 "?TerrainTexture2, ?TerrainTexture3, " + 1116 "?TerrainTexture2, ?TerrainTexture3, " +
1117 "?TerrainTexture4, ?Elevation1NW, ?Elevation2NW, " + 1117 "?TerrainTexture4, ?Elevation1NW, ?Elevation2NW, " +
1118 "?Elevation1NE, ?Elevation2NE, ?Elevation1SE, " + 1118 "?Elevation1NE, ?Elevation2NE, ?Elevation1SE, " +
1119 "?Elevation2SE, ?Elevation1SW, ?Elevation2SW, " + 1119 "?Elevation2SE, ?Elevation1SW, ?Elevation2SW, " +
1120 "?WaterHeight, ?TerrainRaiseLimit, " + 1120 "?WaterHeight, ?TerrainRaiseLimit, " +
1121 "?TerrainLowerLimit, ?UseEstateSun, ?FixedSun, " + 1121 "?TerrainLowerLimit, ?UseEstateSun, ?FixedSun, " +
1122 "?SunPosition, ?Covenant, ?CovenantChangedDateTime, ?Sandbox, " + 1122 "?SunPosition, ?Covenant, ?CovenantChangedDateTime, ?Sandbox, " +
1123 "?SunVectorX, ?SunVectorY, ?SunVectorZ, " + 1123 "?SunVectorX, ?SunVectorY, ?SunVectorZ, " +
1124 "?LoadedCreationDateTime, ?LoadedCreationID, " + 1124 "?LoadedCreationDateTime, ?LoadedCreationID, " +
1125 "?TerrainImageID, ?block_search, ?casino, " + 1125 "?TerrainImageID, ?block_search, ?casino, " +
1126 "?TelehubObject, ?ParcelImageID)"; 1126 "?TelehubObject, ?ParcelImageID)";
1127 1127
1128 FillRegionSettingsCommand(cmd, rs);
1128 ExecuteNonQuery(cmd); 1129 ExecuteNonQuery(cmd);
1129 } 1130 }
1130 1131
@@ -1567,34 +1568,6 @@ namespace OpenSim.Data.MySQL
1567 } 1568 }
1568 1569
1569 /// <summary> 1570 /// <summary>
1570 ///
1571 /// </summary>
1572 /// <param name="val"></param>
1573 /// <returns></returns>
1574 private static Array SerializeTerrain(double[,] val, double[,] oldTerrain)
1575 {
1576 MemoryStream str = new MemoryStream(((int)Constants.RegionSize * (int)Constants.RegionSize) *sizeof (double));
1577 BinaryWriter bw = new BinaryWriter(str);
1578
1579 // TODO: COMPATIBILITY - Add byte-order conversions
1580 for (int x = 0; x < (int)Constants.RegionSize; x++)
1581 for (int y = 0; y < (int)Constants.RegionSize; y++)
1582 {
1583 double height = 20.0;
1584 if (oldTerrain != null)
1585 height = oldTerrain[x, y];
1586 if (!double.IsNaN(val[x, y]))
1587 height = val[x, y];
1588 if (height == 0.0)
1589 height = double.Epsilon;
1590
1591 bw.Write(height);
1592 }
1593
1594 return str.ToArray();
1595 }
1596
1597 /// <summary>
1598 /// Fill the prim command with prim values 1571 /// Fill the prim command with prim values
1599 /// </summary> 1572 /// </summary>
1600 /// <param name="row"></param> 1573 /// <param name="row"></param>
diff --git a/OpenSim/Data/MySQL/MySQLUserAccountData.cs b/OpenSim/Data/MySQL/MySQLUserAccountData.cs
index 4ff3175..59cfe70 100644
--- a/OpenSim/Data/MySQL/MySQLUserAccountData.cs
+++ b/OpenSim/Data/MySQL/MySQLUserAccountData.cs
@@ -71,14 +71,14 @@ namespace OpenSim.Data.MySQL
71 if (words.Length == 1) 71 if (words.Length == 1)
72 { 72 {
73 cmd.CommandText = String.Format("select * from {0} where (ScopeID=?ScopeID or ScopeID='00000000-0000-0000-0000-000000000000') and (FirstName like ?search or LastName like ?search) and active=1", m_Realm); 73 cmd.CommandText = String.Format("select * from {0} where (ScopeID=?ScopeID or ScopeID='00000000-0000-0000-0000-000000000000') and (FirstName like ?search or LastName like ?search) and active=1", m_Realm);
74 cmd.Parameters.AddWithValue("?search", words[0] + "%"); 74 cmd.Parameters.AddWithValue("?search", "%" + words[0] + "%");
75 cmd.Parameters.AddWithValue("?ScopeID", scopeID.ToString()); 75 cmd.Parameters.AddWithValue("?ScopeID", scopeID.ToString());
76 } 76 }
77 else 77 else
78 { 78 {
79 cmd.CommandText = String.Format("select * from {0} where (ScopeID=?ScopeID or ScopeID='00000000-0000-0000-0000-000000000000') and (FirstName like ?searchFirst and LastName like ?searchLast) and active=1", m_Realm); 79 cmd.CommandText = String.Format("select * from {0} where (ScopeID=?ScopeID or ScopeID='00000000-0000-0000-0000-000000000000') and (FirstName like ?searchFirst and LastName like ?searchLast) and active=1", m_Realm);
80 cmd.Parameters.AddWithValue("?searchFirst", words[0] + "%"); 80 cmd.Parameters.AddWithValue("?searchFirst", "%" + words[0] + "%");
81 cmd.Parameters.AddWithValue("?searchLast", words[1] + "%"); 81 cmd.Parameters.AddWithValue("?searchLast", "%" + words[1] + "%");
82 cmd.Parameters.AddWithValue("?ScopeID", scopeID.ToString()); 82 cmd.Parameters.AddWithValue("?ScopeID", scopeID.ToString());
83 } 83 }
84 84
diff --git a/OpenSim/Data/MySQL/MySQLUserProfilesData.cs b/OpenSim/Data/MySQL/MySQLUserProfilesData.cs
index c241e90..295e131 100644
--- a/OpenSim/Data/MySQL/MySQLUserProfilesData.cs
+++ b/OpenSim/Data/MySQL/MySQLUserProfilesData.cs
@@ -914,7 +914,6 @@ namespace OpenSim.Data.MySQL
914 using (MySqlCommand cmd = new MySqlCommand(query, dbcon)) 914 using (MySqlCommand cmd = new MySqlCommand(query, dbcon))
915 { 915 {
916 cmd.Parameters.AddWithValue("?Id", pref.UserId.ToString()); 916 cmd.Parameters.AddWithValue("?Id", pref.UserId.ToString());
917
918 using (MySqlDataReader reader = cmd.ExecuteReader()) 917 using (MySqlDataReader reader = cmd.ExecuteReader())
919 { 918 {
920 if (reader.HasRows) 919 if (reader.HasRows)
diff --git a/OpenSim/Data/MySQL/Resources/RegionStore.migrations b/OpenSim/Data/MySQL/Resources/RegionStore.migrations
index 738f5c2..097271a 100644
--- a/OpenSim/Data/MySQL/Resources/RegionStore.migrations
+++ b/OpenSim/Data/MySQL/Resources/RegionStore.migrations
@@ -939,7 +939,6 @@ ALTER TABLE prims ADD COLUMN AttachedPosY double default 0;
939ALTER TABLE prims ADD COLUMN AttachedPosZ double default 0; 939ALTER TABLE prims ADD COLUMN AttachedPosZ double default 0;
940ALTER TABLE primshapes ADD COLUMN LastAttachPoint int(4) not null default '0'; 940ALTER TABLE primshapes ADD COLUMN LastAttachPoint int(4) not null default '0';
941COMMIT; 941COMMIT;
942<<<<<<< HEAD
943 942
944:VERSION 50 #---- Change LandFlags to unsigned 943:VERSION 50 #---- Change LandFlags to unsigned
945 944
@@ -948,6 +947,3 @@ BEGIN;
948ALTER TABLE land CHANGE COLUMN LandFlags LandFlags int unsigned default null; 947ALTER TABLE land CHANGE COLUMN LandFlags LandFlags int unsigned default null;
949 948
950COMMIT; 949COMMIT;
951
952=======
953>>>>>>> avn/ubitvar
diff --git a/OpenSim/Data/MySQL/Resources/UserProfiles.migrations b/OpenSim/Data/MySQL/Resources/UserProfiles.migrations
index 3df9b9b..87e99fa 100644
--- a/OpenSim/Data/MySQL/Resources/UserProfiles.migrations
+++ b/OpenSim/Data/MySQL/Resources/UserProfiles.migrations
@@ -81,7 +81,6 @@ CREATE TABLE IF NOT EXISTS `userdata` (
81 81
82commit; 82commit;
83 83
84<<<<<<< HEAD
85:VERSION 3 # ------------------------------- 84:VERSION 3 # -------------------------------
86begin; 85begin;
87CREATE TABLE IF NOT EXISTS `usersettings` ( 86CREATE TABLE IF NOT EXISTS `usersettings` (
@@ -97,5 +96,3 @@ commit;
97begin; 96begin;
98ALTER TABLE userpicks ADD COLUMN gatekeeper varchar(255); 97ALTER TABLE userpicks ADD COLUMN gatekeeper varchar(255);
99commit; 98commit;
100=======
101>>>>>>> avn/ubitvar
diff --git a/OpenSim/Data/PGSQL/Resources/UserProfiles.migrations b/OpenSim/Data/PGSQL/Resources/UserProfiles.migrations
index a67107a..c1580b2 100644
--- a/OpenSim/Data/PGSQL/Resources/UserProfiles.migrations
+++ b/OpenSim/Data/PGSQL/Resources/UserProfiles.migrations
@@ -81,7 +81,6 @@ CREATE TABLE userdata (
81 81
82commit; 82commit;
83 83
84<<<<<<< HEAD
85:VERSION 3 # ------------------------------- 84:VERSION 3 # -------------------------------
86begin; 85begin;
87CREATE TABLE usersettings ( 86CREATE TABLE usersettings (
@@ -154,5 +153,3 @@ BEGIN;
154ALTER TABLE usersettings ALTER COLUMN imviaemail SET DATA TYPE boolean USING CASE WHEN false THEN false ELSE true END; 153ALTER TABLE usersettings ALTER COLUMN imviaemail SET DATA TYPE boolean USING CASE WHEN false THEN false ELSE true END;
155 154
156COMMIT; 155COMMIT;
157=======
158>>>>>>> avn/ubitvar
diff --git a/OpenSim/Data/SQLite/Resources/UserProfiles.migrations b/OpenSim/Data/SQLite/Resources/UserProfiles.migrations
index 16581f6..207dde0 100644
--- a/OpenSim/Data/SQLite/Resources/UserProfiles.migrations
+++ b/OpenSim/Data/SQLite/Resources/UserProfiles.migrations
@@ -88,3 +88,15 @@ CREATE TABLE IF NOT EXISTS userdata (
88 88
89commit; 89commit;
90 90
91
92:VERSION 3 # -------------------------------
93
94begin;
95CREATE TABLE IF NOT EXISTS usersettings (
96 useruuid char(36) NOT NULL,
97 imviaemail binary(1) NOT NULL,
98 visible binary(1) NOT NULL,
99 email varchar(254) NOT NULL,
100 PRIMARY KEY (useruuid)
101)
102commit;
diff --git a/OpenSim/Framework/Communications/RestClient.cs b/OpenSim/Framework/Communications/RestClient.cs
index 7c89e6b..807222b 100644
--- a/OpenSim/Framework/Communications/RestClient.cs
+++ b/OpenSim/Framework/Communications/RestClient.cs
@@ -388,10 +388,6 @@ namespace OpenSim.Framework.Communications
388 m_log.Error(string.Format("[REST CLIENT] Error fetching resource from server: {0} ", _request.Address.ToString()), e); 388 m_log.Error(string.Format("[REST CLIENT] Error fetching resource from server: {0} ", _request.Address.ToString()), e);
389 } 389 }
390 } 390 }
391
392 if (_response != null)
393 _response.Close();
394
395 return null; 391 return null;
396 } 392 }
397 393
@@ -417,7 +413,7 @@ namespace OpenSim.Framework.Communications
417 _request = (HttpWebRequest) WebRequest.Create(buildUri()); 413 _request = (HttpWebRequest) WebRequest.Create(buildUri());
418 _request.KeepAlive = false; 414 _request.KeepAlive = false;
419 _request.ContentType = "application/xml"; 415 _request.ContentType = "application/xml";
420 _request.Timeout = 30000; 416 _request.Timeout = 90000;
421 _request.Method = RequestMethod; 417 _request.Method = RequestMethod;
422 _asyncException = null; 418 _asyncException = null;
423 _request.ContentLength = src.Length; 419 _request.ContentLength = src.Length;
@@ -476,8 +472,6 @@ namespace OpenSim.Framework.Communications
476 } 472 }
477 } 473 }
478 474
479 _response.Close();
480
481 if (_response != null) 475 if (_response != null)
482 _response.Close(); 476 _response.Close();
483 477
diff --git a/OpenSim/Framework/Console/CommandConsole.cs b/OpenSim/Framework/Console/CommandConsole.cs
index 851fbed..d908b68 100644
--- a/OpenSim/Framework/Console/CommandConsole.cs
+++ b/OpenSim/Framework/Console/CommandConsole.cs
@@ -83,7 +83,7 @@ namespace OpenSim.Framework.Console
83 = "To enter an argument that contains spaces, surround the argument with double quotes.\nFor example, show object name \"My long object name\"\n"; 83 = "To enter an argument that contains spaces, surround the argument with double quotes.\nFor example, show object name \"My long object name\"\n";
84 84
85 public const string ItemHelpText 85 public const string ItemHelpText
86= @"For more information, type 'help' to get a list of all commands, 86= @"For more information, type 'help ' to get a list of all commands,
87 or type help <item>' where <item> is one of the following:"; 87 or type help <item>' where <item> is one of the following:";
88 88
89 /// <value> 89 /// <value>
diff --git a/OpenSim/Framework/Monitoring/SimExtraStatsCollector.cs b/OpenSim/Framework/Monitoring/SimExtraStatsCollector.cs
index e4df7ee..b0fdc81 100755
--- a/OpenSim/Framework/Monitoring/SimExtraStatsCollector.cs
+++ b/OpenSim/Framework/Monitoring/SimExtraStatsCollector.cs
@@ -281,10 +281,10 @@ namespace OpenSim.Framework.Monitoring
281 activeScripts = stats.StatsBlock[19].StatValue; 281 activeScripts = stats.StatsBlock[19].StatValue;
282 scriptLinesPerSecond = stats.StatsBlock[20].StatValue; 282 scriptLinesPerSecond = stats.StatsBlock[20].StatValue;
283 m_frameDilation = stats.StatsBlock[22].StatValue; 283 m_frameDilation = stats.StatsBlock[22].StatValue;
284 m_usersLoggingIn = stats.StatsBlock[23].StatValue; 284// m_usersLoggingIn = stats.StatsBlock[23].StatValue;
285 m_totalGeoPrims = stats.StatsBlock[24].StatValue; 285// m_totalGeoPrims = stats.StatsBlock[24].StatValue;
286 m_totalMeshes = stats.StatsBlock[25].StatValue; 286// m_totalMeshes = stats.StatsBlock[25].StatValue;
287 m_inUseThreads = stats.StatsBlock[26].StatValue; 287// m_inUseThreads = stats.StatsBlock[26].StatValue;
288 } 288 }
289 289
290 /// <summary> 290 /// <summary>
diff --git a/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs b/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
index 571e8d8..0e4323a 100644
--- a/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
+++ b/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
@@ -44,25 +44,6 @@ namespace OpenSim.Framework.Servers.HttpServer
44 { 44 {
45 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 45 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
46 46
47 /// <summary>
48 /// Is the poll service request manager running?
49 /// </summary>
50 /// <remarks>
51 /// Can be running either synchronously or asynchronously
52 /// </remarks>
53 public bool IsRunning { get; private set; }
54
55 /// <summary>
56 /// Is the poll service performing responses asynchronously (with its own threads) or synchronously (via
57 /// external calls)?
58 /// </summary>
59 public bool PerformResponsesAsync { get; private set; }
60
61 /// <summary>
62 /// Number of responses actually processed and sent to viewer (or aborted due to error).
63 /// </summary>
64 public int ResponsesProcessed { get; private set; }
65
66 private readonly BaseHttpServer m_server; 47 private readonly BaseHttpServer m_server;
67 48
68 private Dictionary<PollServiceHttpRequest, Queue<PollServiceHttpRequest>> m_bycontext; 49 private Dictionary<PollServiceHttpRequest, Queue<PollServiceHttpRequest>> m_bycontext;
@@ -74,7 +55,7 @@ namespace OpenSim.Framework.Servers.HttpServer
74 private Thread[] m_workerThreads; 55 private Thread[] m_workerThreads;
75 private Thread m_retrysThread; 56 private Thread m_retrysThread;
76 57
77 private bool m_running = true; 58 private bool m_running = false;
78 private int slowCount = 0; 59 private int slowCount = 0;
79 60
80 private SmartThreadPool m_threadPool; 61 private SmartThreadPool m_threadPool;
@@ -84,37 +65,9 @@ namespace OpenSim.Framework.Servers.HttpServer
84 BaseHttpServer pSrv, bool performResponsesAsync, uint pWorkerThreadCount, int pTimeout) 65 BaseHttpServer pSrv, bool performResponsesAsync, uint pWorkerThreadCount, int pTimeout)
85 { 66 {
86 m_server = pSrv; 67 m_server = pSrv;
87 PerformResponsesAsync = performResponsesAsync;
88 m_WorkerThreadCount = pWorkerThreadCount; 68 m_WorkerThreadCount = pWorkerThreadCount;
89 m_workerThreads = new Thread[m_WorkerThreadCount]; 69 m_workerThreads = new Thread[m_WorkerThreadCount];
90 70
91/*
92 StatsManager.RegisterStat(
93 new Stat(
94 "QueuedPollResponses",
95 "Number of poll responses queued for processing.",
96 "",
97 "",
98 "httpserver",
99 m_server.Port.ToString(),
100 StatType.Pull,
101 MeasuresOfInterest.AverageChangeOverTime,
102 stat => stat.Value = m_requests.Count(),
103 StatVerbosity.Debug));
104
105 StatsManager.RegisterStat(
106 new Stat(
107 "ProcessedPollResponses",
108 "Number of poll responses processed.",
109 "",
110 "",
111 "httpserver",
112 m_server.Port.ToString(),
113 StatType.Pull,
114 MeasuresOfInterest.AverageChangeOverTime,
115 stat => stat.Value = ResponsesProcessed,
116 StatVerbosity.Debug));
117*/
118 PollServiceHttpRequestComparer preqCp = new PollServiceHttpRequestComparer(); 71 PollServiceHttpRequestComparer preqCp = new PollServiceHttpRequestComparer();
119 m_bycontext = new Dictionary<PollServiceHttpRequest, Queue<PollServiceHttpRequest>>(preqCp); 72 m_bycontext = new Dictionary<PollServiceHttpRequest, Queue<PollServiceHttpRequest>>(preqCp);
120 73
@@ -127,10 +80,12 @@ namespace OpenSim.Framework.Servers.HttpServer
127 startInfo.ThreadPoolName = "PoolService"; 80 startInfo.ThreadPoolName = "PoolService";
128 81
129 m_threadPool = new SmartThreadPool(startInfo); 82 m_threadPool = new SmartThreadPool(startInfo);
83
130 } 84 }
131 85
132 public void Start() 86 public void Start()
133 { 87 {
88 m_running = true;
134 m_threadPool.Start(); 89 m_threadPool.Start();
135 //startup worker threads 90 //startup worker threads
136 for (uint i = 0; i < m_WorkerThreadCount; i++) 91 for (uint i = 0; i < m_WorkerThreadCount; i++)
@@ -154,12 +109,13 @@ namespace OpenSim.Framework.Servers.HttpServer
154 true, 109 true,
155 null, 110 null,
156 1000 * 60 * 10); 111 1000 * 60 * 10);
112
157 113
158 } 114 }
159 115
160 private void ReQueueEvent(PollServiceHttpRequest req) 116 private void ReQueueEvent(PollServiceHttpRequest req)
161 { 117 {
162 if (IsRunning) 118 if (m_running)
163 { 119 {
164 lock (m_retryRequests) 120 lock (m_retryRequests)
165 m_retryRequests.Enqueue(req); 121 m_retryRequests.Enqueue(req);
@@ -207,7 +163,7 @@ namespace OpenSim.Framework.Servers.HttpServer
207 163
208 public void EnqueueInt(PollServiceHttpRequest req) 164 public void EnqueueInt(PollServiceHttpRequest req)
209 { 165 {
210 if (IsRunning) 166 if (m_running)
211 { 167 {
212 if (req.PollServiceArgs.Type != PollServiceEventArgs.EventType.LongPoll) 168 if (req.PollServiceArgs.Type != PollServiceEventArgs.EventType.LongPoll)
213 { 169 {
diff --git a/OpenSim/Framework/VersionInfo.cs b/OpenSim/Framework/VersionInfo.cs
index f0ea96f..165b2b4 100644
--- a/OpenSim/Framework/VersionInfo.cs
+++ b/OpenSim/Framework/VersionInfo.cs
@@ -29,7 +29,7 @@ namespace OpenSim
29{ 29{
30 public class VersionInfo 30 public class VersionInfo
31 { 31 {
32 public const string VersionNumber = "0.8.2.0CM"; 32 public const string VersionNumber = "0.8.2.0";
33 private const Flavour VERSION_FLAVOUR = Flavour.Dev; 33 private const Flavour VERSION_FLAVOUR = Flavour.Dev;
34 34
35 public enum Flavour 35 public enum Flavour
diff --git a/OpenSim/Framework/WebUtil.cs b/OpenSim/Framework/WebUtil.cs
index 44d9318..f834baa 100644
--- a/OpenSim/Framework/WebUtil.cs
+++ b/OpenSim/Framework/WebUtil.cs
@@ -86,7 +86,7 @@ namespace OpenSim.Framework
86 /// Number of milliseconds a call can take before it is considered 86 /// Number of milliseconds a call can take before it is considered
87 /// a "long" call for warning & debugging purposes 87 /// a "long" call for warning & debugging purposes
88 /// </summary> 88 /// </summary>
89 public const int LongCallTime = 500; 89 public const int LongCallTime = 3000;
90 90
91 /// <summary> 91 /// <summary>
92 /// The maximum length of any data logged because of a long request time. 92 /// The maximum length of any data logged because of a long request time.
@@ -418,7 +418,7 @@ namespace OpenSim.Framework
418 /// </summary> 418 /// </summary>
419 public static OSDMap PostToService(string url, NameValueCollection data) 419 public static OSDMap PostToService(string url, NameValueCollection data)
420 { 420 {
421 return ServiceFormRequest(url,data, 20000); 421 return ServiceFormRequest(url,data, 30000);
422 } 422 }
423 423
424 public static OSDMap ServiceFormRequest(string url, NameValueCollection data, int timeout) 424 public static OSDMap ServiceFormRequest(string url, NameValueCollection data, int timeout)
@@ -808,7 +808,7 @@ namespace OpenSim.Framework
808 /// <param name="requestUrl"></param> 808 /// <param name="requestUrl"></param>
809 /// <param name="obj"></param> 809 /// <param name="obj"></param>
810 /// <param name="pTimeout"> 810 /// <param name="pTimeout">
811 /// Request timeout in milliseconds. Timeout.Infinite indicates no timeout. If 0 is passed then the default HttpWebRequest timeout is used (100 seconds) 811 /// Request timeout in seconds. Timeout.Infinite indicates no timeout. If 0 is passed then the default HttpWebRequest timeout is used (100 seconds)
812 /// </param> 812 /// </param>
813 /// <param name="maxConnections"></param> 813 /// <param name="maxConnections"></param>
814 /// <returns> 814 /// <returns>
@@ -877,7 +877,7 @@ namespace OpenSim.Framework
877 requestStream.Write(data, 0, length); 877 requestStream.Write(data, 0, length);
878 878
879 // capture how much time was spent writing 879 // capture how much time was spent writing
880// tickdata = Util.EnvironmentTickCountSubtract(tickstart); 880 tickdata = Util.EnvironmentTickCountSubtract(tickstart);
881 881
882 request.BeginGetResponse(delegate(IAsyncResult ar) 882 request.BeginGetResponse(delegate(IAsyncResult ar)
883 { 883 {
@@ -992,9 +992,9 @@ namespace OpenSim.Framework
992 } 992 }
993 else if (WebUtil.DebugLevel >= 4) 993 else if (WebUtil.DebugLevel >= 4)
994 { 994 {
995 m_log.DebugFormat( 995 m_log.DebugFormat("[LOGHTTP]: HTTP OUT {0} took {1}ms, {2}ms writing",
996 "[WEB UTIL]: HTTP OUT {0} took {1}ms", 996
997 reqnum, tickdiff); 997 reqnum, tickdiff, tickdata);
998 } 998 }
999 } 999 }
1000 finally 1000 finally
@@ -1054,8 +1054,6 @@ namespace OpenSim.Framework
1054 { 1054 {
1055 writer.Write(obj); 1055 writer.Write(obj);
1056 writer.Flush(); 1056 writer.Flush();
1057 if (WebUtil.DebugLevel >= 5)
1058 WebUtil.LogOutgoingDetail(buffer);
1059 } 1057 }
1060 1058
1061 length = (int)obj.Length; 1059 length = (int)obj.Length;
@@ -1248,7 +1246,7 @@ namespace OpenSim.Framework
1248 auth.AddAuthorization(ht.Headers); 1246 auth.AddAuthorization(ht.Headers);
1249 1247
1250 if (pTimeout != 0) 1248 if (pTimeout != 0)
1251 ht.Timeout = pTimeout; 1249 request.Timeout = pTimeout * 1000;
1252 1250
1253 if (maxConnections > 0 && ht.ServicePoint.ConnectionLimit < maxConnections) 1251 if (maxConnections > 0 && ht.ServicePoint.ConnectionLimit < maxConnections)
1254 ht.ServicePoint.ConnectionLimit = maxConnections; 1252 ht.ServicePoint.ConnectionLimit = maxConnections;
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs
index 5cd9045..9108e5d 100644
--- a/OpenSim/Region/Application/OpenSimBase.cs
+++ b/OpenSim/Region/Application/OpenSimBase.cs
@@ -281,11 +281,6 @@ namespace OpenSim
281 // inserted them manually. 281 // inserted them manually.
282 LoadPlugins(); 282 LoadPlugins();
283 283
284 if (m_plugins.Count == 0) // We failed to load any modules. Mono Addins glitch!
285 {
286 Environment.Exit(1);
287 }
288
289 foreach (IApplicationPlugin plugin in m_plugins) 284 foreach (IApplicationPlugin plugin in m_plugins)
290 plugin.PostInitialise(); 285 plugin.PostInitialise();
291 286
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCapsModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCapsModule.cs
index b735dfa..c241075 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCapsModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCapsModule.cs
@@ -40,8 +40,8 @@ using OpenSim.Region.Framework.Interfaces;
40using OpenSim.Region.Framework.Scenes; 40using OpenSim.Region.Framework.Scenes;
41using Caps = OpenSim.Framework.Capabilities.Caps; 41using Caps = OpenSim.Framework.Capabilities.Caps;
42 42
43[assembly: Addin("LindenCaps", "0.1")] 43[assembly: Addin("LindenCaps", OpenSim.VersionInfo.VersionNumber)]
44[assembly: AddinDependency("OpenSim", "0.5")] 44[assembly: AddinDependency("OpenSim.Region.Framework", OpenSim.VersionInfo.VersionNumber)]
45namespace OpenSim.Region.ClientStack.Linden 45namespace OpenSim.Region.ClientStack.Linden
46{ 46{
47 47
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
index 5d50eba..feb3322 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
@@ -231,18 +231,12 @@ namespace OpenSim.Region.ClientStack.Linden
231 lock (queue) 231 lock (queue)
232 queue.Enqueue(ev); 232 queue.Enqueue(ev);
233 } 233 }
234 else if (DebugLevel > 0) 234 else
235 { 235 {
236 ScenePresence sp = m_scene.GetScenePresence(avatarID);
237
238 // This assumes that an NPC should never have a queue.
239 if (sp != null && sp.PresenceType != PresenceType.Npc)
240 {
241 OSDMap evMap = (OSDMap)ev; 236 OSDMap evMap = (OSDMap)ev;
242 m_log.WarnFormat( 237 m_log.WarnFormat(
243 "[EVENTQUEUE]: (Enqueue) No queue found for agent {0} {1} when placing message {2} in region {3}", 238 "[EVENTQUEUE]: (Enqueue) No queue found for agent {0} when placing message {1} in region {2}",
244 sp.Name, sp.UUID, evMap["message"], m_scene.Name); 239 avatarID, evMap["message"], m_scene.Name);
245 }
246 } 240 }
247 } 241 }
248 catch (NullReferenceException e) 242 catch (NullReferenceException e)
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueHelper.cs b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueHelper.cs
index 50e22f5..799ad0b 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueHelper.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueHelper.cs
@@ -76,7 +76,7 @@ namespace OpenSim.Region.ClientStack.Linden
76 76
77 llsdSimInfo.Add("Handle", new OSDBinary(ulongToByteArray(handle))); 77 llsdSimInfo.Add("Handle", new OSDBinary(ulongToByteArray(handle)));
78 llsdSimInfo.Add("IP", new OSDBinary(endPoint.Address.GetAddressBytes())); 78 llsdSimInfo.Add("IP", new OSDBinary(endPoint.Address.GetAddressBytes()));
79 llsdSimInfo.Add("Port", new OSDInteger(endPoint.Port)); 79 llsdSimInfo.Add("Port", OSD.FromInteger(endPoint.Port));
80 llsdSimInfo.Add("RegionSizeX", OSD.FromUInteger((uint)regionSizeX)); 80 llsdSimInfo.Add("RegionSizeX", OSD.FromUInteger((uint)regionSizeX));
81 llsdSimInfo.Add("RegionSizeY", OSD.FromUInteger((uint)regionSizeY)); 81 llsdSimInfo.Add("RegionSizeY", OSD.FromUInteger((uint)regionSizeY));
82 82
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs
index 6e2f7f3..2a252e1 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs
@@ -118,8 +118,9 @@ namespace OpenSim.Region.ClientStack.Linden
118 return; 118 return;
119 119
120 m_fetchInventoryDescendents2Url = config.GetString("Cap_FetchInventoryDescendents2", string.Empty); 120 m_fetchInventoryDescendents2Url = config.GetString("Cap_FetchInventoryDescendents2", string.Empty);
121 m_webFetchInventoryDescendentsUrl = config.GetString("Cap_WebFetchInventoryDescendents", string.Empty); 121// m_webFetchInventoryDescendentsUrl = config.GetString("Cap_WebFetchInventoryDescendents", string.Empty);
122 122
123// if (m_fetchInventoryDescendents2Url != string.Empty || m_webFetchInventoryDescendentsUrl != string.Empty)
123 if (m_fetchInventoryDescendents2Url != string.Empty || m_webFetchInventoryDescendentsUrl != string.Empty) 124 if (m_fetchInventoryDescendents2Url != string.Empty || m_webFetchInventoryDescendentsUrl != string.Empty)
124 { 125 {
125 m_Enabled = true; 126 m_Enabled = true;
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index f76db1e..6df55a6 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -3864,6 +3864,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
3864 /// </summary> 3864 /// </summary>
3865 public void SendEntityUpdate(ISceneEntity entity, PrimUpdateFlags updateFlags) 3865 public void SendEntityUpdate(ISceneEntity entity, PrimUpdateFlags updateFlags)
3866 { 3866 {
3867/*
3867 if (entity.UUID == m_agentId && !updateFlags.HasFlag(PrimUpdateFlags.FullUpdate)) 3868 if (entity.UUID == m_agentId && !updateFlags.HasFlag(PrimUpdateFlags.FullUpdate))
3868 { 3869 {
3869 ImprovedTerseObjectUpdatePacket packet 3870 ImprovedTerseObjectUpdatePacket packet
@@ -3874,27 +3875,24 @@ namespace OpenSim.Region.ClientStack.LindenUDP
3874 packet.ObjectData = new ImprovedTerseObjectUpdatePacket.ObjectDataBlock[1]; 3875 packet.ObjectData = new ImprovedTerseObjectUpdatePacket.ObjectDataBlock[1];
3875 packet.ObjectData[0] = CreateImprovedTerseBlock(entity, false); 3876 packet.ObjectData[0] = CreateImprovedTerseBlock(entity, false);
3876 OutPacket(packet, ThrottleOutPacketType.Unknown, true); 3877 OutPacket(packet, ThrottleOutPacketType.Unknown, true);
3878 return;
3877 } 3879 }
3878 3880*/
3879 else if (entity is SceneObjectPart) 3881 if (entity is SceneObjectPart)
3880 { 3882 {
3881 SceneObjectPart e = (SceneObjectPart)entity; 3883 SceneObjectPart e = (SceneObjectPart)entity;
3882 SceneObjectGroup g = e.ParentGroup; 3884 SceneObjectGroup g = e.ParentGroup;
3883 if (g.HasPrivateAttachmentPoint && g.OwnerID != AgentId) 3885 if (g.HasPrivateAttachmentPoint && g.OwnerID != AgentId)
3884 return; // Don't send updates for other people's HUDs 3886 return; // Don't send updates for other people's HUDs
3885 } 3887 }
3886 3888
3887 else 3889 //double priority = m_prioritizer.GetUpdatePriority(this, entity);
3888 { 3890 uint priority = m_prioritizer.GetUpdatePriority(this, entity);
3889 //double priority = m_prioritizer.GetUpdatePriority(this, entity);
3890 uint priority = m_prioritizer.GetUpdatePriority(this, entity);
3891 3891
3892 lock (m_entityUpdates.SyncRoot) 3892 lock (m_entityUpdates.SyncRoot)
3893 m_entityUpdates.Enqueue(priority, new EntityUpdate(entity, updateFlags, m_scene.TimeDilation)); 3893 m_entityUpdates.Enqueue(priority, new EntityUpdate(entity, updateFlags, m_scene.TimeDilation));
3894 }
3895 } 3894 }
3896 3895
3897
3898 /// <summary> 3896 /// <summary>
3899 /// Requeue an EntityUpdate when it was not acknowledged by the client. 3897 /// Requeue an EntityUpdate when it was not acknowledged by the client.
3900 /// We will update the priority and put it in the correct queue, merging update flags 3898 /// We will update the priority and put it in the correct queue, merging update flags
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/MapImage/MapImageServiceModule.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/MapImage/MapImageServiceModule.cs
index db3f900..5365b49 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/MapImage/MapImageServiceModule.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/MapImage/MapImageServiceModule.cs
@@ -94,7 +94,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.MapImage
94 if (config == null) 94 if (config == null)
95 return; 95 return;
96 96
97 int refreshminutes = Convert.ToInt32(config.GetString("RefreshTime", "-1")); 97 int refreshminutes = Convert.ToInt32(config.GetString("RefreshTime", "60"));
98 if (refreshminutes < 0) 98 if (refreshminutes < 0)
99 { 99 {
100 m_log.WarnFormat("[MAP IMAGE SERVICE MODULE]: Negative refresh time given in config. Module disabled."); 100 m_log.WarnFormat("[MAP IMAGE SERVICE MODULE]: Negative refresh time given in config. Module disabled.");
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
index b6d96ac..adcad03 100644
--- a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
+++ b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
@@ -1426,7 +1426,8 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
1426 using (Bitmap mapbmp = m_mapImageGenerator.CreateMapTile()) 1426 using (Bitmap mapbmp = m_mapImageGenerator.CreateMapTile())
1427 { 1427 {
1428 GenerateMaptile(mapbmp); 1428 GenerateMaptile(mapbmp);
1429 m_mapImageServiceModule.UploadMapTile(m_scene, mapbmp); 1429 if(m_mapImageServiceModule != null)
1430 m_mapImageServiceModule.UploadMapTile(m_scene, mapbmp);
1430 } 1431 }
1431 } 1432 }
1432 1433
@@ -1562,7 +1563,8 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
1562 GenerateMaptile(mapbmp); 1563 GenerateMaptile(mapbmp);
1563 1564
1564 // v2/3 (MapImageServiceModule) 1565 // v2/3 (MapImageServiceModule)
1565 m_mapImageServiceModule.UploadMapTile(m_scene, mapbmp); 1566 if(m_mapImageServiceModule !=null)
1567 m_mapImageServiceModule.UploadMapTile(m_scene, mapbmp);
1566 } 1568 }
1567 } 1569 }
1568 1570
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 022a90d..4c346b7 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -873,13 +873,7 @@ namespace OpenSim.Region.Framework.Scenes
873 { 873 {
874 uint x, y; 874 uint x, y;
875 Util.RegionHandleToRegionLoc(handle, out x, out y); 875 Util.RegionHandleToRegionLoc(handle, out x, out y);
876<<<<<<< HEAD
877
878 if (Util.IsOutsideView(DrawDistance, x, Scene.RegionInfo.RegionLocX, y, Scene.RegionInfo.RegionLocY))
879=======
880no information to check this
881// if (Util.IsOutsideView(DrawDistance, x, Scene.RegionInfo.RegionLocX, y, Scene.RegionInfo.RegionLocY,)) 876// if (Util.IsOutsideView(DrawDistance, x, Scene.RegionInfo.RegionLocX, y, Scene.RegionInfo.RegionLocY,))
882>>>>>>> avn/ubitvar
883 { 877 {
884 old.Add(handle); 878 old.Add(handle);
885 } 879 }
@@ -1158,6 +1152,8 @@ no information to check this
1158 { 1152 {
1159 IsLoggingIn = false; 1153 IsLoggingIn = false;
1160 } 1154 }
1155
1156 IsChildAgent = false;
1161 } 1157 }
1162 1158
1163 m_log.DebugFormat("[MakeRootAgent] out lock: {0}ms", Util.EnvironmentTickCountSubtract(ts)); 1159 m_log.DebugFormat("[MakeRootAgent] out lock: {0}ms", Util.EnvironmentTickCountSubtract(ts));
@@ -1172,9 +1168,7 @@ no information to check this
1172 Grouptitle = gm.GetGroupTitle(m_uuid); 1168 Grouptitle = gm.GetGroupTitle(m_uuid);
1173 1169
1174 1170
1175 AgentCircuitData aCircuit = m_scene.AuthenticateHandler.GetAgentCircuitData(ControllingClient.CircuitCode); 1171 if ((m_teleportFlags & TeleportFlags.ViaHGLogin) != 0)
1176 uint teleportFlags = (aCircuit == null) ? 0 : aCircuit.teleportFlags;
1177 if ((teleportFlags & (uint)TeleportFlags.ViaHGLogin) != 0)
1178 { 1172 {
1179 // The avatar is arriving from another grid. This means that we may have changed the 1173 // The avatar is arriving from another grid. This means that we may have changed the
1180 // avatar's name to or from the special Hypergrid format ("First.Last @grid.example.com"). 1174 // avatar's name to or from the special Hypergrid format ("First.Last @grid.example.com").
@@ -2031,8 +2025,8 @@ no information to check this
2031 if (!IsChildAgent && openChildAgents) 2025 if (!IsChildAgent && openChildAgents)
2032 { 2026 {
2033 IFriendsModule friendsModule = m_scene.RequestModuleInterface<IFriendsModule>(); 2027 IFriendsModule friendsModule = m_scene.RequestModuleInterface<IFriendsModule>();
2034 if (friendsModule != null) 2028// if (friendsModule != null)
2035 friendsModule.SendFriendsOnlineIfNeeded(ControllingClient); 2029// friendsModule.SendFriendsOnlineIfNeeded(ControllingClient);
2036 2030
2037 m_log.DebugFormat("[CompleteMovement] friendsModule: {0}ms", Util.EnvironmentTickCountSubtract(ts)); 2031 m_log.DebugFormat("[CompleteMovement] friendsModule: {0}ms", Util.EnvironmentTickCountSubtract(ts));
2038 2032
@@ -2329,9 +2323,7 @@ no information to check this
2329 2323
2330 try 2324 try
2331 { 2325 {
2332 // Don't slide against ground when crouching if camera is panned around avatar 2326 agent_control_v3 += Dir_Vectors[i];
2333 if (Flying || DCF != Dir_ControlFlags.DIR_CONTROL_FLAG_DOWN)
2334 agent_control_v3 += Dir_Vectors[i];
2335 //m_log.DebugFormat("[Motion]: {0}, {1}",i, dirVectors[i]); 2327 //m_log.DebugFormat("[Motion]: {0}, {1}",i, dirVectors[i]);
2336 } 2328 }
2337 catch (IndexOutOfRangeException) 2329 catch (IndexOutOfRangeException)
@@ -2751,44 +2743,6 @@ no information to check this
2751 SceneManager.Instance.TryGetScene(target_region.RegionID, out targetScene); 2743 SceneManager.Instance.TryGetScene(target_region.RegionID, out targetScene);
2752 } 2744 }
2753 2745
2754
2755
2756
2757
2758
2759
2760
2761
2762
2763
2764
2765
2766
2767
2768
2769
2770
2771
2772
2773
2774
2775
2776
2777
2778
2779
2780
2781
2782
2783
2784
2785
2786
2787
2788
2789
2790
2791
2792 float terrainHeight = (float)targetScene.Heightmap[(int)(pos.X % regionSize.X), (int)(pos.Y % regionSize.Y)]; 2746 float terrainHeight = (float)targetScene.Heightmap[(int)(pos.X % regionSize.X), (int)(pos.Y % regionSize.Y)];
2793 // dont try to land underground 2747 // dont try to land underground
2794 terrainHeight += Appearance.AvatarHeight / 2; 2748 terrainHeight += Appearance.AvatarHeight / 2;
diff --git a/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs b/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
index bdddd73..e0030ec 100755
--- a/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
+++ b/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
@@ -502,7 +502,7 @@ namespace OpenSim.Region.Framework.Scenes
502 sb[22].StatID = (uint)Stats.SimSleepMs; 502 sb[22].StatID = (uint)Stats.SimSleepMs;
503 sb[22].StatValue = sleeptime; 503 sb[22].StatValue = sleeptime;
504 504
505 for (int i = 0; i < m_statisticArraySize; i++) 505 for (int i = 0; i < 23; i++)
506 { 506 {
507 lastReportedSimStats[i] = sb[i].StatValue; 507 lastReportedSimStats[i] = sb[i].StatValue;
508 } 508 }
diff --git a/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs b/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
index 24f802e..a139b9b 100644
--- a/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
+++ b/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
@@ -482,7 +482,7 @@ namespace OpenSim.Services.Connectors
482 try 482 try
483 { 483 {
484 newID = SynchronousRestObjectRequester. 484 newID = SynchronousRestObjectRequester.
485 MakeRequest<AssetBase, string>("POST", uri, asset, 25); 485 MakeRequest<AssetBase, string>("POST", uri, asset, 100);
486 if (newID == null || newID == "") 486 if (newID == null || newID == "")
487 { 487 {
488 newID = UUID.Zero.ToString(); 488 newID = UUID.Zero.ToString();
generated by cgit v1.1 at 2024-11-16 11:34:23 +0000