2 files changed, 4 insertions, 0 deletions

diff --git a/bin/OpenSim.Data.addin.xml b/bin/OpenSim.Data.addin.xml
index c3d016b..4859b65 100644
--- a/bin/OpenSim.Data.addin.xml
+++ b/bin/OpenSim.Data.addin.xml
@@ -4,6 +4,7 @@
         <Import assembly="OpenSim.Grid.GridServer.exe"/>
         <Import assembly="OpenSim.Grid.AssetServer.exe"/>
         <Import assembly="OpenSim.Grid.InventoryServer.exe"/>
+        <Import assembly="OpenSim.Grid.MessagingServer.exe"/>
         <Import assembly="OpenSim.Data.dll"/>
         <Import assembly="OpenSim.Framework.dll"/>
     </Runtime>
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 32944ab..439efbc 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -203,6 +203,9 @@ asset_server_url = "http://127.0.0.1:8003"
 
 inventory_server_url = "http://127.0.0.1:8004"
 
+; The MessagingServer is a companion of the UserServer. It uses
+; user_send_key and user_recv_key, too
+messaging_server_url = "http://127.0.0.1:8006"
 
 [Chat]
 whisper_distance = 10