diff options
author | Teravus Ovares (Dan Olivares) | 2009-08-25 16:13:02 -0400 |
---|---|---|
committer | Teravus Ovares (Dan Olivares) | 2009-08-25 16:13:02 -0400 |
commit | a7917b428a6bc3c9e33da64879b9e473516540a3 (patch) | |
tree | 2c38d9c33c4977a3d0356912915082a8bd568a23 /OpenSim/Framework | |
parent | Patch from jhurliman to HttpServer (diff) | |
parent | Implemented osPenCap, that sets EndCap and StartCap to Pen. This allows using... (diff) | |
download | opensim-SC-a7917b428a6bc3c9e33da64879b9e473516540a3.zip opensim-SC-a7917b428a6bc3c9e33da64879b9e473516540a3.tar.gz opensim-SC-a7917b428a6bc3c9e33da64879b9e473516540a3.tar.bz2 opensim-SC-a7917b428a6bc3c9e33da64879b9e473516540a3.tar.xz |
Merge branch 'master' of ssh://MyConnection/var/git/opensim
Diffstat (limited to '')
20 files changed, 99 insertions, 21 deletions
diff --git a/OpenSim/Framework/AvatarAppearance.cs b/OpenSim/Framework/AvatarAppearance.cs index 7270f32..1fb01ba 100644 --- a/OpenSim/Framework/AvatarAppearance.cs +++ b/OpenSim/Framework/AvatarAppearance.cs | |||
@@ -503,7 +503,14 @@ namespace OpenSim.Framework | |||
503 | Owner = new UUID((string)h["owner"]); | 503 | Owner = new UUID((string)h["owner"]); |
504 | Serial = Convert.ToInt32((string)h["serial"]); | 504 | Serial = Convert.ToInt32((string)h["serial"]); |
505 | VisualParams = (byte[])h["visual_params"]; | 505 | VisualParams = (byte[])h["visual_params"]; |
506 | Texture = new Primitive.TextureEntry((byte[])h["texture"], 0, ((byte[])h["texture"]).Length); | 506 | |
507 | if (h.Contains("texture")) | ||
508 | { | ||
509 | byte[] te = h["texture"] as byte[]; | ||
510 | if (te != null && te.Length > 0) | ||
511 | Texture = new Primitive.TextureEntry(te, 0, te.Length); | ||
512 | } | ||
513 | |||
507 | AvatarHeight = (float)Convert.ToDouble((string)h["avatar_height"]); | 514 | AvatarHeight = (float)Convert.ToDouble((string)h["avatar_height"]); |
508 | 515 | ||
509 | m_wearables = new AvatarWearable[MAX_WEARABLES]; | 516 | m_wearables = new AvatarWearable[MAX_WEARABLES]; |
diff --git a/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs b/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs index ca641d0..238810a 100644 --- a/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs +++ b/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs | |||
@@ -653,7 +653,9 @@ namespace OpenSim.Framework.Communications.Cache | |||
653 | 653 | ||
654 | if (RootFolder.DeleteItem(item.ID)) | 654 | if (RootFolder.DeleteItem(item.ID)) |
655 | { | 655 | { |
656 | return m_InventoryService.DeleteItem(item); | 656 | List<UUID> uuids = new List<UUID>(); |
657 | uuids.Add(itemID); | ||
658 | return m_InventoryService.DeleteItems(this.UserProfile.ID, uuids); | ||
657 | } | 659 | } |
658 | } | 660 | } |
659 | else | 661 | else |
diff --git a/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs b/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs index c9f5236..7f1c7e9 100644 --- a/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs +++ b/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs | |||
@@ -184,7 +184,7 @@ namespace OpenSim.Framework.Communications.Cache | |||
184 | // Commented out for now. The implementation needs to be improved by protecting against race conditions, | 184 | // Commented out for now. The implementation needs to be improved by protecting against race conditions, |
185 | // probably by making sure that the update doesn't use the UserCacheInfo.UserProfile directly (possibly via | 185 | // probably by making sure that the update doesn't use the UserCacheInfo.UserProfile directly (possibly via |
186 | // returning a read only class from the cache). | 186 | // returning a read only class from the cache). |
187 | // public bool UpdateProfile(UserProfileData userProfile) | 187 | // public bool StoreProfile(UserProfileData userProfile) |
188 | // { | 188 | // { |
189 | // lock (m_userProfilesById) | 189 | // lock (m_userProfilesById) |
190 | // { | 190 | // { |
diff --git a/OpenSim/Framework/Communications/Tests/Cache/UserProfileCacheServiceTests.cs b/OpenSim/Framework/Communications/Tests/Cache/UserProfileCacheServiceTests.cs index 670c9ff..933fa12 100644 --- a/OpenSim/Framework/Communications/Tests/Cache/UserProfileCacheServiceTests.cs +++ b/OpenSim/Framework/Communications/Tests/Cache/UserProfileCacheServiceTests.cs | |||
@@ -110,14 +110,14 @@ namespace OpenSim.Framework.Communications.Tests | |||
110 | IUserDataPlugin userDataPlugin = commsManager.UserDataPlugin; | 110 | IUserDataPlugin userDataPlugin = commsManager.UserDataPlugin; |
111 | 111 | ||
112 | // Check that we can't update info before it exists | 112 | // Check that we can't update info before it exists |
113 | Assert.That(userCacheService.UpdateProfile(newProfile), Is.False); | 113 | Assert.That(userCacheService.StoreProfile(newProfile), Is.False); |
114 | Assert.That(userDataPlugin.GetUserByUUID(userId), Is.Null); | 114 | Assert.That(userDataPlugin.GetUserByUUID(userId), Is.Null); |
115 | 115 | ||
116 | // Check that we can update a profile once it exists | 116 | // Check that we can update a profile once it exists |
117 | LocalUserServices lus = (LocalUserServices)commsManager.UserService; | 117 | LocalUserServices lus = (LocalUserServices)commsManager.UserService; |
118 | lus.AddUser(firstName, originalLastName, "pingu", "ted@excellentadventure.com", 1000, 1000, userId); | 118 | lus.AddUser(firstName, originalLastName, "pingu", "ted@excellentadventure.com", 1000, 1000, userId); |
119 | 119 | ||
120 | Assert.That(userCacheService.UpdateProfile(newProfile), Is.True); | 120 | Assert.That(userCacheService.StoreProfile(newProfile), Is.True); |
121 | UserProfileData retrievedProfile = userCacheService.GetUserDetails(userId).UserProfile; | 121 | UserProfileData retrievedProfile = userCacheService.GetUserDetails(userId).UserProfile; |
122 | Assert.That(retrievedProfile.SurName, Is.EqualTo(newLastName)); | 122 | Assert.That(retrievedProfile.SurName, Is.EqualTo(newLastName)); |
123 | Assert.That(userDataPlugin.GetUserByUUID(userId).SurName, Is.EqualTo(newLastName)); | 123 | Assert.That(userDataPlugin.GetUserByUUID(userId).SurName, Is.EqualTo(newLastName)); |
diff --git a/OpenSim/Framework/Communications/Tests/LoginServiceTests.cs b/OpenSim/Framework/Communications/Tests/LoginServiceTests.cs index 22dcef9..57a908e 100644 --- a/OpenSim/Framework/Communications/Tests/LoginServiceTests.cs +++ b/OpenSim/Framework/Communications/Tests/LoginServiceTests.cs | |||
@@ -532,6 +532,11 @@ namespace OpenSim.Framework.Communications.Tests | |||
532 | return false; | 532 | return false; |
533 | } | 533 | } |
534 | 534 | ||
535 | public bool DeleteFolders(UUID ownerID, List<UUID> ids) | ||
536 | { | ||
537 | return false; | ||
538 | } | ||
539 | |||
535 | public bool PurgeFolder(InventoryFolderBase folder) | 540 | public bool PurgeFolder(InventoryFolderBase folder) |
536 | { | 541 | { |
537 | return false; | 542 | return false; |
@@ -547,7 +552,12 @@ namespace OpenSim.Framework.Communications.Tests | |||
547 | return false; | 552 | return false; |
548 | } | 553 | } |
549 | 554 | ||
550 | public bool DeleteItem(InventoryItemBase item) | 555 | public bool MoveItems(UUID owner, List<InventoryItemBase> items) |
556 | { | ||
557 | return false; | ||
558 | } | ||
559 | |||
560 | public bool DeleteItems(UUID owner, List<UUID> items) | ||
551 | { | 561 | { |
552 | return false; | 562 | return false; |
553 | } | 563 | } |
diff --git a/OpenSim/Framework/Console/CommandConsole.cs b/OpenSim/Framework/Console/CommandConsole.cs index 3387013..06136ff 100644 --- a/OpenSim/Framework/Console/CommandConsole.cs +++ b/OpenSim/Framework/Console/CommandConsole.cs | |||
@@ -576,7 +576,7 @@ namespace OpenSim.Framework.Console | |||
576 | 576 | ||
577 | public void Prompt() | 577 | public void Prompt() |
578 | { | 578 | { |
579 | string line = ReadLine(m_defaultPrompt, true, true); | 579 | string line = ReadLine(m_defaultPrompt + "# ", true, true); |
580 | 580 | ||
581 | if (line != String.Empty) | 581 | if (line != String.Empty) |
582 | { | 582 | { |
@@ -592,7 +592,7 @@ namespace OpenSim.Framework.Console | |||
592 | 592 | ||
593 | public override string ReadLine(string p, bool isCommand, bool e) | 593 | public override string ReadLine(string p, bool isCommand, bool e) |
594 | { | 594 | { |
595 | System.Console.Write("{0}", prompt); | 595 | System.Console.Write("{0}", p); |
596 | string cmdinput = System.Console.ReadLine(); | 596 | string cmdinput = System.Console.ReadLine(); |
597 | 597 | ||
598 | if (isCommand) | 598 | if (isCommand) |
diff --git a/OpenSim/Framework/Console/ConsoleBase.cs b/OpenSim/Framework/Console/ConsoleBase.cs index 5e258ae..0a51266 100644 --- a/OpenSim/Framework/Console/ConsoleBase.cs +++ b/OpenSim/Framework/Console/ConsoleBase.cs | |||
@@ -48,7 +48,7 @@ namespace OpenSim.Framework.Console | |||
48 | /// </summary> | 48 | /// </summary> |
49 | public string DefaultPrompt | 49 | public string DefaultPrompt |
50 | { | 50 | { |
51 | set { m_defaultPrompt = value + "# "; } | 51 | set { m_defaultPrompt = value; } |
52 | get { return m_defaultPrompt; } | 52 | get { return m_defaultPrompt; } |
53 | } | 53 | } |
54 | protected string m_defaultPrompt; | 54 | protected string m_defaultPrompt; |
@@ -123,7 +123,7 @@ namespace OpenSim.Framework.Console | |||
123 | 123 | ||
124 | public virtual string ReadLine(string p, bool isCommand, bool e) | 124 | public virtual string ReadLine(string p, bool isCommand, bool e) |
125 | { | 125 | { |
126 | System.Console.Write("{0}", prompt); | 126 | System.Console.Write("{0}", p); |
127 | string cmdinput = System.Console.ReadLine(); | 127 | string cmdinput = System.Console.ReadLine(); |
128 | 128 | ||
129 | return cmdinput; | 129 | return cmdinput; |
diff --git a/OpenSim/Framework/Console/RemoteConsole.cs b/OpenSim/Framework/Console/RemoteConsole.cs index da8556a..1810614 100644 --- a/OpenSim/Framework/Console/RemoteConsole.cs +++ b/OpenSim/Framework/Console/RemoteConsole.cs | |||
@@ -217,6 +217,12 @@ namespace OpenSim.Framework.Console | |||
217 | id.AppendChild(xmldoc.CreateTextNode(sessionID.ToString())); | 217 | id.AppendChild(xmldoc.CreateTextNode(sessionID.ToString())); |
218 | 218 | ||
219 | rootElement.AppendChild(id); | 219 | rootElement.AppendChild(id); |
220 | |||
221 | XmlElement prompt = xmldoc.CreateElement("", "Prompt", ""); | ||
222 | prompt.AppendChild(xmldoc.CreateTextNode(DefaultPrompt)); | ||
223 | |||
224 | rootElement.AppendChild(prompt); | ||
225 | |||
220 | rootElement.AppendChild(MainConsole.Instance.Commands.GetXml(xmldoc)); | 226 | rootElement.AppendChild(MainConsole.Instance.Commands.GetXml(xmldoc)); |
221 | 227 | ||
222 | reply["str_response_string"] = xmldoc.InnerXml; | 228 | reply["str_response_string"] = xmldoc.InnerXml; |
diff --git a/OpenSim/Framework/GridConfig.cs b/OpenSim/Framework/GridConfig.cs index a3c1032..9aa5d03 100644 --- a/OpenSim/Framework/GridConfig.cs +++ b/OpenSim/Framework/GridConfig.cs | |||
@@ -45,6 +45,8 @@ namespace OpenSim.Framework | |||
45 | public string SimSendKey = String.Empty; | 45 | public string SimSendKey = String.Empty; |
46 | public string UserRecvKey = String.Empty; | 46 | public string UserRecvKey = String.Empty; |
47 | public string UserSendKey = String.Empty; | 47 | public string UserSendKey = String.Empty; |
48 | public string ConsoleUser = String.Empty; | ||
49 | public string ConsolePass = String.Empty; | ||
48 | 50 | ||
49 | public GridConfig(string description, string filename) | 51 | public GridConfig(string description, string filename) |
50 | { | 52 | { |
@@ -95,6 +97,12 @@ namespace OpenSim.Framework | |||
95 | "Allow regions to register immediately upon grid server startup? true/false", | 97 | "Allow regions to register immediately upon grid server startup? true/false", |
96 | "True", | 98 | "True", |
97 | false); | 99 | false); |
100 | m_configMember.addConfigurationOption("console_user", ConfigurationOption.ConfigurationTypes.TYPE_STRING, | ||
101 | "Remote console access user name [Default: disabled]", "", false); | ||
102 | |||
103 | m_configMember.addConfigurationOption("console_pass", ConfigurationOption.ConfigurationTypes.TYPE_STRING, | ||
104 | "Remote console access password [Default: disabled]", "", false); | ||
105 | |||
98 | } | 106 | } |
99 | 107 | ||
100 | public bool handleIncomingConfiguration(string configuration_key, object configuration_result) | 108 | public bool handleIncomingConfiguration(string configuration_key, object configuration_result) |
@@ -140,9 +148,15 @@ namespace OpenSim.Framework | |||
140 | case "allow_region_registration": | 148 | case "allow_region_registration": |
141 | AllowRegionRegistration = (bool)configuration_result; | 149 | AllowRegionRegistration = (bool)configuration_result; |
142 | break; | 150 | break; |
151 | case "console_user": | ||
152 | ConsoleUser = (string)configuration_result; | ||
153 | break; | ||
154 | case "console_pass": | ||
155 | ConsolePass = (string)configuration_result; | ||
156 | break; | ||
143 | } | 157 | } |
144 | 158 | ||
145 | return true; | 159 | return true; |
146 | } | 160 | } |
147 | } | 161 | } |
148 | } \ No newline at end of file | 162 | } |
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs index e451dd8..444adf9 100644 --- a/OpenSim/Framework/IClientAPI.cs +++ b/OpenSim/Framework/IClientAPI.cs | |||
@@ -254,13 +254,13 @@ namespace OpenSim.Framework | |||
254 | string newName); | 254 | string newName); |
255 | 255 | ||
256 | public delegate void MoveInventoryItem( | 256 | public delegate void MoveInventoryItem( |
257 | IClientAPI remoteClient, UUID folderID, UUID itemID, int length, string newName); | 257 | IClientAPI remoteClient, List<InventoryItemBase> items); |
258 | 258 | ||
259 | public delegate void RemoveInventoryItem( | 259 | public delegate void RemoveInventoryItem( |
260 | IClientAPI remoteClient, UUID itemID); | 260 | IClientAPI remoteClient, List<UUID> itemIDs); |
261 | 261 | ||
262 | public delegate void RemoveInventoryFolder( | 262 | public delegate void RemoveInventoryFolder( |
263 | IClientAPI remoteClient, UUID folderID); | 263 | IClientAPI remoteClient, List<UUID> folderIDs); |
264 | 264 | ||
265 | public delegate void RequestAsset(IClientAPI remoteClient, RequestAssetArgs transferRequest); | 265 | public delegate void RequestAsset(IClientAPI remoteClient, RequestAssetArgs transferRequest); |
266 | 266 | ||
diff --git a/OpenSim/Framework/InventoryFolderBase.cs b/OpenSim/Framework/InventoryFolderBase.cs index 05f11a4..1869d48 100644 --- a/OpenSim/Framework/InventoryFolderBase.cs +++ b/OpenSim/Framework/InventoryFolderBase.cs | |||
@@ -78,6 +78,12 @@ namespace OpenSim.Framework | |||
78 | ID = id; | 78 | ID = id; |
79 | } | 79 | } |
80 | 80 | ||
81 | public InventoryFolderBase(UUID id, UUID owner) | ||
82 | { | ||
83 | ID = id; | ||
84 | Owner = owner; | ||
85 | } | ||
86 | |||
81 | public InventoryFolderBase(UUID id, string name, UUID owner, short type, UUID parent, ushort version) | 87 | public InventoryFolderBase(UUID id, string name, UUID owner, short type, UUID parent, ushort version) |
82 | { | 88 | { |
83 | ID = id; | 89 | ID = id; |
diff --git a/OpenSim/Framework/MessageServerConfig.cs b/OpenSim/Framework/MessageServerConfig.cs index d0ceebc..884c0ea 100644 --- a/OpenSim/Framework/MessageServerConfig.cs +++ b/OpenSim/Framework/MessageServerConfig.cs | |||
@@ -46,6 +46,8 @@ namespace OpenSim.Framework | |||
46 | public string UserRecvKey = String.Empty; | 46 | public string UserRecvKey = String.Empty; |
47 | public string UserSendKey = String.Empty; | 47 | public string UserSendKey = String.Empty; |
48 | public string UserServerURL = String.Empty; | 48 | public string UserServerURL = String.Empty; |
49 | public string ConsoleUser = String.Empty; | ||
50 | public string ConsolePass = String.Empty; | ||
49 | 51 | ||
50 | public MessageServerConfig(string description, string filename) | 52 | public MessageServerConfig(string description, string filename) |
51 | { | 53 | { |
@@ -88,6 +90,12 @@ namespace OpenSim.Framework | |||
88 | "Use SSL? true/false", ConfigSettings.DefaultMessageServerHttpSSL.ToString(), false); | 90 | "Use SSL? true/false", ConfigSettings.DefaultMessageServerHttpSSL.ToString(), false); |
89 | m_configMember.addConfigurationOption("published_ip", ConfigurationOption.ConfigurationTypes.TYPE_STRING, | 91 | m_configMember.addConfigurationOption("published_ip", ConfigurationOption.ConfigurationTypes.TYPE_STRING, |
90 | "My Published IP Address", "127.0.0.1", false); | 92 | "My Published IP Address", "127.0.0.1", false); |
93 | m_configMember.addConfigurationOption("console_user", ConfigurationOption.ConfigurationTypes.TYPE_STRING, | ||
94 | "Remote console access user name [Default: disabled]", "", false); | ||
95 | |||
96 | m_configMember.addConfigurationOption("console_pass", ConfigurationOption.ConfigurationTypes.TYPE_STRING, | ||
97 | "Remote console access password [Default: disabled]", "", false); | ||
98 | |||
91 | } | 99 | } |
92 | 100 | ||
93 | public bool handleIncomingConfiguration(string configuration_key, object configuration_result) | 101 | public bool handleIncomingConfiguration(string configuration_key, object configuration_result) |
@@ -130,9 +138,15 @@ namespace OpenSim.Framework | |||
130 | case "published_ip": | 138 | case "published_ip": |
131 | MessageServerIP = (string) configuration_result; | 139 | MessageServerIP = (string) configuration_result; |
132 | break; | 140 | break; |
141 | case "console_user": | ||
142 | ConsoleUser = (string)configuration_result; | ||
143 | break; | ||
144 | case "console_pass": | ||
145 | ConsolePass = (string)configuration_result; | ||
146 | break; | ||
133 | } | 147 | } |
134 | 148 | ||
135 | return true; | 149 | return true; |
136 | } | 150 | } |
137 | } | 151 | } |
138 | } \ No newline at end of file | 152 | } |
diff --git a/OpenSim/Framework/Servers/GetAssetStreamHandler.cs b/OpenSim/Framework/Servers/GetAssetStreamHandler.cs index bc046cf..c6958de 100644 --- a/OpenSim/Framework/Servers/GetAssetStreamHandler.cs +++ b/OpenSim/Framework/Servers/GetAssetStreamHandler.cs | |||
@@ -57,7 +57,7 @@ namespace OpenSim.Framework.Servers | |||
57 | 57 | ||
58 | protected override AssetBase GetAsset(UUID assetID) | 58 | protected override AssetBase GetAsset(UUID assetID) |
59 | { | 59 | { |
60 | return m_assetProvider.FetchAsset(assetID); | 60 | return m_assetProvider.GetAsset(assetID); |
61 | } | 61 | } |
62 | } | 62 | } |
63 | } | 63 | } |
diff --git a/OpenSim/Framework/Servers/HttpServer/RestSessionService.cs b/OpenSim/Framework/Servers/HttpServer/RestSessionService.cs index ec2f9ec..2ef4a36 100644 --- a/OpenSim/Framework/Servers/HttpServer/RestSessionService.cs +++ b/OpenSim/Framework/Servers/HttpServer/RestSessionService.cs | |||
@@ -75,6 +75,7 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
75 | WebRequest request = WebRequest.Create(requestUrl); | 75 | WebRequest request = WebRequest.Create(requestUrl); |
76 | request.Method = verb; | 76 | request.Method = verb; |
77 | request.ContentType = "text/xml"; | 77 | request.ContentType = "text/xml"; |
78 | request.Timeout = 20000; | ||
78 | 79 | ||
79 | MemoryStream buffer = new MemoryStream(); | 80 | MemoryStream buffer = new MemoryStream(); |
80 | 81 | ||
@@ -98,7 +99,9 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
98 | { | 99 | { |
99 | XmlSerializer deserializer = new XmlSerializer(typeof(TResponse)); | 100 | XmlSerializer deserializer = new XmlSerializer(typeof(TResponse)); |
100 | deserial = (TResponse)deserializer.Deserialize(resp.GetResponseStream()); | 101 | deserial = (TResponse)deserializer.Deserialize(resp.GetResponseStream()); |
102 | resp.Close(); | ||
101 | } | 103 | } |
104 | requestStream.Close(); | ||
102 | return deserial; | 105 | return deserial; |
103 | } | 106 | } |
104 | } | 107 | } |
diff --git a/OpenSim/Framework/Servers/HttpServer/SynchronousRestObjectRequester.cs b/OpenSim/Framework/Servers/HttpServer/SynchronousRestObjectRequester.cs index 09ef95b..ec9bd4f 100644 --- a/OpenSim/Framework/Servers/HttpServer/SynchronousRestObjectRequester.cs +++ b/OpenSim/Framework/Servers/HttpServer/SynchronousRestObjectRequester.cs | |||
@@ -62,7 +62,7 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
62 | WebRequest request = WebRequest.Create(requestUrl); | 62 | WebRequest request = WebRequest.Create(requestUrl); |
63 | request.Method = verb; | 63 | request.Method = verb; |
64 | 64 | ||
65 | if (verb == "POST") | 65 | if ((verb == "POST") || (verb == "PUT")) |
66 | { | 66 | { |
67 | request.ContentType = "text/xml"; | 67 | request.ContentType = "text/xml"; |
68 | 68 | ||
diff --git a/OpenSim/Framework/Servers/PostAssetStreamHandler.cs b/OpenSim/Framework/Servers/PostAssetStreamHandler.cs index 419b408..8bf406c 100644 --- a/OpenSim/Framework/Servers/PostAssetStreamHandler.cs +++ b/OpenSim/Framework/Servers/PostAssetStreamHandler.cs | |||
@@ -57,7 +57,7 @@ namespace OpenSim.Framework.Servers | |||
57 | AssetBase asset = (AssetBase) xs.Deserialize(request); | 57 | AssetBase asset = (AssetBase) xs.Deserialize(request); |
58 | 58 | ||
59 | m_log.InfoFormat("[REST]: Creating asset {0}", asset.FullID); | 59 | m_log.InfoFormat("[REST]: Creating asset {0}", asset.FullID); |
60 | m_assetProvider.CreateAsset(asset); | 60 | m_assetProvider.StoreAsset(asset); |
61 | 61 | ||
62 | return new byte[] {}; | 62 | return new byte[] {}; |
63 | } | 63 | } |
diff --git a/OpenSim/Framework/Servers/Tests/GetAssetStreamHandlerTests.cs b/OpenSim/Framework/Servers/Tests/GetAssetStreamHandlerTests.cs index 35da73f..be3f518 100644 --- a/OpenSim/Framework/Servers/Tests/GetAssetStreamHandlerTests.cs +++ b/OpenSim/Framework/Servers/Tests/GetAssetStreamHandlerTests.cs | |||
@@ -128,7 +128,7 @@ namespace OpenSim.Framework.Servers.Tests | |||
128 | IAssetDataPlugin assetDataPlugin = new TestAssetDataPlugin(); | 128 | IAssetDataPlugin assetDataPlugin = new TestAssetDataPlugin(); |
129 | handler = new GetAssetStreamHandler(assetDataPlugin); | 129 | handler = new GetAssetStreamHandler(assetDataPlugin); |
130 | 130 | ||
131 | assetDataPlugin.CreateAsset(asset); | 131 | assetDataPlugin.StoreAsset(asset); |
132 | return asset; | 132 | return asset; |
133 | } | 133 | } |
134 | } | 134 | } |
diff --git a/OpenSim/Framework/UserConfig.cs b/OpenSim/Framework/UserConfig.cs index 31838ad..16f265c 100644 --- a/OpenSim/Framework/UserConfig.cs +++ b/OpenSim/Framework/UserConfig.cs | |||
@@ -46,6 +46,8 @@ namespace OpenSim.Framework | |||
46 | public bool HttpSSL = ConfigSettings.DefaultUserServerHttpSSL; | 46 | public bool HttpSSL = ConfigSettings.DefaultUserServerHttpSSL; |
47 | public uint DefaultUserLevel = 0; | 47 | public uint DefaultUserLevel = 0; |
48 | public string LibraryXmlfile = ""; | 48 | public string LibraryXmlfile = ""; |
49 | public string ConsoleUser = String.Empty; | ||
50 | public string ConsolePass = String.Empty; | ||
49 | 51 | ||
50 | private Uri m_inventoryUrl; | 52 | private Uri m_inventoryUrl; |
51 | 53 | ||
@@ -155,6 +157,12 @@ namespace OpenSim.Framework | |||
155 | m_configMember.addConfigurationOption("default_loginLevel", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, | 157 | m_configMember.addConfigurationOption("default_loginLevel", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, |
156 | "Minimum Level a user should have to login [0 default]", "0", false); | 158 | "Minimum Level a user should have to login [0 default]", "0", false); |
157 | 159 | ||
160 | m_configMember.addConfigurationOption("console_user", ConfigurationOption.ConfigurationTypes.TYPE_STRING, | ||
161 | "Remote console access user name [Default: disabled]", "", false); | ||
162 | |||
163 | m_configMember.addConfigurationOption("console_pass", ConfigurationOption.ConfigurationTypes.TYPE_STRING, | ||
164 | "Remote console access password [Default: disabled]", "", false); | ||
165 | |||
158 | } | 166 | } |
159 | 167 | ||
160 | public bool handleIncomingConfiguration(string configuration_key, object configuration_result) | 168 | public bool handleIncomingConfiguration(string configuration_key, object configuration_result) |
@@ -209,6 +217,12 @@ namespace OpenSim.Framework | |||
209 | case "library_location": | 217 | case "library_location": |
210 | LibraryXmlfile = (string)configuration_result; | 218 | LibraryXmlfile = (string)configuration_result; |
211 | break; | 219 | break; |
220 | case "console_user": | ||
221 | ConsoleUser = (string)configuration_result; | ||
222 | break; | ||
223 | case "console_pass": | ||
224 | ConsolePass = (string)configuration_result; | ||
225 | break; | ||
212 | } | 226 | } |
213 | 227 | ||
214 | return true; | 228 | return true; |
diff --git a/OpenSim/Framework/Communications/Cache/AuthedSessionCache.cs b/OpenSim/Grid/InventoryServer/AuthedSessionCache.cs index d56e48a..dadf34a 100644 --- a/OpenSim/Framework/Communications/Cache/AuthedSessionCache.cs +++ b/OpenSim/Grid/InventoryServer/AuthedSessionCache.cs | |||
@@ -28,7 +28,7 @@ | |||
28 | using System; | 28 | using System; |
29 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
30 | 30 | ||
31 | namespace OpenSim.Framework.Communications.Cache | 31 | namespace OpenSim.Grid.InventoryServer |
32 | { | 32 | { |
33 | public class AuthedSessionCache | 33 | public class AuthedSessionCache |
34 | { | 34 | { |
diff --git a/OpenSim/Framework/Communications/InventoryServiceBase.cs b/OpenSim/Grid/InventoryServer/InventoryServiceBase.cs index 309c415..f8b4949 100644 --- a/OpenSim/Framework/Communications/InventoryServiceBase.cs +++ b/OpenSim/Grid/InventoryServer/InventoryServiceBase.cs | |||
@@ -30,8 +30,10 @@ using System.Reflection; | |||
30 | using log4net; | 30 | using log4net; |
31 | using OpenMetaverse; | 31 | using OpenMetaverse; |
32 | using OpenSim.Data; | 32 | using OpenSim.Data; |
33 | using OpenSim.Framework; | ||
34 | using OpenSim.Framework.Communications; | ||
33 | 35 | ||
34 | namespace OpenSim.Framework.Communications | 36 | namespace OpenSim.Grid.InventoryServer |
35 | { | 37 | { |
36 | /// <summary> | 38 | /// <summary> |
37 | /// Abstract base class used by local and grid implementations of an inventory service. | 39 | /// Abstract base class used by local and grid implementations of an inventory service. |