aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/Application/OpenSimMain.cs3
-rw-r--r--OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs2
-rw-r--r--OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs4
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs24
-rw-r--r--OpenSim/Region/Environment/Modules/ChatModule.cs2
-rw-r--r--OpenSim/Region/Environment/Modules/WorldCommModule.cs2
-rw-r--r--OpenSim/Region/Environment/Scenes/ScenePresence.cs2
7 files changed, 29 insertions, 10 deletions
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs
index 7245482..6be067f 100644
--- a/OpenSim/Region/Application/OpenSimMain.cs
+++ b/OpenSim/Region/Application/OpenSimMain.cs
@@ -175,6 +175,7 @@ namespace OpenSim
175 config.Set("user_send_key", "null"); 175 config.Set("user_send_key", "null");
176 config.Set("user_recv_key", "null"); 176 config.Set("user_recv_key", "null");
177 config.Set("asset_server_url", "http://127.0.0.1:" + AssetConfig.DefaultHttpPort.ToString()); 177 config.Set("asset_server_url", "http://127.0.0.1:" + AssetConfig.DefaultHttpPort.ToString());
178 config.Set("inventory_server_url", "http://127.0.0.1:" + InventoryConfig.DefaultHttpPort.ToString());
178 } 179 }
179 } 180 }
180 181
@@ -774,4 +775,4 @@ namespace OpenSim
774 775
775 #endregion 776 #endregion
776 } 777 }
777} \ No newline at end of file 778}
diff --git a/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs b/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
index 7d1780c..89e5465 100644
--- a/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
+++ b/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
@@ -770,4 +770,4 @@ namespace OpenSim.Region.ClientStack
770 OutPacket(logReply); 770 OutPacket(logReply);
771 } 771 }
772 } 772 }
773} \ No newline at end of file 773}
diff --git a/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs b/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs
index 941cc30..1281a44 100644
--- a/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs
+++ b/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs
@@ -42,8 +42,8 @@ namespace OpenSim.Region.Communications.OGS1
42 m_gridService = gridInterComms; 42 m_gridService = gridInterComms;
43 m_interRegion = gridInterComms; 43 m_interRegion = gridInterComms;
44 44
45 m_inventoryService = new OGS1InventoryService(); 45 m_inventoryService = new OGS1InventoryService(serversInfo.InventoryURL);
46 m_userService = new OGS1UserServices(this); 46 m_userService = new OGS1UserServices(this);
47 } 47 }
48 } 48 }
49} \ No newline at end of file 49}
diff --git a/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs b/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs
index 49fdee9..85df353 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs
@@ -25,7 +25,9 @@
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 28using System;
29using System.IO;
30using System.Xml.Serialization;
29using System.Collections.Generic; 31using System.Collections.Generic;
30using libsecondlife; 32using libsecondlife;
31using OpenSim.Framework; 33using OpenSim.Framework;
@@ -36,8 +38,11 @@ namespace OpenSim.Region.Communications.OGS1
36{ 38{
37 public class OGS1InventoryService : IInventoryServices 39 public class OGS1InventoryService : IInventoryServices
38 { 40 {
39 public OGS1InventoryService() 41 string _inventoryServerUrl;
42
43 public OGS1InventoryService(string inventoryServerUrl)
40 { 44 {
45 _inventoryServerUrl = inventoryServerUrl;
41 } 46 }
42 47
43 #region IInventoryServices Members 48 #region IInventoryServices Members
@@ -45,6 +50,19 @@ namespace OpenSim.Region.Communications.OGS1
45 public void RequestInventoryForUser(LLUUID userID, InventoryFolderInfo folderCallBack, 50 public void RequestInventoryForUser(LLUUID userID, InventoryFolderInfo folderCallBack,
46 InventoryItemInfo itemCallBack) 51 InventoryItemInfo itemCallBack)
47 { 52 {
53 //TODO! Uncomment when all is done
54 //SerializableInventory userInventory = null;
55
56 //RestClient inventoryServer = new RestClient(_inventoryServerUrl);
57 //inventoryServer.AddResourcePath("inventory");
58 //inventoryServer.AddResourcePath("user");
59 //inventoryServer.AddResourcePath(userID.ToStringHyphenated());
60
61 //using (Stream userInventoryStream = inventoryServer.Request())
62 //{
63 // XmlSerializer x = new XmlSerializer(typeof(SerializableInventory));
64 // userInventory = (SerializableInventory)x.Deserialize(userInventoryStream);
65 //}
48 } 66 }
49 67
50 public void AddNewInventoryFolder(LLUUID userID, InventoryFolderImpl folder) 68 public void AddNewInventoryFolder(LLUUID userID, InventoryFolderImpl folder)
@@ -70,4 +88,4 @@ namespace OpenSim.Region.Communications.OGS1
70 88
71 #endregion 89 #endregion
72 } 90 }
73} \ No newline at end of file 91}
diff --git a/OpenSim/Region/Environment/Modules/ChatModule.cs b/OpenSim/Region/Environment/Modules/ChatModule.cs
index 9d4187a..99b69e1 100644
--- a/OpenSim/Region/Environment/Modules/ChatModule.cs
+++ b/OpenSim/Region/Environment/Modules/ChatModule.cs
@@ -431,4 +431,4 @@ namespace OpenSim.Region.Environment.Modules
431 m_tcp.Close(); 431 m_tcp.Close();
432 } 432 }
433 } 433 }
434} \ No newline at end of file 434}
diff --git a/OpenSim/Region/Environment/Modules/WorldCommModule.cs b/OpenSim/Region/Environment/Modules/WorldCommModule.cs
index 7a631d7..5af2ce3 100644
--- a/OpenSim/Region/Environment/Modules/WorldCommModule.cs
+++ b/OpenSim/Region/Environment/Modules/WorldCommModule.cs
@@ -490,4 +490,4 @@ namespace OpenSim.Region.Environment.Modules
490 return m_id; 490 return m_id;
491 } 491 }
492 } 492 }
493} \ No newline at end of file 493}
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index 5155b41..3b73893 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -1059,4 +1059,4 @@ namespace OpenSim.Region.Environment.Scenes
1059 SendOurAppearance(m_controllingClient); 1059 SendOurAppearance(m_controllingClient);
1060 } 1060 }
1061 } 1061 }
1062} \ No newline at end of file 1062}