diff options
Diffstat (limited to '')
9 files changed, 60 insertions, 24 deletions
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs index af76ea9..4b15325 100644 --- a/OpenSim/Framework/IClientAPI.cs +++ b/OpenSim/Framework/IClientAPI.cs | |||
@@ -1430,8 +1430,6 @@ namespace OpenSim.Framework | |||
1430 | 1430 | ||
1431 | void SendGroupVoteHistory(UUID groupID, UUID transactionID, GroupVoteHistory[] Votes); | 1431 | void SendGroupVoteHistory(UUID groupID, UUID transactionID, GroupVoteHistory[] Votes); |
1432 | 1432 | ||
1433 | void KillEndDone(); | ||
1434 | |||
1435 | bool AddGenericPacketHandler(string MethodName, GenericMessage handler); | 1433 | bool AddGenericPacketHandler(string MethodName, GenericMessage handler); |
1436 | 1434 | ||
1437 | void SendRebakeAvatarTextures(UUID textureID); | 1435 | void SendRebakeAvatarTextures(UUID textureID); |
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs index b40eeed..18602f7 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | |||
@@ -3904,7 +3904,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
3904 | canUseImproved = false; | 3904 | canUseImproved = false; |
3905 | } | 3905 | } |
3906 | } | 3906 | } |
3907 | 3907 | ||
3908 | #endregion UpdateFlags to packet type conversion | 3908 | #endregion UpdateFlags to packet type conversion |
3909 | 3909 | ||
3910 | #region Block Construction | 3910 | #region Block Construction |
@@ -11862,7 +11862,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
11862 | if (DebugPacketLevel <= 100 && (packet.Type == PacketType.AvatarAnimation || packet.Type == PacketType.ViewerEffect)) | 11862 | if (DebugPacketLevel <= 100 && (packet.Type == PacketType.AvatarAnimation || packet.Type == PacketType.ViewerEffect)) |
11863 | logPacket = false; | 11863 | logPacket = false; |
11864 | 11864 | ||
11865 | if (DebugPacketLevel <= 50 && packet.Type == PacketType.ImprovedTerseObjectUpdate) | 11865 | if (DebugPacketLevel <= 50 |
11866 | & (packet.Type == PacketType.ImprovedTerseObjectUpdate || packet.Type == PacketType.ObjectUpdate)) | ||
11866 | logPacket = false; | 11867 | logPacket = false; |
11867 | 11868 | ||
11868 | if (DebugPacketLevel <= 25 && packet.Type == PacketType.ObjectPropertiesFamily) | 11869 | if (DebugPacketLevel <= 25 && packet.Type == PacketType.ObjectPropertiesFamily) |
@@ -12072,10 +12073,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
12072 | return string.Empty; | 12073 | return string.Empty; |
12073 | } | 12074 | } |
12074 | 12075 | ||
12075 | public void KillEndDone() | ||
12076 | { | ||
12077 | } | ||
12078 | |||
12079 | #region IClientCore | 12076 | #region IClientCore |
12080 | 12077 | ||
12081 | private readonly Dictionary<Type, object> m_clientInterfaces = new Dictionary<Type, object>(); | 12078 | private readonly Dictionary<Type, object> m_clientInterfaces = new Dictionary<Type, object>(); |
diff --git a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs index eac8e84..b449089 100644 --- a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs +++ b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs | |||
@@ -1635,11 +1635,6 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server | |||
1635 | 1635 | ||
1636 | } | 1636 | } |
1637 | 1637 | ||
1638 | public void KillEndDone() | ||
1639 | { | ||
1640 | |||
1641 | } | ||
1642 | |||
1643 | public bool AddGenericPacketHandler(string MethodName, GenericMessage handler) | 1638 | public bool AddGenericPacketHandler(string MethodName, GenericMessage handler) |
1644 | { | 1639 | { |
1645 | return true; | 1640 | return true; |
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs index e798382..4fcf40d 100644 --- a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs +++ b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs | |||
@@ -1051,10 +1051,6 @@ namespace OpenSim.Region.OptionalModules.World.NPC | |||
1051 | { | 1051 | { |
1052 | } | 1052 | } |
1053 | 1053 | ||
1054 | public void KillEndDone() | ||
1055 | { | ||
1056 | } | ||
1057 | |||
1058 | public void SendEventInfoReply (EventData info) | 1054 | public void SendEventInfoReply (EventData info) |
1059 | { | 1055 | { |
1060 | } | 1056 | } |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index 713f832..5aa0678 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
@@ -11737,7 +11737,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
11737 | { | 11737 | { |
11738 | Tri t1 = new Tri(); | 11738 | Tri t1 = new Tri(); |
11739 | Tri t2 = new Tri(); | 11739 | Tri t2 = new Tri(); |
11740 | 11740 | ||
11741 | Vector3 p1 = new Vector3(x-1, y-1, (float)heightfield[x-1, y-1]); | 11741 | Vector3 p1 = new Vector3(x-1, y-1, (float)heightfield[x-1, y-1]); |
11742 | Vector3 p2 = new Vector3(x, y-1, (float)heightfield[x, y-1]); | 11742 | Vector3 p2 = new Vector3(x, y-1, (float)heightfield[x, y-1]); |
11743 | Vector3 p3 = new Vector3(x, y, (float)heightfield[x, y]); | 11743 | Vector3 p3 = new Vector3(x, y, (float)heightfield[x, y]); |
@@ -11778,7 +11778,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
11778 | // sometimes | 11778 | // sometimes |
11779 | if (Math.Abs(b) < 0.000001) | 11779 | if (Math.Abs(b) < 0.000001) |
11780 | continue; | 11780 | continue; |
11781 | 11781 | ||
11782 | double r = a / b; | 11782 | double r = a / b; |
11783 | 11783 | ||
11784 | // ray points away from plane | 11784 | // ray points away from plane |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs index 8237b60..795376b 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | |||
@@ -1976,7 +1976,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
1976 | { | 1976 | { |
1977 | string retval = String.Empty; | 1977 | string retval = String.Empty; |
1978 | IConfigSource config = m_ScriptEngine.ConfigSource; | 1978 | IConfigSource config = m_ScriptEngine.ConfigSource; |
1979 | string url = config.Configs["GridInfo"].GetString("GridInfoURI", String.Empty); | 1979 | string url = null; |
1980 | |||
1981 | IConfig gridInfoConfig = config.Configs["GridInfo"]; | ||
1982 | |||
1983 | if (gridInfoConfig != null) | ||
1984 | url = gridInfoConfig.GetString("GridInfoURI", String.Empty); | ||
1980 | 1985 | ||
1981 | if (String.IsNullOrEmpty(url)) | 1986 | if (String.IsNullOrEmpty(url)) |
1982 | return "Configuration Error!"; | 1987 | return "Configuration Error!"; |
diff --git a/OpenSim/Services/GridService/GridService.cs b/OpenSim/Services/GridService/GridService.cs index 8a60ca5..11897f8 100644 --- a/OpenSim/Services/GridService/GridService.cs +++ b/OpenSim/Services/GridService/GridService.cs | |||
@@ -85,6 +85,13 @@ namespace OpenSim.Services.GridService | |||
85 | if (MainConsole.Instance != null) | 85 | if (MainConsole.Instance != null) |
86 | { | 86 | { |
87 | MainConsole.Instance.Commands.AddCommand("Regions", true, | 87 | MainConsole.Instance.Commands.AddCommand("Regions", true, |
88 | "deregister region", | ||
89 | "deregister region <Region UUID>", | ||
90 | "Deregister a region manually.", | ||
91 | String.Empty, | ||
92 | HandleDeregisterRegion); | ||
93 | |||
94 | MainConsole.Instance.Commands.AddCommand("Regions", true, | ||
88 | "show region", | 95 | "show region", |
89 | "show region <Region name>", | 96 | "show region <Region name>", |
90 | "Show details on a region", | 97 | "Show details on a region", |
@@ -495,6 +502,44 @@ namespace OpenSim.Services.GridService | |||
495 | return -1; | 502 | return -1; |
496 | } | 503 | } |
497 | 504 | ||
505 | private void HandleDeregisterRegion(string module, string[] cmd) | ||
506 | { | ||
507 | if (cmd.Length != 3) | ||
508 | { | ||
509 | MainConsole.Instance.Output("Syntax: degregister region <Region UUID>"); | ||
510 | return; | ||
511 | } | ||
512 | |||
513 | string rawRegionUuid = cmd[2]; | ||
514 | UUID regionUuid; | ||
515 | |||
516 | if (!UUID.TryParse(rawRegionUuid, out regionUuid)) | ||
517 | { | ||
518 | MainConsole.Instance.OutputFormat("{0} is not a valid region uuid", rawRegionUuid); | ||
519 | return; | ||
520 | } | ||
521 | |||
522 | GridRegion region = GetRegionByUUID(UUID.Zero, regionUuid); | ||
523 | |||
524 | if (region == null) | ||
525 | { | ||
526 | MainConsole.Instance.OutputFormat("No region with UUID {0}", regionUuid); | ||
527 | return; | ||
528 | } | ||
529 | |||
530 | if (DeregisterRegion(regionUuid)) | ||
531 | { | ||
532 | MainConsole.Instance.OutputFormat("Deregistered {0} {1}", region.RegionName, regionUuid); | ||
533 | } | ||
534 | else | ||
535 | { | ||
536 | // I don't think this can ever occur if we know that the region exists. | ||
537 | MainConsole.Instance.OutputFormat("Error deregistering {0} {1}", region.RegionName, regionUuid); | ||
538 | } | ||
539 | |||
540 | return; | ||
541 | } | ||
542 | |||
498 | private void HandleShowRegion(string module, string[] cmd) | 543 | private void HandleShowRegion(string module, string[] cmd) |
499 | { | 544 | { |
500 | if (cmd.Length != 3) | 545 | if (cmd.Length != 3) |
diff --git a/OpenSim/Tests/Common/Mock/TestClient.cs b/OpenSim/Tests/Common/Mock/TestClient.cs index 8cea476f..fb70904 100644 --- a/OpenSim/Tests/Common/Mock/TestClient.cs +++ b/OpenSim/Tests/Common/Mock/TestClient.cs | |||
@@ -1131,10 +1131,6 @@ namespace OpenSim.Tests.Common.Mock | |||
1131 | { | 1131 | { |
1132 | } | 1132 | } |
1133 | 1133 | ||
1134 | public void KillEndDone() | ||
1135 | { | ||
1136 | } | ||
1137 | |||
1138 | public void SendEventInfoReply (EventData info) | 1134 | public void SendEventInfoReply (EventData info) |
1139 | { | 1135 | { |
1140 | } | 1136 | } |
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index 58e9b10..ac8d568 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini | |||
@@ -33,6 +33,10 @@ | |||
33 | ; Console commands run every 20 minutes | 33 | ; Console commands run every 20 minutes |
34 | ; timer_Script = "filename" | 34 | ; timer_Script = "filename" |
35 | 35 | ||
36 | ; timer_Script time interval (default 20 min) | ||
37 | ; The time is 60 per minute | ||
38 | ; timer_Interval = 1200 | ||
39 | |||
36 | ; ## | 40 | ; ## |
37 | ; ## SYSTEM | 41 | ; ## SYSTEM |
38 | ; ## | 42 | ; ## |