aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Data/IOfflineIMData.cs (renamed from OpenSim/Addons/OfflineIM/Data/IOfflineIMData.cs)2
-rw-r--r--OpenSim/Data/MySQL/MySQLOfflineIMData.cs (renamed from OpenSim/Addons/OfflineIM/Data/MySQLOfflineIMData.cs)8
-rw-r--r--OpenSim/Data/MySQL/Resources/IM_Store.migrations (renamed from OpenSim/Addons/OfflineIM/Resources/IM_Store.migrations)0
-rw-r--r--bin/OpenSim.ini.example6
-rw-r--r--bin/Robust.HG.ini.example1
-rw-r--r--bin/Robust.ini.example1
6 files changed, 5 insertions, 13 deletions
diff --git a/OpenSim/Addons/OfflineIM/Data/IOfflineIMData.cs b/OpenSim/Data/IOfflineIMData.cs
index a507f7d..e780304 100644
--- a/OpenSim/Addons/OfflineIM/Data/IOfflineIMData.cs
+++ b/OpenSim/Data/IOfflineIMData.cs
@@ -29,7 +29,7 @@ using System.Collections.Generic;
29using OpenSim.Data; 29using OpenSim.Data;
30using OpenMetaverse; 30using OpenMetaverse;
31 31
32namespace OpenSim.OfflineIM 32namespace OpenSim.Data
33{ 33{
34 public class OfflineIMData 34 public class OfflineIMData
35 { 35 {
diff --git a/OpenSim/Addons/OfflineIM/Data/MySQLOfflineIMData.cs b/OpenSim/Data/MySQL/MySQLOfflineIMData.cs
index 0a61cd2..252f358 100644
--- a/OpenSim/Addons/OfflineIM/Data/MySQLOfflineIMData.cs
+++ b/OpenSim/Data/MySQL/MySQLOfflineIMData.cs
@@ -36,16 +36,10 @@ using OpenSim.Data.MySQL;
36using OpenMetaverse; 36using OpenMetaverse;
37using MySql.Data.MySqlClient; 37using MySql.Data.MySqlClient;
38 38
39namespace OpenSim.OfflineIM 39namespace OpenSim.Data.MySQL
40{ 40{
41 public class MySQLOfflineIMData : MySQLGenericTableHandler<OfflineIMData>, IOfflineIMData 41 public class MySQLOfflineIMData : MySQLGenericTableHandler<OfflineIMData>, IOfflineIMData
42 { 42 {
43 protected override Assembly Assembly
44 {
45 // WARNING! Moving migrations to this assembly!!!
46 get { return GetType().Assembly; }
47 }
48
49 public MySQLOfflineIMData(string connectionString, string realm) 43 public MySQLOfflineIMData(string connectionString, string realm)
50 : base(connectionString, realm, "IM_Store") 44 : base(connectionString, realm, "IM_Store")
51 { 45 {
diff --git a/OpenSim/Addons/OfflineIM/Resources/IM_Store.migrations b/OpenSim/Data/MySQL/Resources/IM_Store.migrations
index 7cfcd43..7cfcd43 100644
--- a/OpenSim/Addons/OfflineIM/Resources/IM_Store.migrations
+++ b/OpenSim/Data/MySQL/Resources/IM_Store.migrations
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 07e7357..674a66c 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -542,9 +542,9 @@
542 ;; URL of web service for offline message storage. Leave it commented if your service is local to the sim. 542 ;; URL of web service for offline message storage. Leave it commented if your service is local to the sim.
543 ; OfflineMessageURL = http://yourserver/Offline.php or http://yourrobustserver:8003 543 ; OfflineMessageURL = http://yourserver/Offline.php or http://yourrobustserver:8003
544 544
545 ;# {StorageProvider} {Offline Message Module V2:Offline Message Module V2} {DLL that provides the storage interface} {OpenSim.Addons.OfflineIM} 545 ;# {StorageProvider} {Offline Message Module V2:Offline Message Module V2} {DLL that provides the storage interface} {OpenSim.Data.MySQL.dll}
546 ;; For standalones, use the service directly. This is the storage dll. 546 ;; For standalones, this is the storage dll.
547 ; StorageProvider = OpenSim.Addons.OfflineIM.dll 547 ; StorageProvider = OpenSim.Data.MySQL.dll
548 548
549 ;# {MuteListModule} {OfflineMessageModule:OfflineMessageModule} {} {} MuteListModule 549 ;# {MuteListModule} {OfflineMessageModule:OfflineMessageModule} {} {} MuteListModule
550 ;; Mute list handler (not yet implemented). MUST BE SET to allow offline 550 ;; Mute list handler (not yet implemented). MUST BE SET to allow offline
diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example
index fd86bca..020815e 100644
--- a/bin/Robust.HG.ini.example
+++ b/bin/Robust.HG.ini.example
@@ -548,6 +548,5 @@ HGAssetServiceConnector = "HGAssetService@8002/OpenSim.Server.Handlers.dll:Asset
548 548
549[Messaging] 549[Messaging]
550 ; OfflineIM 550 ; OfflineIM
551 StorageProvider = "OpenSim.Addons.OfflineIM.dll"
552 OfflineIMService = "OpenSim.Addons.OfflineIM.dll:OfflineIMService" 551 OfflineIMService = "OpenSim.Addons.OfflineIM.dll:OfflineIMService"
553 552
diff --git a/bin/Robust.ini.example b/bin/Robust.ini.example
index 9dd0d71..63a5699 100644
--- a/bin/Robust.ini.example
+++ b/bin/Robust.ini.example
@@ -334,7 +334,6 @@ MapGetServiceConnector = "8002/OpenSim.Server.Handlers.dll:MapGetServiceConnecto
334 334
335[Messaging] 335[Messaging]
336 ; OfflineIM 336 ; OfflineIM
337 StorageProvider = "OpenSim.Addons.OfflineIM.dll"
338 OfflineIMService = "OpenSim.Addons.OfflineIM.dll:OfflineIMService" 337 OfflineIMService = "OpenSim.Addons.OfflineIM.dll:OfflineIMService"
339 338
340[GridInfoService] 339[GridInfoService]