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

Merge branch 'master' into careminster-presence-refactor 

Conflicts:
	OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
avinationmerge
Melanie 2010-10-09 01:07:41 +01:00
parent ff49a21eca 96080dc492
commit 231feab57f
6 changed files with 42 additions and 24 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");

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

1
OpenSim/Region/Physics/Meshing/Meshmerizer.cs
View File

@ -82,6 +82,7 @@ namespace OpenSim.Region.Physics.Meshing
IConfig start_config = config.Configs["Startup"]; IConfig start_config = config.Configs["Startup"];
decodedSculptMapPath = start_config.GetString("DecodedSculptMapPath","j2kDecodeCache"); decodedSculptMapPath = start_config.GetString("DecodedSculptMapPath","j2kDecodeCache");
cacheSculptMaps = start_config.GetBoolean("CacheSculptMaps", cacheSculptMaps);
try try
{ {

5
bin/OpenSim.ini.example
View File

@ -13,7 +13,10 @@
;; An empty question will set the default if the dependencies are ;; An empty question will set the default if the dependencies are
;; satisfied. ;; satisfied.
;; ;;
;; ; denotes a commented option. It is ignored. ;; ; denotes a commented out option. Uncomment it to actvate it
;; and change it to the desired value
;; Any options added to OpenSim.ini.exmaple must be commented out,
;; and their value must represent the default.
[Startup] [Startup]
;# {save_crashes} {} {Save crashes to disk?} {true false} false ;# {save_crashes} {} {Save crashes to disk?} {true false} false

8
bin/OpenSimDefaults.ini
View File

@ -140,6 +140,14 @@
;; Defaults to "j2kDecodeCache ;; Defaults to "j2kDecodeCache
;DecodedSculptMapPath = "j2kDecodeCache" ;DecodedSculptMapPath = "j2kDecodeCache"
;# {CacheSculptMaps} {Cache decoded sculpt maps?} {true false} true
;; if you use Meshmerizer and want sculpt map collisions, setting this to
;; to true will store decoded sculpt maps in a special folder in your bin
;; folder, which can reduce startup times by reducing asset requests. Some
;; versions of mono dont work well when reading the cache files, so set this
;; to false if you have compatability problems.
; CacheSculptMaps = true
; Choose one of the physics engines below ; Choose one of the physics engines below
; OpenDynamicsEngine is by some distance the most developed physics engine ; OpenDynamicsEngine is by some distance the most developed physics engine
; basicphysics effectively does not model physics at all, making all objects phantom ; basicphysics effectively does not model physics at all, making all objects phantom