aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--OpenSim/Region/CoreModules/Scripting/XMLRPC/XMLRPCModule.cs9
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs17
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs43
-rw-r--r--OpenSim/Region/OptionalModules/Avatar/Chat/IRCConnector.cs18
-rw-r--r--OpenSim/Region/Physics/BulletSPlugin/BSScene.cs15
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs6
-rw-r--r--OpenSim/Region/UserStatistics/SimStatsAJAX.cs6
-rw-r--r--OpenSim/Services/LLLoginService/LLLoginResponse.cs2
-rw-r--r--OpenSim/Services/LLLoginService/LLLoginService.cs6
-rw-r--r--OpenSim/Tools/OpenSim.32BitLaunch/OpenSim.32BitLaunch.csproj97
-rw-r--r--OpenSim/Tools/Robust.32BitLaunch/Robust.32BitLaunch.csproj99
-rw-r--r--bin/OpenSimDefaults.ini3
-rw-r--r--bin/Robust.HG.ini.example10
-rw-r--r--bin/Robust.ini.example10
-rw-r--r--prebuild.xml1
-rwxr-xr-xshare/32BitLaunch/OpenSim.32BitLaunch.exe (renamed from bin/OpenSim.32BitLaunch.exe)bin5632 -> 5632 bytes
-rw-r--r--share/32BitLaunch/OpenSim.32BitLaunch/Program.cs (renamed from OpenSim/Tools/OpenSim.32BitLaunch/Program.cs)0
-rw-r--r--share/32BitLaunch/OpenSim.32BitLaunch/Properties/AssemblyInfo.cs (renamed from OpenSim/Tools/OpenSim.32BitLaunch/Properties/AssemblyInfo.cs)0
-rw-r--r--share/32BitLaunch/README5
-rwxr-xr-xshare/32BitLaunch/Robust.32BitLaunch.exe (renamed from bin/Robust.32BitLaunch.exe)bin5632 -> 5632 bytes
-rw-r--r--share/32BitLaunch/Robust.32BitLaunch/Program.cs (renamed from OpenSim/Tools/Robust.32BitLaunch/Program.cs)0
-rw-r--r--share/32BitLaunch/Robust.32BitLaunch/Properties/AssemblyInfo.cs (renamed from OpenSim/Tools/Robust.32BitLaunch/Properties/AssemblyInfo.cs)0
-rw-r--r--share/32BitLaunch/Robust.32BitLaunch/Robust.32BitLaunch.sln (renamed from OpenSim/Tools/Robust.32BitLaunch/Robust.32BitLaunch.sln)0
23 files changed, 79 insertions, 268 deletions
diff --git a/OpenSim/Region/CoreModules/Scripting/XMLRPC/XMLRPCModule.cs b/OpenSim/Region/CoreModules/Scripting/XMLRPC/XMLRPCModule.cs
index c6e05b1..d7ea906 100644
--- a/OpenSim/Region/CoreModules/Scripting/XMLRPC/XMLRPCModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/XMLRPC/XMLRPCModule.cs
@@ -36,6 +36,7 @@ using Nini.Config;
36using Nwc.XmlRpc; 36using Nwc.XmlRpc;
37using OpenMetaverse; 37using OpenMetaverse;
38using OpenSim.Framework; 38using OpenSim.Framework;
39using OpenSim.Framework.Monitoring;
39using OpenSim.Framework.Servers; 40using OpenSim.Framework.Servers;
40using OpenSim.Framework.Servers.HttpServer; 41using OpenSim.Framework.Servers.HttpServer;
41using OpenSim.Region.Framework.Interfaces; 42using OpenSim.Region.Framework.Interfaces;
@@ -656,12 +657,8 @@ namespace OpenSim.Region.CoreModules.Scripting.XMLRPC
656 657
657 public void Process() 658 public void Process()
658 { 659 {
659 httpThread = new Thread(SendRequest);
660 httpThread.Name = "HttpRequestThread";
661 httpThread.Priority = ThreadPriority.BelowNormal;
662 httpThread.IsBackground = true;
663 _finished = false; 660 _finished = false;
664 httpThread.Start(); 661 Watchdog.StartThread(SendRequest, "HttpRequestThread", ThreadPriority.BelowNormal, true, false);
665 } 662 }
666 663
667 /* 664 /*
@@ -733,6 +730,8 @@ namespace OpenSim.Region.CoreModules.Scripting.XMLRPC
733 } 730 }
734 731
735 _finished = true; 732 _finished = true;
733
734 Watchdog.RemoveThread();
736 } 735 }
737 736
738 public void Stop() 737 public void Stop()
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 18376c3..5f0dbd7 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -224,6 +224,12 @@ namespace OpenSim.Region.Framework.Scenes
224 public bool m_clampPrimSize; 224 public bool m_clampPrimSize;
225 public bool m_trustBinaries; 225 public bool m_trustBinaries;
226 public bool m_allowScriptCrossings = true; 226 public bool m_allowScriptCrossings = true;
227
228 /// <summary>
229 /// Can avatars cross from and to this region?
230 /// </summary>
231 public bool AllowAvatarCrossing { get; set; }
232
227 public bool m_useFlySlow; 233 public bool m_useFlySlow;
228 public bool m_useTrashOnDelete = true; 234 public bool m_useTrashOnDelete = true;
229 235
@@ -1023,6 +1029,12 @@ namespace OpenSim.Region.Framework.Scenes
1023 1029
1024 #endregion Region Config 1030 #endregion Region Config
1025 1031
1032 IConfig entityTransferConfig = m_config.Configs["EntityTransfer"];
1033 if (entityTransferConfig != null)
1034 {
1035 AllowAvatarCrossing = entityTransferConfig.GetBoolean("AllowAvatarCrossing", AllowAvatarCrossing);
1036 }
1037
1026 #region Interest Management 1038 #region Interest Management
1027 1039
1028 IConfig interestConfig = m_config.Configs["InterestManagement"]; 1040 IConfig interestConfig = m_config.Configs["InterestManagement"];
@@ -1091,6 +1103,8 @@ namespace OpenSim.Region.Framework.Scenes
1091 CollidablePrims = true; 1103 CollidablePrims = true;
1092 PhysicsEnabled = true; 1104 PhysicsEnabled = true;
1093 1105
1106 AllowAvatarCrossing = true;
1107
1094 PeriodicBackup = true; 1108 PeriodicBackup = true;
1095 UseBackup = true; 1109 UseBackup = true;
1096 1110
@@ -5613,6 +5627,9 @@ namespace OpenSim.Region.Framework.Scenes
5613 return true; 5627 return true;
5614 } 5628 }
5615 5629
5630 if (!AllowAvatarCrossing && !viaTeleport)
5631 return false;
5632
5616 // FIXME: Root agent count is currently known to be inaccurate. This forces a recount before we check. 5633 // FIXME: Root agent count is currently known to be inaccurate. This forces a recount before we check.
5617 // However, the long term fix is to make sure root agent count is always accurate. 5634 // However, the long term fix is to make sure root agent count is always accurate.
5618 m_sceneGraph.RecalculateStats(); 5635 m_sceneGraph.RecalculateStats();
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index e0b7640..3c37de8 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -608,8 +608,11 @@ namespace OpenSim.Region.Framework.Scenes
608 } 608 }
609 609
610 /// <summary> 610 /// <summary>
611 /// Current velocity of the avatar. 611 /// Velocity of the avatar with respect to its local reference frame.
612 /// </summary> 612 /// </summary>
613 /// <remarks>
614 /// So when sat on a vehicle this will be 0. To get velocity with respect to the world use GetWorldVelocity()
615 /// </remarks>
613 public override Vector3 Velocity 616 public override Vector3 Velocity
614 { 617 {
615 get 618 get
@@ -622,10 +625,10 @@ namespace OpenSim.Region.Framework.Scenes
622// "[SCENE PRESENCE]: Set velocity {0} for {1} in {2} via getting Velocity!", 625// "[SCENE PRESENCE]: Set velocity {0} for {1} in {2} via getting Velocity!",
623// m_velocity, Name, Scene.RegionInfo.RegionName); 626// m_velocity, Name, Scene.RegionInfo.RegionName);
624 } 627 }
625 else if (ParentPart != null) 628// else if (ParentPart != null)
626 { 629// {
627 return ParentPart.ParentGroup.Velocity; 630// return ParentPart.ParentGroup.Velocity;
628 } 631// }
629 632
630 return m_velocity; 633 return m_velocity;
631 } 634 }
@@ -749,25 +752,32 @@ namespace OpenSim.Region.Framework.Scenes
749 } 752 }
750 753
751 /// <summary> 754 /// <summary>
752 /// Gets the world rotation of this presence. 755 /// Get rotation relative to the world.
753 /// </summary> 756 /// </summary>
754 /// <remarks>
755 /// Unlike Rotation, this returns the world rotation no matter whether the avatar is sitting on a prim or not.
756 /// </remarks>
757 /// <returns></returns> 757 /// <returns></returns>
758 public Quaternion GetWorldRotation() 758 public Quaternion GetWorldRotation()
759 { 759 {
760 if (IsSatOnObject) 760 SceneObjectPart sitPart = ParentPart;
761 {
762 SceneObjectPart sitPart = ParentPart;
763 761
764 if (sitPart != null) 762 if (sitPart != null)
765 return sitPart.GetWorldRotation() * Rotation; 763 return sitPart.GetWorldRotation() * Rotation;
766 }
767 764
768 return Rotation; 765 return Rotation;
769 } 766 }
770 767
768 /// <summary>
769 /// Get velocity relative to the world.
770 /// </summary>
771 public Vector3 GetWorldVelocity()
772 {
773 SceneObjectPart sitPart = ParentPart;
774
775 if (sitPart != null)
776 return sitPart.ParentGroup.Velocity;
777
778 return Velocity;
779 }
780
771 public void AdjustKnownSeeds() 781 public void AdjustKnownSeeds()
772 { 782 {
773 Dictionary<ulong, string> seeds; 783 Dictionary<ulong, string> seeds;
@@ -3216,7 +3226,8 @@ namespace OpenSim.Region.Framework.Scenes
3216 m_lastVelocity = Velocity; 3226 m_lastVelocity = Velocity;
3217 } 3227 }
3218 3228
3219 CheckForBorderCrossing(); 3229 if (Scene.AllowAvatarCrossing)
3230 CheckForBorderCrossing();
3220 3231
3221 CheckForSignificantMovement(); // sends update to the modules. 3232 CheckForSignificantMovement(); // sends update to the modules.
3222 } 3233 }
diff --git a/OpenSim/Region/OptionalModules/Avatar/Chat/IRCConnector.cs b/OpenSim/Region/OptionalModules/Avatar/Chat/IRCConnector.cs
index f5bd44d..bdd07e0 100644
--- a/OpenSim/Region/OptionalModules/Avatar/Chat/IRCConnector.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/Chat/IRCConnector.cs
@@ -109,10 +109,6 @@ namespace OpenSim.Region.OptionalModules.Avatar.Chat
109 109
110 internal int m_resetk = 0; 110 internal int m_resetk = 0;
111 111
112 // Working threads
113
114 private Thread m_listener = null;
115
116 private Object msyncConnect = new Object(); 112 private Object msyncConnect = new Object();
117 113
118 internal bool m_randomizeNick = true; // add random suffix 114 internal bool m_randomizeNick = true; // add random suffix
@@ -363,10 +359,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Chat
363 359
364 m_log.InfoFormat("[IRC-Connector-{0}]: Connected to {1}:{2}", idn, m_server, m_port); 360 m_log.InfoFormat("[IRC-Connector-{0}]: Connected to {1}:{2}", idn, m_server, m_port);
365 361
366 m_listener = new Thread(new ThreadStart(ListenerRun)); 362 Watchdog.StartThread(ListenerRun, "IRCConnectionListenerThread", ThreadPriority.Normal, true, false);
367 m_listener.Name = "IRCConnectorListenerThread";
368 m_listener.IsBackground = true;
369 m_listener.Start();
370 363
371 // This is the message order recommended by RFC 2812 364 // This is the message order recommended by RFC 2812
372 if (m_password != null) 365 if (m_password != null)
@@ -510,21 +503,20 @@ namespace OpenSim.Region.OptionalModules.Avatar.Chat
510 { 503 {
511 while (m_enabled && m_connected) 504 while (m_enabled && m_connected)
512 { 505 {
513
514 if ((inputLine = m_reader.ReadLine()) == null) 506 if ((inputLine = m_reader.ReadLine()) == null)
515 throw new Exception("Listener input socket closed"); 507 throw new Exception("Listener input socket closed");
516 508
509 Watchdog.UpdateThread();
510
517 // m_log.Info("[IRCConnector]: " + inputLine); 511 // m_log.Info("[IRCConnector]: " + inputLine);
518 512
519 if (inputLine.Contains("PRIVMSG")) 513 if (inputLine.Contains("PRIVMSG"))
520 { 514 {
521
522 Dictionary<string, string> data = ExtractMsg(inputLine); 515 Dictionary<string, string> data = ExtractMsg(inputLine);
523 516
524 // Any chat ??? 517 // Any chat ???
525 if (data != null) 518 if (data != null)
526 { 519 {
527
528 OSChatMessage c = new OSChatMessage(); 520 OSChatMessage c = new OSChatMessage();
529 c.Message = data["msg"]; 521 c.Message = data["msg"];
530 c.Type = ChatTypeEnum.Region; 522 c.Type = ChatTypeEnum.Region;
@@ -540,9 +532,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Chat
540 c.Message = String.Format("/me {0}", c.Message.Substring(8, c.Message.Length - 9)); 532 c.Message = String.Format("/me {0}", c.Message.Substring(8, c.Message.Length - 9));
541 533
542 ChannelState.OSChat(this, c, false); 534 ChannelState.OSChat(this, c, false);
543
544 } 535 }
545
546 } 536 }
547 else 537 else
548 { 538 {
@@ -562,6 +552,8 @@ namespace OpenSim.Region.OptionalModules.Avatar.Chat
562 552
563 if (m_enabled && (m_resetk == resetk)) 553 if (m_enabled && (m_resetk == resetk))
564 Reconnect(); 554 Reconnect();
555
556 Watchdog.RemoveThread();
565 } 557 }
566 558
567 private Regex RE = new Regex(@":(?<nick>[\w-]*)!(?<user>\S*) PRIVMSG (?<channel>\S+) :(?<msg>.*)", 559 private Regex RE = new Regex(@":(?<nick>[\w-]*)!(?<user>\S*) PRIVMSG (?<channel>\S+) :(?<msg>.*)",
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
index f7317c0..a46c241 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
@@ -32,6 +32,7 @@ using System.Runtime.InteropServices;
32using System.Text; 32using System.Text;
33using System.Threading; 33using System.Threading;
34using OpenSim.Framework; 34using OpenSim.Framework;
35using OpenSim.Framework.Monitoring;
35using OpenSim.Region.Framework; 36using OpenSim.Region.Framework;
36using OpenSim.Region.CoreModules; 37using OpenSim.Region.CoreModules;
37using Logging = OpenSim.Region.CoreModules.Framework.Statistics.Logging; 38using Logging = OpenSim.Region.CoreModules.Framework.Statistics.Logging;
@@ -286,9 +287,13 @@ public sealed class BSScene : PhysicsScene, IPhysicsParameters
286 if (BSParam.UseSeparatePhysicsThread) 287 if (BSParam.UseSeparatePhysicsThread)
287 { 288 {
288 // The physics simulation should happen independently of the heartbeat loop 289 // The physics simulation should happen independently of the heartbeat loop
289 m_physicsThread = new Thread(BulletSPluginPhysicsThread); 290 m_physicsThread
290 m_physicsThread.Name = BulletEngineName; 291 = Watchdog.StartThread(
291 m_physicsThread.Start(); 292 BulletSPluginPhysicsThread,
293 string.Format("{0} ({1})", BulletEngineName, RegionName),
294 ThreadPriority.Normal,
295 true,
296 true);
292 } 297 }
293 } 298 }
294 299
@@ -856,7 +861,11 @@ public sealed class BSScene : PhysicsScene, IPhysicsParameters
856 // TODO. 861 // TODO.
857 DetailLog("{0},BulletSPluginPhysicsThread,longerThanRealtime={1}", BSScene.DetailLogZero, simulationTimeVsRealtimeDifferenceMS); 862 DetailLog("{0},BulletSPluginPhysicsThread,longerThanRealtime={1}", BSScene.DetailLogZero, simulationTimeVsRealtimeDifferenceMS);
858 } 863 }
864
865 Watchdog.UpdateThread();
859 } 866 }
867
868 Watchdog.RemoveThread();
860 } 869 }
861 870
862 #endregion // Simulation 871 #endregion // Simulation
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 5d7fc9d..7c384b2 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -2560,7 +2560,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2560 if (m_host.ParentGroup.IsAttachment) 2560 if (m_host.ParentGroup.IsAttachment)
2561 { 2561 {
2562 ScenePresence avatar = m_host.ParentGroup.Scene.GetScenePresence(m_host.ParentGroup.AttachedAvatar); 2562 ScenePresence avatar = m_host.ParentGroup.Scene.GetScenePresence(m_host.ParentGroup.AttachedAvatar);
2563 vel = avatar.Velocity; 2563 vel = avatar.GetWorldVelocity();
2564 } 2564 }
2565 else 2565 else
2566 { 2566 {
@@ -11221,7 +11221,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
11221 ret.Add(new LSL_Rotation(av.GetWorldRotation())); 11221 ret.Add(new LSL_Rotation(av.GetWorldRotation()));
11222 break; 11222 break;
11223 case ScriptBaseClass.OBJECT_VELOCITY: 11223 case ScriptBaseClass.OBJECT_VELOCITY:
11224 ret.Add(new LSL_Vector(av.Velocity.X, av.Velocity.Y, av.Velocity.Z)); 11224 ret.Add(new LSL_Vector(av.GetWorldVelocity()));
11225 break; 11225 break;
11226 case ScriptBaseClass.OBJECT_OWNER: 11226 case ScriptBaseClass.OBJECT_OWNER:
11227 ret.Add(new LSL_String(id)); 11227 ret.Add(new LSL_String(id));
@@ -11342,7 +11342,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
11342 ScenePresence sp = World.GetScenePresence(obj.ParentGroup.AttachedAvatar); 11342 ScenePresence sp = World.GetScenePresence(obj.ParentGroup.AttachedAvatar);
11343 11343
11344 if (sp != null) 11344 if (sp != null)
11345 vel = sp.Velocity; 11345 vel = sp.GetWorldVelocity();
11346 } 11346 }
11347 else 11347 else
11348 { 11348 {
diff --git a/OpenSim/Region/UserStatistics/SimStatsAJAX.cs b/OpenSim/Region/UserStatistics/SimStatsAJAX.cs
index ad848a1..06d9e91 100644
--- a/OpenSim/Region/UserStatistics/SimStatsAJAX.cs
+++ b/OpenSim/Region/UserStatistics/SimStatsAJAX.cs
@@ -162,9 +162,6 @@ namespace OpenSim.Region.UserStatistics
162 output.Append("OthrMS"); 162 output.Append("OthrMS");
163 HTMLUtil.TD_C(ref output); 163 HTMLUtil.TD_C(ref output);
164 HTMLUtil.TD_O(ref output, TDHeaderClass); 164 HTMLUtil.TD_O(ref output, TDHeaderClass);
165 output.Append("ScrLPS");
166 HTMLUtil.TD_C(ref output);
167 HTMLUtil.TD_O(ref output, TDHeaderClass);
168 output.Append("OutPPS"); 165 output.Append("OutPPS");
169 HTMLUtil.TD_C(ref output); 166 HTMLUtil.TD_C(ref output);
170 HTMLUtil.TD_O(ref output, TDHeaderClass); 167 HTMLUtil.TD_O(ref output, TDHeaderClass);
@@ -194,9 +191,6 @@ namespace OpenSim.Region.UserStatistics
194 output.Append(sdata.OtherFrameTime); 191 output.Append(sdata.OtherFrameTime);
195 HTMLUtil.TD_C(ref output); 192 HTMLUtil.TD_C(ref output);
196 HTMLUtil.TD_O(ref output, TDDataClassCenter); 193 HTMLUtil.TD_O(ref output, TDDataClassCenter);
197 output.Append(sdata.ScriptLinesPerSecond);
198 HTMLUtil.TD_C(ref output);
199 HTMLUtil.TD_O(ref output, TDDataClassCenter);
200 output.Append(sdata.OutPacketsPerSecond); 194 output.Append(sdata.OutPacketsPerSecond);
201 HTMLUtil.TD_C(ref output); 195 HTMLUtil.TD_C(ref output);
202 HTMLUtil.TD_O(ref output, TDDataClassCenter); 196 HTMLUtil.TD_O(ref output, TDDataClassCenter);
diff --git a/OpenSim/Services/LLLoginService/LLLoginResponse.cs b/OpenSim/Services/LLLoginService/LLLoginResponse.cs
index e67ecf0..27376cc 100644
--- a/OpenSim/Services/LLLoginService/LLLoginResponse.cs
+++ b/OpenSim/Services/LLLoginService/LLLoginResponse.cs
@@ -227,7 +227,7 @@ namespace OpenSim.Services.LLLoginService
227 public LLLoginResponse(UserAccount account, AgentCircuitData aCircuit, GridUserInfo pinfo, 227 public LLLoginResponse(UserAccount account, AgentCircuitData aCircuit, GridUserInfo pinfo,
228 GridRegion destination, List<InventoryFolderBase> invSkel, FriendInfo[] friendsList, ILibraryService libService, 228 GridRegion destination, List<InventoryFolderBase> invSkel, FriendInfo[] friendsList, ILibraryService libService,
229 string where, string startlocation, Vector3 position, Vector3 lookAt, List<InventoryItemBase> gestures, string message, 229 string where, string startlocation, Vector3 position, Vector3 lookAt, List<InventoryItemBase> gestures, string message,
230 GridRegion home, IPEndPoint clientIP, string mapTileURL, string profileURL, string openIDURL, string searchURL, string currency, 230 GridRegion home, IPEndPoint clientIP, string mapTileURL, string searchURL, string currency,
231 string DSTZone, string destinationsURL, string avatarsURL, string classifiedFee) 231 string DSTZone, string destinationsURL, string avatarsURL, string classifiedFee)
232 : this() 232 : this()
233 { 233 {
diff --git a/OpenSim/Services/LLLoginService/LLLoginService.cs b/OpenSim/Services/LLLoginService/LLLoginService.cs
index 0ad9f92..8059652 100644
--- a/OpenSim/Services/LLLoginService/LLLoginService.cs
+++ b/OpenSim/Services/LLLoginService/LLLoginService.cs
@@ -77,8 +77,6 @@ namespace OpenSim.Services.LLLoginService
77 protected string m_GatekeeperURL; 77 protected string m_GatekeeperURL;
78 protected bool m_AllowRemoteSetLoginLevel; 78 protected bool m_AllowRemoteSetLoginLevel;
79 protected string m_MapTileURL; 79 protected string m_MapTileURL;
80 protected string m_ProfileURL;
81 protected string m_OpenIDURL;
82 protected string m_SearchURL; 80 protected string m_SearchURL;
83 protected string m_Currency; 81 protected string m_Currency;
84 protected string m_ClassifiedFee; 82 protected string m_ClassifiedFee;
@@ -119,8 +117,6 @@ namespace OpenSim.Services.LLLoginService
119 m_GatekeeperURL = Util.GetConfigVarFromSections<string>(config, "GatekeeperURI", 117 m_GatekeeperURL = Util.GetConfigVarFromSections<string>(config, "GatekeeperURI",
120 new string[] { "Startup", "Hypergrid", "LoginService" }, String.Empty); 118 new string[] { "Startup", "Hypergrid", "LoginService" }, String.Empty);
121 m_MapTileURL = m_LoginServerConfig.GetString("MapTileURL", string.Empty); 119 m_MapTileURL = m_LoginServerConfig.GetString("MapTileURL", string.Empty);
122 m_ProfileURL = m_LoginServerConfig.GetString("ProfileServerURL", string.Empty);
123 m_OpenIDURL = m_LoginServerConfig.GetString("OpenIDServerURL", String.Empty);
124 m_SearchURL = m_LoginServerConfig.GetString("SearchURL", string.Empty); 120 m_SearchURL = m_LoginServerConfig.GetString("SearchURL", string.Empty);
125 m_Currency = m_LoginServerConfig.GetString("Currency", string.Empty); 121 m_Currency = m_LoginServerConfig.GetString("Currency", string.Empty);
126 m_ClassifiedFee = m_LoginServerConfig.GetString("ClassifiedFee", string.Empty); 122 m_ClassifiedFee = m_LoginServerConfig.GetString("ClassifiedFee", string.Empty);
@@ -498,7 +494,7 @@ namespace OpenSim.Services.LLLoginService
498 = new LLLoginResponse( 494 = new LLLoginResponse(
499 account, aCircuit, guinfo, destination, inventorySkel, friendsList, m_LibraryService, 495 account, aCircuit, guinfo, destination, inventorySkel, friendsList, m_LibraryService,
500 where, startLocation, position, lookAt, gestures, m_WelcomeMessage, home, clientIP, 496 where, startLocation, position, lookAt, gestures, m_WelcomeMessage, home, clientIP,
501 m_MapTileURL, m_ProfileURL, m_OpenIDURL, m_SearchURL, m_Currency, m_DSTZone, 497 m_MapTileURL, m_SearchURL, m_Currency, m_DSTZone,
502 m_DestinationGuide, m_AvatarPicker, m_ClassifiedFee); 498 m_DestinationGuide, m_AvatarPicker, m_ClassifiedFee);
503 499
504 m_log.DebugFormat("[LLOGIN SERVICE]: All clear. Sending login response to {0} {1}", firstName, lastName); 500 m_log.DebugFormat("[LLOGIN SERVICE]: All clear. Sending login response to {0} {1}", firstName, lastName);
diff --git a/OpenSim/Tools/OpenSim.32BitLaunch/OpenSim.32BitLaunch.csproj b/OpenSim/Tools/OpenSim.32BitLaunch/OpenSim.32BitLaunch.csproj
deleted file mode 100644
index 4625c33..0000000
--- a/OpenSim/Tools/OpenSim.32BitLaunch/OpenSim.32BitLaunch.csproj
+++ /dev/null
@@ -1,97 +0,0 @@
1<?xml version="1.0" encoding="utf-8"?>
2<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3 <PropertyGroup>
4 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
5 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
6 <ProductVersion>9.0.30729</ProductVersion>
7 <SchemaVersion>2.0</SchemaVersion>
8 <ProjectGuid>{595D67F3-B413-4A43-8568-5B5930E3B31D}</ProjectGuid>
9 <OutputType>Exe</OutputType>
10 <AppDesignerFolder>Properties</AppDesignerFolder>
11 <RootNamespace>OpenSim._32BitLaunch</RootNamespace>
12 <AssemblyName>OpenSim.32BitLaunch</AssemblyName>
13 <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
14 <FileAlignment>512</FileAlignment>
15 <FileUpgradeFlags>
16 </FileUpgradeFlags>
17 <UpgradeBackupLocation>
18 </UpgradeBackupLocation>
19 <OldToolsVersion>3.5</OldToolsVersion>
20 <PublishUrl>publish\</PublishUrl>
21 <Install>true</Install>
22 <InstallFrom>Disk</InstallFrom>
23 <UpdateEnabled>false</UpdateEnabled>
24 <UpdateMode>Foreground</UpdateMode>
25 <UpdateInterval>7</UpdateInterval>
26 <UpdateIntervalUnits>Days</UpdateIntervalUnits>
27 <UpdatePeriodically>false</UpdatePeriodically>
28 <UpdateRequired>false</UpdateRequired>
29 <MapFileExtensions>true</MapFileExtensions>
30 <ApplicationRevision>0</ApplicationRevision>
31 <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
32 <IsWebBootstrapper>false</IsWebBootstrapper>
33 <UseApplicationTrust>false</UseApplicationTrust>
34 <BootstrapperEnabled>true</BootstrapperEnabled>
35 </PropertyGroup>
36 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
37 <DebugSymbols>true</DebugSymbols>
38 <DebugType>full</DebugType>
39 <Optimize>false</Optimize>
40 <OutputPath>..\..\..\bin\</OutputPath>
41 <DefineConstants>DEBUG;TRACE</DefineConstants>
42 <ErrorReport>prompt</ErrorReport>
43 <WarningLevel>4</WarningLevel>
44 <PlatformTarget>x86</PlatformTarget>
45 </PropertyGroup>
46 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
47 <DebugType>pdbonly</DebugType>
48 <Optimize>true</Optimize>
49 <OutputPath>bin\Release\</OutputPath>
50 <DefineConstants>TRACE</DefineConstants>
51 <ErrorReport>prompt</ErrorReport>
52 <WarningLevel>4</WarningLevel>
53 </PropertyGroup>
54 <ItemGroup>
55 <Reference Include="log4net, Version=1.2.10.0, Culture=neutral, PublicKeyToken=1b44e1d426115821, processorArchitecture=MSIL" />
56 <Reference Include="OpenSim, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
57 <SpecificVersion>False</SpecificVersion>
58 <ExecutableExtension>.exe</ExecutableExtension>
59 <HintPath>..\..\..\bin\OpenSim.exe</HintPath>
60 </Reference>
61 <Reference Include="System" />
62 </ItemGroup>
63 <ItemGroup>
64 <Compile Include="Program.cs" />
65 <Compile Include="Properties\AssemblyInfo.cs" />
66 </ItemGroup>
67 <ItemGroup>
68 <BootstrapperPackage Include=".NETFramework,Version=v4.0">
69 <Visible>False</Visible>
70 <ProductName>Microsoft .NET Framework 4 %28x86 and x64%29</ProductName>
71 <Install>true</Install>
72 </BootstrapperPackage>
73 <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
74 <Visible>False</Visible>
75 <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
76 <Install>false</Install>
77 </BootstrapperPackage>
78 <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
79 <Visible>False</Visible>
80 <ProductName>.NET Framework 3.5 SP1</ProductName>
81 <Install>false</Install>
82 </BootstrapperPackage>
83 <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
84 <Visible>False</Visible>
85 <ProductName>Windows Installer 3.1</ProductName>
86 <Install>true</Install>
87 </BootstrapperPackage>
88 </ItemGroup>
89 <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
90 <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
91 Other similar extension points exist, see Microsoft.Common.targets.
92 <Target Name="BeforeBuild">
93 </Target>
94 <Target Name="AfterBuild">
95 </Target>
96 -->
97</Project> \ No newline at end of file
diff --git a/OpenSim/Tools/Robust.32BitLaunch/Robust.32BitLaunch.csproj b/OpenSim/Tools/Robust.32BitLaunch/Robust.32BitLaunch.csproj
deleted file mode 100644
index 9618c08..0000000
--- a/OpenSim/Tools/Robust.32BitLaunch/Robust.32BitLaunch.csproj
+++ /dev/null
@@ -1,99 +0,0 @@
1<?xml version="1.0" encoding="utf-8"?>
2<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3 <PropertyGroup>
4 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
5 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
6 <ProductVersion>9.0.30729</ProductVersion>
7 <SchemaVersion>2.0</SchemaVersion>
8 <ProjectGuid>{595D67F3-B413-4A43-8568-5B5930E3B31D}</ProjectGuid>
9 <OutputType>Exe</OutputType>
10 <AppDesignerFolder>Properties</AppDesignerFolder>
11 <RootNamespace>Robust._32BitLaunch</RootNamespace>
12 <AssemblyName>Robust.32BitLaunch</AssemblyName>
13 <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
14 <FileAlignment>512</FileAlignment>
15 <FileUpgradeFlags>
16 </FileUpgradeFlags>
17 <UpgradeBackupLocation>
18 </UpgradeBackupLocation>
19 <OldToolsVersion>3.5</OldToolsVersion>
20 <PublishUrl>publish\</PublishUrl>
21 <Install>true</Install>
22 <InstallFrom>Disk</InstallFrom>
23 <UpdateEnabled>false</UpdateEnabled>
24 <UpdateMode>Foreground</UpdateMode>
25 <UpdateInterval>7</UpdateInterval>
26 <UpdateIntervalUnits>Days</UpdateIntervalUnits>
27 <UpdatePeriodically>false</UpdatePeriodically>
28 <UpdateRequired>false</UpdateRequired>
29 <MapFileExtensions>true</MapFileExtensions>
30 <ApplicationRevision>0</ApplicationRevision>
31 <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
32 <IsWebBootstrapper>false</IsWebBootstrapper>
33 <UseApplicationTrust>false</UseApplicationTrust>
34 <BootstrapperEnabled>true</BootstrapperEnabled>
35 </PropertyGroup>
36 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
37 <DebugSymbols>true</DebugSymbols>
38 <DebugType>full</DebugType>
39 <Optimize>false</Optimize>
40 <OutputPath>..\..\..\bin\</OutputPath>
41 <DefineConstants>DEBUG;TRACE</DefineConstants>
42 <ErrorReport>prompt</ErrorReport>
43 <WarningLevel>4</WarningLevel>
44 <PlatformTarget>x86</PlatformTarget>
45 </PropertyGroup>
46 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
47 <DebugType>pdbonly</DebugType>
48 <Optimize>true</Optimize>
49 <OutputPath>bin\Release\</OutputPath>
50 <DefineConstants>TRACE</DefineConstants>
51 <ErrorReport>prompt</ErrorReport>
52 <WarningLevel>4</WarningLevel>
53 </PropertyGroup>
54 <ItemGroup>
55 <Reference Include="log4net, Version=1.2.10.0, Culture=neutral, PublicKeyToken=1b44e1d426115821, processorArchitecture=MSIL">
56 <SpecificVersion>False</SpecificVersion>
57 <HintPath>..\..\..\bin\log4net.dll</HintPath>
58 </Reference>
59 <Reference Include="Robust, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
60 <SpecificVersion>False</SpecificVersion>
61 <HintPath>..\..\..\bin\Robust.exe</HintPath>
62 </Reference>
63 <Reference Include="System" />
64 </ItemGroup>
65 <ItemGroup>
66 <Compile Include="Program.cs" />
67 <Compile Include="Properties\AssemblyInfo.cs" />
68 </ItemGroup>
69 <ItemGroup>
70 <BootstrapperPackage Include=".NETFramework,Version=v4.0">
71 <Visible>False</Visible>
72 <ProductName>Microsoft .NET Framework 4 %28x86 and x64%29</ProductName>
73 <Install>true</Install>
74 </BootstrapperPackage>
75 <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
76 <Visible>False</Visible>
77 <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
78 <Install>false</Install>
79 </BootstrapperPackage>
80 <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
81 <Visible>False</Visible>
82 <ProductName>.NET Framework 3.5 SP1</ProductName>
83 <Install>false</Install>
84 </BootstrapperPackage>
85 <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
86 <Visible>False</Visible>
87 <ProductName>Windows Installer 3.1</ProductName>
88 <Install>true</Install>
89 </BootstrapperPackage>
90 </ItemGroup>
91 <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
92 <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
93 Other similar extension points exist, see Microsoft.Common.targets.
94 <Target Name="BeforeBuild">
95 </Target>
96 <Target Name="AfterBuild">
97 </Target>
98 -->
99</Project> \ No newline at end of file
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 2cd32c6..5361e8d 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -711,6 +711,9 @@
711 ; 711 ;
712 max_distance = 65535 712 max_distance = 65535
713 713
714 ; Allow avatars to cross into and out of the region.
715 AllowAvatarCrossing = true
716
714 ; Minimum user level required for HyperGrid teleports 717 ; Minimum user level required for HyperGrid teleports
715 LevelHGTeleport = 0 718 LevelHGTeleport = 0
716 719
diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example
index 684c019..edcbec3 100644
--- a/bin/Robust.HG.ini.example
+++ b/bin/Robust.HG.ini.example
@@ -372,16 +372,6 @@ HGAssetServiceConnector = "HGAssetService@8002/OpenSim.Server.Handlers.dll:Asset
372 ; Url to search service 372 ; Url to search service
373 ; SearchURL = "http://127.0.0.1:8002/"; 373 ; SearchURL = "http://127.0.0.1:8002/";
374 374
375 ; For V2/3 Web Profiles
376 ; Work in progress: The ProfileServerURL/OpenIDServerURL are
377 ; being used in a development viewer as support for webprofiles
378 ; is being developed across the componets
379 ;
380 ; ProfileServerURL = "http://127.0.0.1/profiles/[AGENT_NAME]"
381 ;
382 ; For V2/V3 webapp authentication SSO
383 ; OpenIDServerURL = "http://127.0.0.1/openid/openidserver/"
384
385 ; For V3 destination guide 375 ; For V3 destination guide
386 ; DestinationGuide = "http://127.0.0.1/guide" 376 ; DestinationGuide = "http://127.0.0.1/guide"
387 377
diff --git a/bin/Robust.ini.example b/bin/Robust.ini.example
index eafab64..6686c3f 100644
--- a/bin/Robust.ini.example
+++ b/bin/Robust.ini.example
@@ -331,16 +331,6 @@ MapGetServiceConnector = "8002/OpenSim.Server.Handlers.dll:MapGetServiceConnecto
331 ; Url to search service 331 ; Url to search service
332 ; SearchURL = "http://127.0.0.1:8002/"; 332 ; SearchURL = "http://127.0.0.1:8002/";
333 333
334 ; For V2/3 Web Profiles
335 ; Work in progress: The ProfileServerURL/OpenIDServerURL are
336 ; being used in a development viewer as support for webprofiles
337 ; is being developed across the componets
338 ;
339 ; ProfileServerURL = "http://127.0.0.1/profiles/[AGENT_NAME]"
340 ;
341 ; For V2/V3 webapp authentication SSO
342 ; OpenIDServerURL = "http://127.0.0.1/openid/openidserver/"
343
344 ; For V3 destination guide 334 ; For V3 destination guide
345 ; DestinationGuide = "http://127.0.0.1/guide" 335 ; DestinationGuide = "http://127.0.0.1/guide"
346 336
diff --git a/prebuild.xml b/prebuild.xml
index 006f545..ba18a2c 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -1746,6 +1746,7 @@
1746 <Reference name="OpenMetaverseTypes" path="../../../../bin/"/> 1746 <Reference name="OpenMetaverseTypes" path="../../../../bin/"/>
1747 <Reference name="Nini.dll" path="../../../../bin/"/> 1747 <Reference name="Nini.dll" path="../../../../bin/"/>
1748 <Reference name="OpenSim.Framework"/> 1748 <Reference name="OpenSim.Framework"/>
1749 <Reference name="OpenSim.Framework.Monitoring"/>
1749 <Reference name="OpenSim.Region.Framework"/> 1750 <Reference name="OpenSim.Region.Framework"/>
1750 <Reference name="OpenSim.Region.CoreModules"/> 1751 <Reference name="OpenSim.Region.CoreModules"/>
1751 <Reference name="OpenSim.Region.OptionalModules"/> 1752 <Reference name="OpenSim.Region.OptionalModules"/>
diff --git a/bin/OpenSim.32BitLaunch.exe b/share/32BitLaunch/OpenSim.32BitLaunch.exe
index 62c14af..62c14af 100755
--- a/bin/OpenSim.32BitLaunch.exe
+++ b/share/32BitLaunch/OpenSim.32BitLaunch.exe
Binary files differ
diff --git a/OpenSim/Tools/OpenSim.32BitLaunch/Program.cs b/share/32BitLaunch/OpenSim.32BitLaunch/Program.cs
index 52806b8..52806b8 100644
--- a/OpenSim/Tools/OpenSim.32BitLaunch/Program.cs
+++ b/share/32BitLaunch/OpenSim.32BitLaunch/Program.cs
diff --git a/OpenSim/Tools/OpenSim.32BitLaunch/Properties/AssemblyInfo.cs b/share/32BitLaunch/OpenSim.32BitLaunch/Properties/AssemblyInfo.cs
index e81870f..e81870f 100644
--- a/OpenSim/Tools/OpenSim.32BitLaunch/Properties/AssemblyInfo.cs
+++ b/share/32BitLaunch/OpenSim.32BitLaunch/Properties/AssemblyInfo.cs
diff --git a/share/32BitLaunch/README b/share/32BitLaunch/README
new file mode 100644
index 0000000..443cde0
--- /dev/null
+++ b/share/32BitLaunch/README
@@ -0,0 +1,5 @@
1Many issues appear in the support channels because of a misunderstanding of the use of these utilities. And through discussion at OpenSimulator Office Hours it was determined that these tools probably serve no useful purpose anymore.
2
3Instead of removing them immediately, we move them here, for a time, in case there is a useful purpose that has escaped us during conversations.
4
5If a need to compile these arises, the OpenSim.32BitLaunch and Robust.32BitLaunch directories may be placed under the ./OpenSim/Tools sources subdirectory, run the prebuild script and compile.
diff --git a/bin/Robust.32BitLaunch.exe b/share/32BitLaunch/Robust.32BitLaunch.exe
index affedb4..affedb4 100755
--- a/bin/Robust.32BitLaunch.exe
+++ b/share/32BitLaunch/Robust.32BitLaunch.exe
Binary files differ
diff --git a/OpenSim/Tools/Robust.32BitLaunch/Program.cs b/share/32BitLaunch/Robust.32BitLaunch/Program.cs
index 490414c..490414c 100644
--- a/OpenSim/Tools/Robust.32BitLaunch/Program.cs
+++ b/share/32BitLaunch/Robust.32BitLaunch/Program.cs
diff --git a/OpenSim/Tools/Robust.32BitLaunch/Properties/AssemblyInfo.cs b/share/32BitLaunch/Robust.32BitLaunch/Properties/AssemblyInfo.cs
index cf80f47..cf80f47 100644
--- a/OpenSim/Tools/Robust.32BitLaunch/Properties/AssemblyInfo.cs
+++ b/share/32BitLaunch/Robust.32BitLaunch/Properties/AssemblyInfo.cs
diff --git a/OpenSim/Tools/Robust.32BitLaunch/Robust.32BitLaunch.sln b/share/32BitLaunch/Robust.32BitLaunch/Robust.32BitLaunch.sln
index a48a2d3..a48a2d3 100644
--- a/OpenSim/Tools/Robust.32BitLaunch/Robust.32BitLaunch.sln
+++ b/share/32BitLaunch/Robust.32BitLaunch/Robust.32BitLaunch.sln
generated by cgit v1.1 at 2024-08-24 14:55:40 +0000