diff options
16 files changed, 104 insertions, 29 deletions
diff --git a/BUILDING.md b/BUILDING.md index 5210b58..d8deeeb 100644 --- a/BUILDING.md +++ b/BUILDING.md | |||
@@ -19,10 +19,14 @@ Prereqs: | |||
19 | 19 | ||
20 | From the distribution type: | 20 | From the distribution type: |
21 | * ./runprebuild.sh | 21 | * ./runprebuild.sh |
22 | * nant (or xbuild) | 22 | * nant (or !* xbuild) |
23 | * cd bin | 23 | * cd bin |
24 | * copy OpenSim.ini.example to OpenSim.ini and other appropriate files in bin/config-include | 24 | * copy OpenSim.ini.example to OpenSim.ini and other appropriate files in bin/config-include |
25 | * run mono OpenSim.exe | 25 | * run mono OpenSim.exe |
26 | !* xbuild option switches | ||
27 | !* clean: xbuild /target:clean | ||
28 | !* debug: (default) xbuild /property:Configuration=Debug | ||
29 | !* release: xbuild /property:Configuration=Release | ||
26 | 30 | ||
27 | # Using Monodevelop | 31 | # Using Monodevelop |
28 | 32 | ||
diff --git a/OpenSim/Addons/Groups/Remote/GroupsServiceRobustConnector.cs b/OpenSim/Addons/Groups/Remote/GroupsServiceRobustConnector.cs index 55ae6db..52b9728 100644 --- a/OpenSim/Addons/Groups/Remote/GroupsServiceRobustConnector.cs +++ b/OpenSim/Addons/Groups/Remote/GroupsServiceRobustConnector.cs | |||
@@ -109,7 +109,7 @@ namespace OpenSim.Groups | |||
109 | string method = request["METHOD"].ToString(); | 109 | string method = request["METHOD"].ToString(); |
110 | request.Remove("METHOD"); | 110 | request.Remove("METHOD"); |
111 | 111 | ||
112 | m_log.DebugFormat("[Groups.Handler]: {0}", method); | 112 | // m_log.DebugFormat("[Groups.Handler]: {0}", method); |
113 | switch (method) | 113 | switch (method) |
114 | { | 114 | { |
115 | case "PUTGROUP": | 115 | case "PUTGROUP": |
diff --git a/OpenSim/Data/PGSQL/Properties/AssemblyInfo.cs b/OpenSim/Data/PGSQL/Properties/AssemblyInfo.cs index 27d0679..d2096a8 100644 --- a/OpenSim/Data/PGSQL/Properties/AssemblyInfo.cs +++ b/OpenSim/Data/PGSQL/Properties/AssemblyInfo.cs | |||
@@ -61,5 +61,5 @@ using System.Runtime.InteropServices; | |||
61 | // You can specify all the values or you can default the Revision and Build Numbers | 61 | // You can specify all the values or you can default the Revision and Build Numbers |
62 | // by using the '*' as shown below: | 62 | // by using the '*' as shown below: |
63 | 63 | ||
64 | [assembly : AssemblyVersion("0.7.6.*")] | 64 | [assembly : AssemblyVersion("0.8.0.*")] |
65 | 65 | ||
diff --git a/OpenSim/Framework/Communications/RestClient.cs b/OpenSim/Framework/Communications/RestClient.cs index 89e6aa1..586400f 100644 --- a/OpenSim/Framework/Communications/RestClient.cs +++ b/OpenSim/Framework/Communications/RestClient.cs | |||
@@ -299,6 +299,14 @@ namespace OpenSim.Framework.Communications | |||
299 | /// <summary> | 299 | /// <summary> |
300 | /// Perform a synchronous request | 300 | /// Perform a synchronous request |
301 | /// </summary> | 301 | /// </summary> |
302 | public Stream Request() | ||
303 | { | ||
304 | return Request(null); | ||
305 | } | ||
306 | |||
307 | /// <summary> | ||
308 | /// Perform a synchronous request | ||
309 | /// </summary> | ||
302 | public Stream Request(IServiceAuth auth) | 310 | public Stream Request(IServiceAuth auth) |
303 | { | 311 | { |
304 | lock (_lock) | 312 | lock (_lock) |
diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs index ce14b58..7ac94a0 100644 --- a/OpenSim/Framework/RegionInfo.cs +++ b/OpenSim/Framework/RegionInfo.cs | |||
@@ -147,8 +147,29 @@ namespace OpenSim.Framework | |||
147 | public uint WorldLocX = 0; | 147 | public uint WorldLocX = 0; |
148 | public uint WorldLocY = 0; | 148 | public uint WorldLocY = 0; |
149 | public uint WorldLocZ = 0; | 149 | public uint WorldLocZ = 0; |
150 | |||
151 | /// <summary> | ||
152 | /// X dimension of the region. | ||
153 | /// </summary> | ||
154 | /// <remarks> | ||
155 | /// If this is a varregion then the default size set here will be replaced when we load the region config. | ||
156 | /// </remarks> | ||
150 | public uint RegionSizeX = Constants.RegionSize; | 157 | public uint RegionSizeX = Constants.RegionSize; |
158 | |||
159 | /// <summary> | ||
160 | /// X dimension of the region. | ||
161 | /// </summary> | ||
162 | /// <remarks> | ||
163 | /// If this is a varregion then the default size set here will be replaced when we load the region config. | ||
164 | /// </remarks> | ||
151 | public uint RegionSizeY = Constants.RegionSize; | 165 | public uint RegionSizeY = Constants.RegionSize; |
166 | |||
167 | /// <summary> | ||
168 | /// Z dimension of the region. | ||
169 | /// </summary> | ||
170 | /// <remarks> | ||
171 | /// XXX: Unknown if this accounts for regions with negative Z. | ||
172 | /// </remarks> | ||
152 | public uint RegionSizeZ = Constants.RegionHeight; | 173 | public uint RegionSizeZ = Constants.RegionHeight; |
153 | 174 | ||
154 | private Dictionary<String, String> m_extraSettings = new Dictionary<string, string>(); | 175 | private Dictionary<String, String> m_extraSettings = new Dictionary<string, string>(); |
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/Tests/WebFetchInvDescModuleTests.cs b/OpenSim/Region/ClientStack/Linden/Caps/Tests/WebFetchInvDescModuleTests.cs index edc5016..ee1ea1a 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/Tests/WebFetchInvDescModuleTests.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/Tests/WebFetchInvDescModuleTests.cs | |||
@@ -152,7 +152,7 @@ namespace OpenSim.Region.ClientStack.Linden.Caps.Tests | |||
152 | 152 | ||
153 | // A sanity check that the response has the expected number of descendents for a default inventory | 153 | // A sanity check that the response has the expected number of descendents for a default inventory |
154 | // TODO: Need a more thorough check. | 154 | // TODO: Need a more thorough check. |
155 | Assert.That((int)folderOsd["descendents"], Is.EqualTo(14)); | 155 | Assert.That((int)folderOsd["descendents"], Is.EqualTo(16)); |
156 | } | 156 | } |
157 | } | 157 | } |
158 | } \ No newline at end of file | 158 | } \ No newline at end of file |
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs index b98afbc..e4977cf 100644 --- a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs +++ b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs | |||
@@ -1578,12 +1578,20 @@ namespace OpenSim.Region.CoreModules.World.WorldMap | |||
1578 | 1578 | ||
1579 | private Byte[] GenerateOverlay() | 1579 | private Byte[] GenerateOverlay() |
1580 | { | 1580 | { |
1581 | using (Bitmap overlay = new Bitmap(256, 256)) | 1581 | // These need to be ints for bitmap generation |
1582 | int regionSizeX = (int)m_scene.RegionInfo.RegionSizeX; | ||
1583 | int regionSizeY = (int)m_scene.RegionInfo.RegionSizeY; | ||
1584 | |||
1585 | int landTileSize = LandManagementModule.LandUnit; | ||
1586 | int regionLandTilesX = regionSizeX / landTileSize; | ||
1587 | int regionLandTilesY = regionSizeY / landTileSize; | ||
1588 | |||
1589 | using (Bitmap overlay = new Bitmap(regionSizeX, regionSizeY)) | ||
1582 | { | 1590 | { |
1583 | bool[,] saleBitmap = new bool[64, 64]; | 1591 | bool[,] saleBitmap = new bool[regionLandTilesX, regionLandTilesY]; |
1584 | for (int x = 0 ; x < 64 ; x++) | 1592 | for (int x = 0; x < regionLandTilesX; x++) |
1585 | { | 1593 | { |
1586 | for (int y = 0 ; y < 64 ; y++) | 1594 | for (int y = 0; y < regionLandTilesY; y++) |
1587 | saleBitmap[x, y] = false; | 1595 | saleBitmap[x, y] = false; |
1588 | } | 1596 | } |
1589 | 1597 | ||
@@ -1596,8 +1604,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap | |||
1596 | using (Graphics g = Graphics.FromImage(overlay)) | 1604 | using (Graphics g = Graphics.FromImage(overlay)) |
1597 | { | 1605 | { |
1598 | using (SolidBrush transparent = new SolidBrush(background)) | 1606 | using (SolidBrush transparent = new SolidBrush(background)) |
1599 | g.FillRectangle(transparent, 0, 0, 256, 256); | 1607 | g.FillRectangle(transparent, 0, 0, regionSizeX, regionSizeY); |
1600 | |||
1601 | 1608 | ||
1602 | foreach (ILandObject land in parcels) | 1609 | foreach (ILandObject land in parcels) |
1603 | { | 1610 | { |
@@ -1620,12 +1627,16 @@ namespace OpenSim.Region.CoreModules.World.WorldMap | |||
1620 | 1627 | ||
1621 | using (SolidBrush yellow = new SolidBrush(Color.FromArgb(255, 249, 223, 9))) | 1628 | using (SolidBrush yellow = new SolidBrush(Color.FromArgb(255, 249, 223, 9))) |
1622 | { | 1629 | { |
1623 | for (int x = 0 ; x < 64 ; x++) | 1630 | for (int x = 0 ; x < regionLandTilesX ; x++) |
1624 | { | 1631 | { |
1625 | for (int y = 0 ; y < 64 ; y++) | 1632 | for (int y = 0 ; y < regionLandTilesY ; y++) |
1626 | { | 1633 | { |
1627 | if (saleBitmap[x, y]) | 1634 | if (saleBitmap[x, y]) |
1628 | g.FillRectangle(yellow, x * 4, 252 - (y * 4), 4, 4); | 1635 | g.FillRectangle( |
1636 | yellow, x * landTileSize, | ||
1637 | regionSizeX - landTileSize - (y * landTileSize), | ||
1638 | landTileSize, | ||
1639 | landTileSize); | ||
1629 | } | 1640 | } |
1630 | } | 1641 | } |
1631 | } | 1642 | } |
@@ -1654,4 +1665,4 @@ namespace OpenSim.Region.CoreModules.World.WorldMap | |||
1654 | public uint itemtype; | 1665 | public uint itemtype; |
1655 | public ulong regionhandle; | 1666 | public ulong regionhandle; |
1656 | } | 1667 | } |
1657 | } | 1668 | } \ No newline at end of file |
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 17f54c2..37353c1 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -3257,7 +3257,11 @@ namespace OpenSim.Region.Framework.Scenes | |||
3257 | float distanceError = Vector3.Distance(OffsetPosition, expectedPosition); | 3257 | float distanceError = Vector3.Distance(OffsetPosition, expectedPosition); |
3258 | 3258 | ||
3259 | float speed = Velocity.Length(); | 3259 | float speed = Velocity.Length(); |
3260 | float velocidyDiff = Vector3.Distance(lastVelocitySentToAllClients, Velocity); | 3260 | float velocityDiff = Vector3.Distance(lastVelocitySentToAllClients, Velocity); |
3261 | |||
3262 | // m_log.DebugFormat( | ||
3263 | // "[SCENE PRESENCE]: Delta-v {0}, lastVelocity {1}, Velocity {2} for {3} in {4}", | ||
3264 | // velocidyDiff, lastVelocitySentToAllClients, Velocity, Name, Scene.Name); | ||
3261 | 3265 | ||
3262 | // assuming 5 ms. worst case precision for timer, use 2x that | 3266 | // assuming 5 ms. worst case precision for timer, use 2x that |
3263 | // for distance error threshold | 3267 | // for distance error threshold |
@@ -3265,8 +3269,12 @@ namespace OpenSim.Region.Framework.Scenes | |||
3265 | 3269 | ||
3266 | if (speed < 0.01f // allow rotation updates if avatar position is unchanged | 3270 | if (speed < 0.01f // allow rotation updates if avatar position is unchanged |
3267 | || Math.Abs(distanceError) > distanceErrorThreshold | 3271 | || Math.Abs(distanceError) > distanceErrorThreshold |
3268 | || velocidyDiff > 0.01f) // did velocity change from last update? | 3272 | || velocityDiff > 0.01f) // did velocity change from last update? |
3269 | { | 3273 | { |
3274 | // m_log.DebugFormat( | ||
3275 | // "[SCENE PRESENCE]: Update triggered with speed {0}, distanceError {1}, distanceThreshold {2}, delta-v {3} for {4} in {5}", | ||
3276 | // speed, distanceError, distanceErrorThreshold, velocidyDiff, Name, Scene.Name); | ||
3277 | |||
3270 | lastVelocitySentToAllClients = Velocity; | 3278 | lastVelocitySentToAllClients = Velocity; |
3271 | lastTerseUpdateToAllClientsTick = currentTick; | 3279 | lastTerseUpdateToAllClientsTick = currentTick; |
3272 | lastPositionSentToAllClients = OffsetPosition; | 3280 | lastPositionSentToAllClients = OffsetPosition; |
diff --git a/OpenSim/Region/OptionalModules/Scripting/RegionReadyModule/RegionReadyModule.cs b/OpenSim/Region/OptionalModules/Scripting/RegionReadyModule/RegionReadyModule.cs index d059b97..870c0bb 100644 --- a/OpenSim/Region/OptionalModules/Scripting/RegionReadyModule/RegionReadyModule.cs +++ b/OpenSim/Region/OptionalModules/Scripting/RegionReadyModule/RegionReadyModule.cs | |||
@@ -105,8 +105,10 @@ namespace OpenSim.Region.OptionalModules.Scripting.RegionReady | |||
105 | m_scene.LoginLock = true; | 105 | m_scene.LoginLock = true; |
106 | m_scene.EventManager.OnEmptyScriptCompileQueue += OnEmptyScriptCompileQueue; | 106 | m_scene.EventManager.OnEmptyScriptCompileQueue += OnEmptyScriptCompileQueue; |
107 | 107 | ||
108 | // Warn level because the region cannot be used while logins are disabled | 108 | // This should always show up to the user but should not trigger warn/errors as these messages are |
109 | m_log.WarnFormat("[RegionReady]: Region {0} - LOGINS DISABLED DURING INITIALIZATION.", m_scene.Name); | 109 | // expected and are not simulator problems. Ideally, there would be a status level in log4net but |
110 | // failing that, we will print out to console instead. | ||
111 | MainConsole.Instance.OutputFormat("Region {0} - LOGINS DISABLED DURING INITIALIZATION.", m_scene.Name); | ||
110 | 112 | ||
111 | if (m_uri != string.Empty) | 113 | if (m_uri != string.Empty) |
112 | { | 114 | { |
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs b/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs index dfcd2bf..9b56fb4 100644 --- a/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs | |||
@@ -744,7 +744,18 @@ public sealed class BSCharacter : BSPhysObject | |||
744 | // and will send agent updates to the clients if velocity changes by more than | 744 | // and will send agent updates to the clients if velocity changes by more than |
745 | // 0.001m/s. Bullet introduces a lot of jitter in the velocity which causes many | 745 | // 0.001m/s. Bullet introduces a lot of jitter in the velocity which causes many |
746 | // extra updates. | 746 | // extra updates. |
747 | if (!entprop.Velocity.ApproxEquals(RawVelocity, 0.1f)) | 747 | // |
748 | // XXX: Contrary to the above comment, setting an update threshold here above 0.4 actually introduces jitter to | ||
749 | // avatar movement rather than removes it. The larger the threshold, the bigger the jitter. | ||
750 | // This is most noticeable in level flight and can be seen with | ||
751 | // the "show updates" option in a viewer. With an update threshold, the RawVelocity cycles between a lower | ||
752 | // bound and an upper bound, where the difference between the two is enough to trigger a large delta v update | ||
753 | // and subsequently trigger an update in ScenePresence.SendTerseUpdateToAllClients(). The cause of this cycle (feedback?) | ||
754 | // has not yet been identified. | ||
755 | // | ||
756 | // If there is a threshold below 0.4 or no threshold check at all (as in ODE), then RawVelocity stays constant and extra | ||
757 | // updates are not triggered in ScenePresence.SendTerseUpdateToAllClients(). | ||
758 | // if (!entprop.Velocity.ApproxEquals(RawVelocity, 0.1f)) | ||
748 | RawVelocity = entprop.Velocity; | 759 | RawVelocity = entprop.Velocity; |
749 | 760 | ||
750 | _acceleration = entprop.Acceleration; | 761 | _acceleration = entprop.Acceleration; |
diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/CompilerTest.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/CompilerTest.cs index badf82a..713b280 100644 --- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/CompilerTest.cs +++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/CompilerTest.cs | |||
@@ -25,6 +25,7 @@ | |||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System; | ||
28 | using System.IO; | 29 | using System.IO; |
29 | using System.CodeDom.Compiler; | 30 | using System.CodeDom.Compiler; |
30 | using System.Collections.Generic; | 31 | using System.Collections.Generic; |
@@ -48,6 +49,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools.Tests | |||
48 | private CSharpCodeProvider m_CSCodeProvider; | 49 | private CSharpCodeProvider m_CSCodeProvider; |
49 | private CompilerParameters m_compilerParameters; | 50 | private CompilerParameters m_compilerParameters; |
50 | private CompilerResults m_compilerResults; | 51 | private CompilerResults m_compilerResults; |
52 | private ResolveEventHandler m_resolveEventHandler; | ||
51 | 53 | ||
52 | /// <summary> | 54 | /// <summary> |
53 | /// Creates a temporary directory where build artifacts are stored. | 55 | /// Creates a temporary directory where build artifacts are stored. |
@@ -67,7 +69,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools.Tests | |||
67 | m_CSCodeProvider = new CSharpCodeProvider(); | 69 | m_CSCodeProvider = new CSharpCodeProvider(); |
68 | m_compilerParameters = new CompilerParameters(); | 70 | m_compilerParameters = new CompilerParameters(); |
69 | 71 | ||
70 | string rootPath = Path.Combine(Path.GetDirectoryName(System.AppDomain.CurrentDomain.BaseDirectory)); | 72 | string rootPath = System.AppDomain.CurrentDomain.BaseDirectory; |
73 | |||
74 | m_resolveEventHandler = new ResolveEventHandler(AssemblyResolver.OnAssemblyResolve); | ||
75 | |||
76 | System.AppDomain.CurrentDomain.AssemblyResolve += m_resolveEventHandler; | ||
77 | |||
71 | m_compilerParameters.ReferencedAssemblies.Add(Path.Combine(rootPath, "OpenSim.Region.ScriptEngine.Shared.dll")); | 78 | m_compilerParameters.ReferencedAssemblies.Add(Path.Combine(rootPath, "OpenSim.Region.ScriptEngine.Shared.dll")); |
72 | m_compilerParameters.ReferencedAssemblies.Add(Path.Combine(rootPath, "OpenSim.Region.ScriptEngine.Shared.Api.Runtime.dll")); | 79 | m_compilerParameters.ReferencedAssemblies.Add(Path.Combine(rootPath, "OpenSim.Region.ScriptEngine.Shared.Api.Runtime.dll")); |
73 | m_compilerParameters.ReferencedAssemblies.Add(Path.Combine(rootPath, "OpenMetaverseTypes.dll")); | 80 | m_compilerParameters.ReferencedAssemblies.Add(Path.Combine(rootPath, "OpenMetaverseTypes.dll")); |
@@ -81,6 +88,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools.Tests | |||
81 | [TestFixtureTearDown] | 88 | [TestFixtureTearDown] |
82 | public void CleanUp() | 89 | public void CleanUp() |
83 | { | 90 | { |
91 | System.AppDomain.CurrentDomain.AssemblyResolve -= m_resolveEventHandler; | ||
92 | |||
84 | if (Directory.Exists(m_testDir)) | 93 | if (Directory.Exists(m_testDir)) |
85 | { | 94 | { |
86 | // Blow away the temporary directory with artifacts. | 95 | // Blow away the temporary directory with artifacts. |
@@ -166,10 +175,11 @@ default | |||
166 | 175 | ||
167 | m_compilerResults = m_CSCodeProvider.CompileAssemblyFromSource(m_compilerParameters, output); | 176 | m_compilerResults = m_CSCodeProvider.CompileAssemblyFromSource(m_compilerParameters, output); |
168 | 177 | ||
169 | // foreach (CompilerError compErr in m_compilerResults.Errors) | 178 | System.Console.WriteLine("ERRORS: {0}", m_compilerResults.Errors.Count); |
170 | // { | 179 | foreach (CompilerError compErr in m_compilerResults.Errors) |
171 | // System.Console.WriteLine("Error: {0}", compErr); | 180 | { |
172 | // } | 181 | System.Console.WriteLine("Error: {0}", compErr); |
182 | } | ||
173 | 183 | ||
174 | Assert.AreEqual(0, m_compilerResults.Errors.Count); | 184 | Assert.AreEqual(0, m_compilerResults.Errors.Count); |
175 | } | 185 | } |
diff --git a/OpenSim/Server/Handlers/Authentication/AuthenticationServerPostHandler.cs b/OpenSim/Server/Handlers/Authentication/AuthenticationServerPostHandler.cs index e258dde..5d65f67 100644 --- a/OpenSim/Server/Handlers/Authentication/AuthenticationServerPostHandler.cs +++ b/OpenSim/Server/Handlers/Authentication/AuthenticationServerPostHandler.cs | |||
@@ -74,7 +74,7 @@ namespace OpenSim.Server.Handlers.Authentication | |||
74 | protected override byte[] ProcessRequest(string path, Stream request, | 74 | protected override byte[] ProcessRequest(string path, Stream request, |
75 | IOSHttpRequest httpRequest, IOSHttpResponse httpResponse) | 75 | IOSHttpRequest httpRequest, IOSHttpResponse httpResponse) |
76 | { | 76 | { |
77 | m_log.Error("[XXX]: Authenticating..."); | 77 | // m_log.Error("[XXX]: Authenticating..."); |
78 | string[] p = SplitParams(path); | 78 | string[] p = SplitParams(path); |
79 | 79 | ||
80 | if (p.Length > 0) | 80 | if (p.Length > 0) |
diff --git a/OpenSim/Services/Connectors/Authentication/AuthenticationServicesConnector.cs b/OpenSim/Services/Connectors/Authentication/AuthenticationServicesConnector.cs index 56b6434..c8a4912 100644 --- a/OpenSim/Services/Connectors/Authentication/AuthenticationServicesConnector.cs +++ b/OpenSim/Services/Connectors/Authentication/AuthenticationServicesConnector.cs | |||
@@ -108,7 +108,7 @@ namespace OpenSim.Services.Connectors | |||
108 | 108 | ||
109 | public bool Verify(UUID principalID, string token, int lifetime) | 109 | public bool Verify(UUID principalID, string token, int lifetime) |
110 | { | 110 | { |
111 | m_log.Error("[XXX]: Verify"); | 111 | // m_log.Error("[XXX]: Verify"); |
112 | Dictionary<string, object> sendData = new Dictionary<string, object>(); | 112 | Dictionary<string, object> sendData = new Dictionary<string, object>(); |
113 | sendData["LIFETIME"] = lifetime.ToString(); | 113 | sendData["LIFETIME"] = lifetime.ToString(); |
114 | sendData["PRINCIPAL"] = principalID.ToString(); | 114 | sendData["PRINCIPAL"] = principalID.ToString(); |
diff --git a/bin/Robust.32BitLaunch.exe.config b/bin/Robust.32BitLaunch.exe.config index 95061e1..0399a1b 100644 --- a/bin/Robust.32BitLaunch.exe.config +++ b/bin/Robust.32BitLaunch.exe.config | |||
@@ -17,7 +17,7 @@ | |||
17 | <acceptOnMatch value="false"/> | 17 | <acceptOnMatch value="false"/> |
18 | </filter> | 18 | </filter> |
19 | <layout type="log4net.Layout.PatternLayout"> | 19 | <layout type="log4net.Layout.PatternLayout"> |
20 | <conversionPattern value="%date{HH:mm:ss} - %message%newline" /> | 20 | <conversionPattern value="%date{HH:mm:ss} - %message" /> |
21 | </layout> | 21 | </layout> |
22 | </appender> | 22 | </appender> |
23 | 23 | ||
diff --git a/bin/Robust.exe.config b/bin/Robust.exe.config index b9e01f1..3a978b2 100644 --- a/bin/Robust.exe.config +++ b/bin/Robust.exe.config | |||
@@ -17,7 +17,7 @@ | |||
17 | <acceptOnMatch value="false"/> | 17 | <acceptOnMatch value="false"/> |
18 | </filter> | 18 | </filter> |
19 | <layout type="log4net.Layout.PatternLayout"> | 19 | <layout type="log4net.Layout.PatternLayout"> |
20 | <conversionPattern value="%date{HH:mm:ss} - %message%newline" /> | 20 | <conversionPattern value="%date{HH:mm:ss} - %message" /> |
21 | </layout> | 21 | </layout> |
22 | </appender> | 22 | </appender> |
23 | 23 | ||
diff --git a/bin/pCampBot.exe.config b/bin/pCampBot.exe.config index 7912991..89350b0 100755 --- a/bin/pCampBot.exe.config +++ b/bin/pCampBot.exe.config | |||
@@ -11,7 +11,7 @@ | |||
11 | <log4net> | 11 | <log4net> |
12 | <appender name="Console" type="OpenSim.Framework.Console.OpenSimAppender, OpenSim.Framework.Console"> | 12 | <appender name="Console" type="OpenSim.Framework.Console.OpenSimAppender, OpenSim.Framework.Console"> |
13 | <layout type="log4net.Layout.PatternLayout"> | 13 | <layout type="log4net.Layout.PatternLayout"> |
14 | <conversionPattern value="%date{HH:mm:ss.fff} - %message%newline" /> | 14 | <conversionPattern value="%date{HH:mm:ss.fff} - %message" /> |
15 | </layout> | 15 | </layout> |
16 | </appender> | 16 | </appender> |
17 | <appender name="LogFileAppender" type="log4net.Appender.FileAppender"> | 17 | <appender name="LogFileAppender" type="log4net.Appender.FileAppender"> |