Merging Opensim upstream before generating patch

1 files changed, 0 insertions, 33 deletions

diff --git a/OpenSim/Tests/Clients/Presence/OpenSim.Server.ini b/OpenSim/Tests/Clients/Presence/OpenSim.Server.ini
deleted file mode 100644
index 8610c78..0000000
--- a/OpenSim/Tests/Clients/Presence/OpenSim.Server.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-; * Run a ROBUST server shell like this, from bin:
-; * $ OpenSim.Server.exe -inifile ../OpenSim/Tests/Clients/Presence/OpenSim.Server.ini
-; *
-; * Then run this client like this, from bin:
-; * $ OpenSim.Tests.Clients.PresenceClient.exe
-; *
-; *
-
-[Startup]
-ServiceConnectors = "OpenSim.Server.Handlers.dll:PresenceServiceConnector"
-
-; * This is common for all services, it's the network setup for the entire
-; * server instance
-; *
-[Network]
-port = 8003
-
-; * The following are for the remote console
-; * They have no effect for the local or basic console types
-; * Leave commented to diable logins to the console
-;ConsoleUser = Test
-;ConsolePass = secret
-
-; * As an example, the below configuration precisely mimicks the legacy
-; * asset server. It is read by the asset IN connector (defined above)
-; * and it then loads the OUT connector (a local database module). That,
-; * in turn, reads the asset loader and database connection information
-; *
-[PresenceService]
-        LocalServiceModule = "OpenSim.Services.PresenceService.dll:PresenceService"
-    StorageProvider = "OpenSim.Data.MySQL.dll"
-    ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=opensim123;Old Guids=true;"
-