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

Merge branch 'master' of git://opensimulator.org/git/opensim

viewer-2-initial-appearance
Jonathan Freedman 2010-10-10 18:06:27 -04:00
parent 4adada6fe4 30f926aab6
commit 2654ab6300
8 changed files with 56 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
OpenSim/Framework/Console/LocalConsole.cs
View File

@ -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;
@ -277,14 +278,16 @@ namespace OpenSim.Framework.Console
} }
private void WriteLocalText(string text, string level) private void WriteLocalText(string text, string level)
{
string outText = text;
if (level != LOGLEVEL_NONE)
{ {
string regex = @"^(?<Front>.*?)\[(?<Category>[^\]]+)\]:?(?<End>.*)"; string regex = @"^(?<Front>.*?)\[(?<Category>[^\]]+)\]:?(?<End>.*)";
Regex RE = new Regex(regex, RegexOptions.Multiline); Regex RE = new Regex(regex, RegexOptions.Multiline);
MatchCollection matches = RE.Matches(text); MatchCollection matches = RE.Matches(text);
string outText = text;
if (matches.Count == 1) if (matches.Count == 1)
{ {
outText = matches[0].Groups["End"].Value; outText = matches[0].Groups["End"].Value;
@ -295,6 +298,7 @@ namespace OpenSim.Framework.Console
matches[0].Groups["Category"].Value); matches[0].Groups["Category"].Value);
System.Console.Write("]:"); System.Console.Write("]:");
} }
}
if (level == "error") if (level == "error")
WriteColorText(ConsoleColor.Red, outText); WriteColorText(ConsoleColor.Red, outText);
@ -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)

8
OpenSim/Framework/Tests/MundaneFrameworkTests.cs
View File

@ -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");

12
OpenSim/Region/CoreModules/Avatar/Assets/GetTextureModule.cs
View File

@ -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);

5
OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
View File

@ -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;
} }

16
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
View File

@ -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;

8
OpenSim/Region/Framework/Scenes/SceneViewer.cs
View File

@ -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;
} }

6
bin/config-include/StandaloneHypergrid.ini
View File

@ -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"