Merge branch 'master' of git://opensimulator.org/git/opensim
commit
2654ab6300
|
@ -44,6 +44,7 @@ namespace OpenSim.Framework.Console
|
||||||
// private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
|
// private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
|
||||||
|
|
||||||
// private readonly object m_syncRoot = new object();
|
// private readonly object m_syncRoot = new object();
|
||||||
|
private const string LOGLEVEL_NONE = "(none)";
|
||||||
|
|
||||||
private int y = -1;
|
private int y = -1;
|
||||||
private int cp = 0;
|
private int cp = 0;
|
||||||
|
@ -278,22 +279,25 @@ namespace OpenSim.Framework.Console
|
||||||
|
|
||||||
private void WriteLocalText(string text, string level)
|
private void WriteLocalText(string text, string level)
|
||||||
{
|
{
|
||||||
string regex = @"^(?<Front>.*?)\[(?<Category>[^\]]+)\]:?(?<End>.*)";
|
|
||||||
|
|
||||||
Regex RE = new Regex(regex, RegexOptions.Multiline);
|
|
||||||
MatchCollection matches = RE.Matches(text);
|
|
||||||
|
|
||||||
string outText = text;
|
string outText = text;
|
||||||
|
|
||||||
if (matches.Count == 1)
|
if (level != LOGLEVEL_NONE)
|
||||||
{
|
{
|
||||||
outText = matches[0].Groups["End"].Value;
|
string regex = @"^(?<Front>.*?)\[(?<Category>[^\]]+)\]:?(?<End>.*)";
|
||||||
System.Console.Write(matches[0].Groups["Front"].Value);
|
|
||||||
|
|
||||||
System.Console.Write("[");
|
Regex RE = new Regex(regex, RegexOptions.Multiline);
|
||||||
WriteColorText(DeriveColor(matches[0].Groups["Category"].Value),
|
MatchCollection matches = RE.Matches(text);
|
||||||
matches[0].Groups["Category"].Value);
|
|
||||||
System.Console.Write("]:");
|
if (matches.Count == 1)
|
||||||
|
{
|
||||||
|
outText = matches[0].Groups["End"].Value;
|
||||||
|
System.Console.Write(matches[0].Groups["Front"].Value);
|
||||||
|
|
||||||
|
System.Console.Write("[");
|
||||||
|
WriteColorText(DeriveColor(matches[0].Groups["Category"].Value),
|
||||||
|
matches[0].Groups["Category"].Value);
|
||||||
|
System.Console.Write("]:");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (level == "error")
|
if (level == "error")
|
||||||
|
@ -308,7 +312,7 @@ namespace OpenSim.Framework.Console
|
||||||
|
|
||||||
public override void Output(string text)
|
public override void Output(string text)
|
||||||
{
|
{
|
||||||
Output(text, "normal");
|
Output(text, LOGLEVEL_NONE);
|
||||||
}
|
}
|
||||||
|
|
||||||
public override void Output(string text, string level)
|
public override void Output(string text, string level)
|
||||||
|
|
|
@ -140,10 +140,10 @@ namespace OpenSim.Framework.Tests
|
||||||
settings.Save();
|
settings.Save();
|
||||||
settings.OnSave -= RegionSaveFired;
|
settings.OnSave -= RegionSaveFired;
|
||||||
|
|
||||||
string str = settings.LoadedCreationDate;
|
// string str = settings.LoadedCreationDate;
|
||||||
int dt = settings.LoadedCreationDateTime;
|
// int dt = settings.LoadedCreationDateTime;
|
||||||
string id = settings.LoadedCreationID;
|
// string id = settings.LoadedCreationID;
|
||||||
string time = settings.LoadedCreationTime;
|
// string time = settings.LoadedCreationTime;
|
||||||
|
|
||||||
Assert.That(m_RegionSettingsOnSaveEventFired, "RegionSettings Save Event didn't Fire");
|
Assert.That(m_RegionSettingsOnSaveEventFired, "RegionSettings Save Event didn't Fire");
|
||||||
|
|
||||||
|
|
|
@ -187,8 +187,16 @@ namespace OpenSim.Region.CoreModules.Avatar.ObjectCaps
|
||||||
int start, end;
|
int start, end;
|
||||||
if (TryParseRange(range, out start, out end))
|
if (TryParseRange(range, out start, out end))
|
||||||
{
|
{
|
||||||
end = Utils.Clamp(end, 1, texture.Data.Length - 1);
|
// Before clamping start make sure we can satisfy it in order to avoid
|
||||||
start = Utils.Clamp(start, 0, end - 1);
|
// sending back the last byte instead of an error status
|
||||||
|
if (start >= texture.Data.Length)
|
||||||
|
{
|
||||||
|
response.StatusCode = (int)System.Net.HttpStatusCode.RequestedRangeNotSatisfiable;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
end = Utils.Clamp(end, 0, texture.Data.Length - 1);
|
||||||
|
start = Utils.Clamp(start, 0, end);
|
||||||
int len = end - start + 1;
|
int len = end - start + 1;
|
||||||
|
|
||||||
//m_log.Debug("Serving " + start + " to " + end + " of " + texture.Data.Length + " bytes for texture " + texture.ID);
|
//m_log.Debug("Serving " + start + " to " + end + " of " + texture.Data.Length + " bytes for texture " + texture.ID);
|
||||||
|
|
|
@ -208,7 +208,10 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
|
||||||
}
|
}
|
||||||
|
|
||||||
foreach (List<SceneObjectGroup> objlist in deletes.Values)
|
foreach (List<SceneObjectGroup> objlist in deletes.Values)
|
||||||
ret = DeleteToInventory(action, folderID, objlist, remoteClient);
|
{
|
||||||
|
foreach (SceneObjectGroup g in objlist)
|
||||||
|
ret = DeleteToInventory(action, folderID, g, remoteClient);
|
||||||
|
}
|
||||||
|
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
|
@ -2694,7 +2694,7 @@ namespace OpenSim.Region.Framework.Scenes
|
||||||
public void PreloadSound(string sound)
|
public void PreloadSound(string sound)
|
||||||
{
|
{
|
||||||
// UUID ownerID = OwnerID;
|
// UUID ownerID = OwnerID;
|
||||||
UUID objectID = UUID;
|
UUID objectID = ParentGroup.RootPart.UUID;
|
||||||
UUID soundID = UUID.Zero;
|
UUID soundID = UUID.Zero;
|
||||||
|
|
||||||
if (!UUID.TryParse(sound, out soundID))
|
if (!UUID.TryParse(sound, out soundID))
|
||||||
|
@ -3101,7 +3101,7 @@ namespace OpenSim.Region.Framework.Scenes
|
||||||
volume = 0;
|
volume = 0;
|
||||||
|
|
||||||
UUID ownerID = _ownerID;
|
UUID ownerID = _ownerID;
|
||||||
UUID objectID = UUID;
|
UUID objectID = ParentGroup.RootPart.UUID;
|
||||||
UUID parentID = GetRootPartUUID();
|
UUID parentID = GetRootPartUUID();
|
||||||
UUID soundID = UUID.Zero;
|
UUID soundID = UUID.Zero;
|
||||||
Vector3 position = AbsolutePosition; // region local
|
Vector3 position = AbsolutePosition; // region local
|
||||||
|
@ -3138,11 +3138,11 @@ namespace OpenSim.Region.Framework.Scenes
|
||||||
else
|
else
|
||||||
soundModule.PlayAttachedSound(soundID, ownerID, objectID, volume, position, flags, radius);
|
soundModule.PlayAttachedSound(soundID, ownerID, objectID, volume, position, flags, radius);
|
||||||
ParentGroup.PlaySoundMasterPrim = this;
|
ParentGroup.PlaySoundMasterPrim = this;
|
||||||
ownerID = this._ownerID;
|
ownerID = _ownerID;
|
||||||
objectID = this.UUID;
|
objectID = ParentGroup.RootPart.UUID;
|
||||||
parentID = this.GetRootPartUUID();
|
parentID = GetRootPartUUID();
|
||||||
position = this.AbsolutePosition; // region local
|
position = AbsolutePosition; // region local
|
||||||
regionHandle = this.ParentGroup.Scene.RegionInfo.RegionHandle;
|
regionHandle = ParentGroup.Scene.RegionInfo.RegionHandle;
|
||||||
if (triggered)
|
if (triggered)
|
||||||
soundModule.TriggerSound(soundID, ownerID, objectID, parentID, volume, position, regionHandle, radius);
|
soundModule.TriggerSound(soundID, ownerID, objectID, parentID, volume, position, regionHandle, radius);
|
||||||
else
|
else
|
||||||
|
@ -3150,7 +3150,7 @@ namespace OpenSim.Region.Framework.Scenes
|
||||||
foreach (SceneObjectPart prim in ParentGroup.PlaySoundSlavePrims)
|
foreach (SceneObjectPart prim in ParentGroup.PlaySoundSlavePrims)
|
||||||
{
|
{
|
||||||
ownerID = prim._ownerID;
|
ownerID = prim._ownerID;
|
||||||
objectID = prim.UUID;
|
objectID = prim.ParentGroup.RootPart.UUID;
|
||||||
parentID = prim.GetRootPartUUID();
|
parentID = prim.GetRootPartUUID();
|
||||||
position = prim.AbsolutePosition; // region local
|
position = prim.AbsolutePosition; // region local
|
||||||
regionHandle = prim.ParentGroup.Scene.RegionInfo.RegionHandle;
|
regionHandle = prim.ParentGroup.Scene.RegionInfo.RegionHandle;
|
||||||
|
|
|
@ -179,11 +179,13 @@ namespace OpenSim.Region.Framework.Scenes
|
||||||
|
|
||||||
public void Reset()
|
public void Reset()
|
||||||
{
|
{
|
||||||
if (m_pendingObjects != null)
|
if (m_pendingObjects == null)
|
||||||
{
|
return;
|
||||||
lock (m_pendingObjects)
|
|
||||||
{
|
|
||||||
|
|
||||||
|
lock (m_pendingObjects)
|
||||||
|
{
|
||||||
|
if (m_pendingObjects != null)
|
||||||
|
{
|
||||||
m_pendingObjects.Clear();
|
m_pendingObjects.Clear();
|
||||||
m_pendingObjects = null;
|
m_pendingObjects = null;
|
||||||
}
|
}
|
||||||
|
|
|
@ -31,6 +31,12 @@
|
||||||
AuthenticationServiceInConnector = true
|
AuthenticationServiceInConnector = true
|
||||||
SimulationServiceInConnector = true
|
SimulationServiceInConnector = true
|
||||||
|
|
||||||
|
[SimulationDataStore]
|
||||||
|
LocalServiceModule = "OpenSim.Services.Connectors.dll:SimulationDataService"
|
||||||
|
|
||||||
|
[EstateDataStore]
|
||||||
|
LocalServiceModule = "OpenSim.Services.Connectors.dll:EstateDataService"
|
||||||
|
|
||||||
[AssetService]
|
[AssetService]
|
||||||
LocalServiceModule = "OpenSim.Services.AssetService.dll:AssetService"
|
LocalServiceModule = "OpenSim.Services.AssetService.dll:AssetService"
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue