OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into careminster 

Conflicts:
	OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
avinationmerge
Melanie 2012-06-14 00:10:52 +01:00
parent 12621201ba 16ffc764bf
commit d893e54f4b
9 changed files with 60 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Framework/IClientAPI.cs
View File

@ -1430,8 +1430,6 @@ namespace OpenSim.Framework
void SendGroupVoteHistory(UUID groupID, UUID transactionID, GroupVoteHistory[] Votes);
void KillEndDone();
bool AddGenericPacketHandler(string MethodName, GenericMessage handler);
void SendRebakeAvatarTextures(UUID textureID);

9
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
View File

@ -3904,7 +3904,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
canUseImproved = false;
}
}
#endregion UpdateFlags to packet type conversion
#region Block Construction
@ -11862,7 +11862,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
if (DebugPacketLevel <= 100 && (packet.Type == PacketType.AvatarAnimation || packet.Type == PacketType.ViewerEffect))
logPacket = false;
if (DebugPacketLevel <= 50 && packet.Type == PacketType.ImprovedTerseObjectUpdate)
if (DebugPacketLevel <= 50
& (packet.Type == PacketType.ImprovedTerseObjectUpdate || packet.Type == PacketType.ObjectUpdate))
logPacket = false;
if (DebugPacketLevel <= 25 && packet.Type == PacketType.ObjectPropertiesFamily)
@ -12072,10 +12073,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
return string.Empty;
}
public void KillEndDone()
{
}
#region IClientCore
private readonly Dictionary<Type, object> m_clientInterfaces = new Dictionary<Type, object>();

5
OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
View File

@ -1635,11 +1635,6 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
}
public void KillEndDone()
{
}
public bool AddGenericPacketHandler(string MethodName, GenericMessage handler)
{
return true;

4
OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
View File

@ -1051,10 +1051,6 @@ namespace OpenSim.Region.OptionalModules.World.NPC
{
}
public void KillEndDone()
{
}
public void SendEventInfoReply (EventData info)
{
}

4
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
View File

@ -11737,7 +11737,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
{
Tri t1 = new Tri();
Tri t2 = new Tri();
Vector3 p1 = new Vector3(x-1, y-1, (float)heightfield[x-1, y-1]);
Vector3 p2 = new Vector3(x, y-1, (float)heightfield[x, y-1]);
Vector3 p3 = new Vector3(x, y, (float)heightfield[x, y]);
@ -11778,7 +11778,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
// sometimes
if (Math.Abs(b) < 0.000001)
continue;
double r = a / b;
// ray points away from plane

7
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
View File

@ -1976,7 +1976,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
{
string retval = String.Empty;
IConfigSource config = m_ScriptEngine.ConfigSource;
string url = config.Configs["GridInfo"].GetString("GridInfoURI", String.Empty);
string url = null;
IConfig gridInfoConfig = config.Configs["GridInfo"];
if (gridInfoConfig != null)
url = gridInfoConfig.GetString("GridInfoURI", String.Empty);
if (String.IsNullOrEmpty(url))
return "Configuration Error!";

45
OpenSim/Services/GridService/GridService.cs
View File

@ -84,6 +84,13 @@ namespace OpenSim.Services.GridService
if (MainConsole.Instance != null)
{
MainConsole.Instance.Commands.AddCommand("Regions", true,
"deregister region",
"deregister region <Region UUID>",
"Deregister a region manually.",
String.Empty,
HandleDeregisterRegion);
MainConsole.Instance.Commands.AddCommand("Regions", true,
"show region",
"show region <Region name>",
@ -495,6 +502,44 @@ namespace OpenSim.Services.GridService
return -1;
}
private void HandleDeregisterRegion(string module, string[] cmd)
{
if (cmd.Length != 3)
{
MainConsole.Instance.Output("Syntax: degregister region <Region UUID>");
return;
}
string rawRegionUuid = cmd[2];
UUID regionUuid;
if (!UUID.TryParse(rawRegionUuid, out regionUuid))
{
MainConsole.Instance.OutputFormat("{0} is not a valid region uuid", rawRegionUuid);
return;
}
GridRegion region = GetRegionByUUID(UUID.Zero, regionUuid);
if (region == null)
{
MainConsole.Instance.OutputFormat("No region with UUID {0}", regionUuid);
return;
}
if (DeregisterRegion(regionUuid))
{
MainConsole.Instance.OutputFormat("Deregistered {0} {1}", region.RegionName, regionUuid);
}
else
{
// I don't think this can ever occur if we know that the region exists.
MainConsole.Instance.OutputFormat("Error deregistering {0} {1}", region.RegionName, regionUuid);
}
return;
}
private void HandleShowRegion(string module, string[] cmd)
{
if (cmd.Length != 3)

4
OpenSim/Tests/Common/Mock/TestClient.cs
View File

@ -1131,10 +1131,6 @@ namespace OpenSim.Tests.Common.Mock
{
}
public void KillEndDone()
{
}
public void SendEventInfoReply (EventData info)
{
}

4
bin/OpenSimDefaults.ini
View File

@ -33,6 +33,10 @@
; Console commands run every 20 minutes
; timer_Script = "filename"
; timer_Script time interval (default 20 min)
; The time is 60 per minute
; timer_Interval = 1200
; ##
; ## SYSTEM
; ##