From edb176447ba9cd6d29bd45d9b3714aa0dab9cbf9 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 3 Mar 2010 22:14:06 +0000
Subject: Fix bug where approximately half the time, attachments would rez only
 their root prim until right clicked (or otherwise updated). The root cause of
 this problem was that multiple ObjectUpdates were being sent on attachment
 which differed enough to confuse the client. Sometimes these would eliminate
 each other and sometimes not, depending on whether the scheduler looked at
 the queued updates. The solution here is to only schedule the ObjectUpdate
 once the attachment code has done all it needs to do.

---
 bin/OpenSim.exe.config            | 2 +-
 bin/config-include/Standalone.ini | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'bin')

diff --git a/bin/OpenSim.exe.config b/bin/OpenSim.exe.config
index 3c7adf5..4e7ef51 100755
--- a/bin/OpenSim.exe.config
+++ b/bin/OpenSim.exe.config
@@ -12,7 +12,7 @@
   <log4net>
     <appender name="Console" type="OpenSim.Framework.Console.OpenSimAppender, OpenSim.Framework.Console">
       <layout type="log4net.Layout.PatternLayout">
-        <conversionPattern value="%date{HH:mm:ss} - %message" />
+        <conversionPattern value="%date{HH:mm:ss,fff} - %message" />
       </layout>
     </appender>
 
diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini
index bf693a1..dc65ffd 100644
--- a/bin/config-include/Standalone.ini
+++ b/bin/config-include/Standalone.ini
@@ -31,14 +31,14 @@
 
 [AvatarService]
     LocalServiceModule    = "OpenSim.Services.AvatarService.dll:AvatarService"
-    ConnectionString = "URI=file:avatars.db,version=3"
+    ; ConnectionString = "URI=file:avatars.db,version=3"
 
 [AuthorizationService]
     LocalServiceModule = "OpenSim.Services.AuthorizationService.dll:AuthorizationService"
 
 [AuthenticationService]
     LocalServiceModule = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
-    ConnectionString = "URI=file:auth.db,version=3"
+    ; ConnectionString = "URI=file:auth.db,version=3"
 
 [GridService]
     LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
@@ -51,7 +51,7 @@
 
 [UserAccountService]
     LocalServiceModule = "OpenSim.Services.UserAccountService.dll:UserAccountService"
-    ConnectionString = "URI=file:userprofiles.db,version=3"
+    ; ConnectionString = "URI=file:userprofiles.db,version=3"
     ;; These are for creating new accounts
     AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
     PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
@@ -60,7 +60,7 @@
 
 [FriendsService]
     LocalServiceModule = "OpenSim.Services.FriendsService.dll"
-    ConnectionString = "URI=file:friends.db,version=3"
+    ; ConnectionString = "URI=file:friends.db,version=3"
 
 [Friends]
     Connector = "OpenSim.Services.FriendsService.dll"
-- 
cgit v1.1


From e97ba577888ae0da6f227fea6a2b78cca1a5d886 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 3 Mar 2010 22:20:06 +0000
Subject: reset the accidental local configuration changes

---
 bin/OpenSim.exe.config            |  2 +-
 bin/config-include/Standalone.ini | 16 +++++++++-------
 2 files changed, 10 insertions(+), 8 deletions(-)

(limited to 'bin')

diff --git a/bin/OpenSim.exe.config b/bin/OpenSim.exe.config
index 4e7ef51..3c7adf5 100755
--- a/bin/OpenSim.exe.config
+++ b/bin/OpenSim.exe.config
@@ -12,7 +12,7 @@
   <log4net>
     <appender name="Console" type="OpenSim.Framework.Console.OpenSimAppender, OpenSim.Framework.Console">
       <layout type="log4net.Layout.PatternLayout">
-        <conversionPattern value="%date{HH:mm:ss,fff} - %message" />
+        <conversionPattern value="%date{HH:mm:ss} - %message" />
       </layout>
     </appender>
 
diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini
index dc65ffd..3011370 100644
--- a/bin/config-include/Standalone.ini
+++ b/bin/config-include/Standalone.ini
@@ -24,21 +24,22 @@
 
 [InventoryService]
     LocalServiceModule = "OpenSim.Services.InventoryService.dll:InventoryService"
+
 [LibraryService]
-	LocalServiceModule = "OpenSim.Services.InventoryService.dll:LibraryService"
-	LibraryName = "OpenSim Library"
-	DefaultLibrary = "./inventory/Libraries.xml"
+  	LocalServiceModule = "OpenSim.Services.InventoryService.dll:LibraryService"
+	  LibraryName = "OpenSim Library"
+	  DefaultLibrary = "./inventory/Libraries.xml"
 
 [AvatarService]
     LocalServiceModule    = "OpenSim.Services.AvatarService.dll:AvatarService"
-    ; ConnectionString = "URI=file:avatars.db,version=3"
+    ConnectionString = "URI=file:avatars.db,version=3"
 
 [AuthorizationService]
     LocalServiceModule = "OpenSim.Services.AuthorizationService.dll:AuthorizationService"
 
 [AuthenticationService]
     LocalServiceModule = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
-    ; ConnectionString = "URI=file:auth.db,version=3"
+    ConnectionString = "URI=file:auth.db,version=3"
 
 [GridService]
     LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
@@ -51,7 +52,8 @@
 
 [UserAccountService]
     LocalServiceModule = "OpenSim.Services.UserAccountService.dll:UserAccountService"
-    ; ConnectionString = "URI=file:userprofiles.db,version=3"
+    ConnectionString = "URI=file:userprofiles.db,version=3"
+
     ;; These are for creating new accounts
     AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
     PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
@@ -60,7 +62,7 @@
 
 [FriendsService]
     LocalServiceModule = "OpenSim.Services.FriendsService.dll"
-    ; ConnectionString = "URI=file:friends.db,version=3"
+    ConnectionString = "URI=file:friends.db,version=3"
 
 [Friends]
     Connector = "OpenSim.Services.FriendsService.dll"
-- 
cgit v1.1