aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/AvatarAppearance.cs7
-rw-r--r--OpenSim/Framework/Communications/Cache/AuthedSessionCache.cs133
-rw-r--r--OpenSim/Framework/Communications/InventoryServiceBase.cs517
-rw-r--r--OpenSim/Framework/Communications/Tests/LoginServiceTests.cs5
-rw-r--r--OpenSim/Framework/Console/CommandConsole.cs4
-rw-r--r--OpenSim/Framework/Console/ConsoleBase.cs4
-rw-r--r--OpenSim/Framework/Console/RemoteConsole.cs8
-rw-r--r--OpenSim/Framework/GridConfig.cs4
-rw-r--r--OpenSim/Framework/IClientAPI.cs2
-rw-r--r--OpenSim/Framework/MessageServerConfig.cs4
-rw-r--r--OpenSim/Framework/Servers/HttpServer/PollServiceWorkerThread.cs43
-rw-r--r--OpenSim/Framework/Servers/HttpServer/RestSessionService.cs3
-rw-r--r--OpenSim/Framework/Servers/HttpServer/SynchronousRestObjectRequester.cs2
-rw-r--r--OpenSim/Framework/UserConfig.cs4
14 files changed, 60 insertions, 680 deletions
diff --git a/OpenSim/Framework/AvatarAppearance.cs b/OpenSim/Framework/AvatarAppearance.cs
index 1fb01ba..940ae3b 100644
--- a/OpenSim/Framework/AvatarAppearance.cs
+++ b/OpenSim/Framework/AvatarAppearance.cs
@@ -510,6 +510,13 @@ namespace OpenSim.Framework
510 if (te != null && te.Length > 0) 510 if (te != null && te.Length > 0)
511 Texture = new Primitive.TextureEntry(te, 0, te.Length); 511 Texture = new Primitive.TextureEntry(te, 0, te.Length);
512 } 512 }
513 else
514 {
515 // We shouldn't be receiving appearance hashtables without a TextureEntry,
516 // but in case we do this will prevent a failure when saving to the database
517 Texture = GetDefaultTexture();
518 }
519
513 520
514 AvatarHeight = (float)Convert.ToDouble((string)h["avatar_height"]); 521 AvatarHeight = (float)Convert.ToDouble((string)h["avatar_height"]);
515 522
diff --git a/OpenSim/Framework/Communications/Cache/AuthedSessionCache.cs b/OpenSim/Framework/Communications/Cache/AuthedSessionCache.cs
deleted file mode 100644
index d56e48a..0000000
--- a/OpenSim/Framework/Communications/Cache/AuthedSessionCache.cs
+++ /dev/null
@@ -1,133 +0,0 @@
1/*
2 * Copyright (c) Contributors, http://opensimulator.org/
3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met:
7 * * Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer.
9 * * Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the
11 * documentation and/or other materials provided with the distribution.
12 * * Neither the name of the OpenSimulator Project nor the
13 * names of its contributors may be used to endorse or promote products
14 * derived from this software without specific prior written permission.
15 *
16 * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19 * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */
27
28using System;
29using System.Collections.Generic;
30
31namespace OpenSim.Framework.Communications.Cache
32{
33 public class AuthedSessionCache
34 {
35 public class CacheData
36 {
37 private static readonly DateTime UNIX_EPOCH = new DateTime(1970, 1, 1);
38 private string m_session_id;
39 private string m_agent_id;
40 private int m_expire;
41
42 private int get_current_unix_time()
43 {
44 return (int)(DateTime.UtcNow - UNIX_EPOCH).TotalSeconds;
45 }
46
47 public CacheData(string sid, string aid)
48 {
49 m_session_id = sid;
50 m_agent_id = aid;
51 m_expire = get_current_unix_time() + DEFAULT_LIFETIME;
52 }
53
54 public CacheData(string sid, string aid, int time_now)
55 {
56 m_session_id = sid;
57 m_agent_id = aid;
58 m_expire = time_now + DEFAULT_LIFETIME;
59 }
60
61 public string SessionID
62 {
63 get { return m_session_id; }
64 set { m_session_id = value; }
65 }
66
67 public string AgentID
68 {
69 get { return m_agent_id; }
70 set { m_agent_id = value; }
71 }
72
73 public bool isExpired
74 {
75 get { return m_expire < get_current_unix_time(); }
76 }
77
78 public void Renew()
79 {
80 m_expire = get_current_unix_time() + DEFAULT_LIFETIME;
81 }
82 }
83
84 private static readonly int DEFAULT_LIFETIME = 30;
85 private Dictionary<string, CacheData> m_authed_sessions = new Dictionary<string,CacheData>();
86 // private int m_session_lifetime = DEFAULT_LIFETIME;
87
88 public AuthedSessionCache()
89 {
90 // m_session_lifetime = DEFAULT_LIFETIME;
91 }
92
93 public AuthedSessionCache(int timeout)
94 {
95 // m_session_lifetime = timeout;
96 }
97
98 public CacheData getCachedSession(string session_id, string agent_id)
99 {
100 CacheData ret = null;
101 lock (m_authed_sessions)
102 {
103 if (m_authed_sessions.ContainsKey(session_id))
104 {
105 CacheData cached_session = m_authed_sessions[session_id];
106 if (!cached_session.isExpired && cached_session.AgentID == agent_id)
107 {
108 ret = m_authed_sessions[session_id];
109 // auto renew
110 m_authed_sessions[session_id].Renew();
111 }
112 }
113 }
114 return ret;
115 }
116
117 public void Add(string session_id, string agent_id)
118 {
119 CacheData data = new CacheData(session_id, agent_id);
120 lock (m_authed_sessions)
121 {
122 if (m_authed_sessions.ContainsKey(session_id))
123 {
124 m_authed_sessions[session_id] = data;
125 }
126 else
127 {
128 m_authed_sessions.Add(session_id, data);
129 }
130 }
131 }
132 }
133}
diff --git a/OpenSim/Framework/Communications/InventoryServiceBase.cs b/OpenSim/Framework/Communications/InventoryServiceBase.cs
deleted file mode 100644
index 309c415..0000000
--- a/OpenSim/Framework/Communications/InventoryServiceBase.cs
+++ /dev/null
@@ -1,517 +0,0 @@
1/*
2 * Copyright (c) Contributors, http://opensimulator.org/
3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met:
7 * * Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer.
9 * * Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the
11 * documentation and/or other materials provided with the distribution.
12 * * Neither the name of the OpenSimulator Project nor the
13 * names of its contributors may be used to endorse or promote products
14 * derived from this software without specific prior written permission.
15 *
16 * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19 * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */
27
28using System.Collections.Generic;
29using System.Reflection;
30using log4net;
31using OpenMetaverse;
32using OpenSim.Data;
33
34namespace OpenSim.Framework.Communications
35{
36 /// <summary>
37 /// Abstract base class used by local and grid implementations of an inventory service.
38 /// </summary>
39 public abstract class InventoryServiceBase : IInterServiceInventoryServices
40 {
41
42 private static readonly ILog m_log
43 = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
44
45 protected List<IInventoryDataPlugin> m_plugins = new List<IInventoryDataPlugin>();
46
47 #region Plugin methods
48
49 /// <summary>
50 /// Add a new inventory data plugin - plugins will be requested in the order they were added.
51 /// </summary>
52 /// <param name="plugin">The plugin that will provide data</param>
53 public void AddPlugin(IInventoryDataPlugin plugin)
54 {
55 m_plugins.Add(plugin);
56 }
57
58 /// <summary>
59 /// Adds a list of inventory data plugins, as described by `provider'
60 /// and `connect', to `m_plugins'.
61 /// </summary>
62 /// <param name="provider">
63 /// The filename of the inventory server plugin DLL.
64 /// </param>
65 /// <param name="connect">
66 /// The connection string for the storage backend.
67 /// </param>
68 public void AddPlugin(string provider, string connect)
69 {
70 m_plugins.AddRange(DataPluginFactory.LoadDataPlugins<IInventoryDataPlugin>(provider, connect));
71 }
72
73 #endregion
74
75 #region IInventoryServices methods
76
77 public string Host
78 {
79 get { return "default"; }
80 }
81
82 public List<InventoryFolderBase> GetInventorySkeleton(UUID userId)
83 {
84// m_log.DebugFormat("[AGENT INVENTORY]: Getting inventory skeleton for {0}", userId);
85
86 InventoryFolderBase rootFolder = RequestRootFolder(userId);
87
88 // Agent has no inventory structure yet.
89 if (null == rootFolder)
90 {
91 return null;
92 }
93
94 List<InventoryFolderBase> userFolders = new List<InventoryFolderBase>();
95
96 userFolders.Add(rootFolder);
97
98 foreach (IInventoryDataPlugin plugin in m_plugins)
99 {
100 IList<InventoryFolderBase> folders = plugin.getFolderHierarchy(rootFolder.ID);
101 userFolders.AddRange(folders);
102 }
103
104// foreach (InventoryFolderBase folder in userFolders)
105// {
106// m_log.DebugFormat("[AGENT INVENTORY]: Got folder {0} {1}", folder.name, folder.folderID);
107// }
108
109 return userFolders;
110 }
111
112 // See IInventoryServices
113 public virtual bool HasInventoryForUser(UUID userID)
114 {
115 return false;
116 }
117
118 // See IInventoryServices
119 public virtual InventoryFolderBase RequestRootFolder(UUID userID)
120 {
121 // Retrieve the first root folder we get from the list of plugins.
122 foreach (IInventoryDataPlugin plugin in m_plugins)
123 {
124 InventoryFolderBase rootFolder = plugin.getUserRootFolder(userID);
125 if (rootFolder != null)
126 return rootFolder;
127 }
128
129 // Return nothing if no plugin was able to supply a root folder
130 return null;
131 }
132
133 // See IInventoryServices
134 public bool CreateNewUserInventory(UUID user)
135 {
136 InventoryFolderBase existingRootFolder = RequestRootFolder(user);
137
138 if (null != existingRootFolder)
139 {
140 m_log.WarnFormat(
141 "[AGENT INVENTORY]: Did not create a new inventory for user {0} since they already have "
142 + "a root inventory folder with id {1}",
143 user, existingRootFolder.ID);
144 }
145 else
146 {
147 UsersInventory inven = new UsersInventory();
148 inven.CreateNewInventorySet(user);
149 AddNewInventorySet(inven);
150
151 return true;
152 }
153
154 return false;
155 }
156
157 public List<InventoryItemBase> GetActiveGestures(UUID userId)
158 {
159 List<InventoryItemBase> activeGestures = new List<InventoryItemBase>();
160 foreach (IInventoryDataPlugin plugin in m_plugins)
161 {
162 activeGestures.AddRange(plugin.fetchActiveGestures(userId));
163 }
164
165 return activeGestures;
166 }
167
168 #endregion
169
170 #region Methods used by GridInventoryService
171
172 public List<InventoryFolderBase> RequestSubFolders(UUID parentFolderID)
173 {
174 List<InventoryFolderBase> inventoryList = new List<InventoryFolderBase>();
175
176 foreach (IInventoryDataPlugin plugin in m_plugins)
177 {
178 inventoryList.AddRange(plugin.getInventoryFolders(parentFolderID));
179 }
180
181 return inventoryList;
182 }
183
184 public List<InventoryItemBase> RequestFolderItems(UUID folderID)
185 {
186 List<InventoryItemBase> itemsList = new List<InventoryItemBase>();
187
188 foreach (IInventoryDataPlugin plugin in m_plugins)
189 {
190 itemsList.AddRange(plugin.getInventoryInFolder(folderID));
191 }
192
193 return itemsList;
194 }
195
196 #endregion
197
198 // See IInventoryServices
199 public virtual bool AddFolder(InventoryFolderBase folder)
200 {
201 m_log.DebugFormat(
202 "[AGENT INVENTORY]: Adding folder {0} {1} to folder {2}", folder.Name, folder.ID, folder.ParentID);
203
204 foreach (IInventoryDataPlugin plugin in m_plugins)
205 {
206 plugin.addInventoryFolder(folder);
207 }
208
209 // FIXME: Should return false on failure
210 return true;
211 }
212
213 // See IInventoryServices
214 public virtual bool UpdateFolder(InventoryFolderBase folder)
215 {
216 m_log.DebugFormat(
217 "[AGENT INVENTORY]: Updating folder {0} {1} to folder {2}", folder.Name, folder.ID, folder.ParentID);
218
219 foreach (IInventoryDataPlugin plugin in m_plugins)
220 {
221 plugin.updateInventoryFolder(folder);
222 }
223
224 // FIXME: Should return false on failure
225 return true;
226 }
227
228 // See IInventoryServices
229 public virtual bool MoveFolder(InventoryFolderBase folder)
230 {
231 m_log.DebugFormat(
232 "[AGENT INVENTORY]: Moving folder {0} {1} to folder {2}", folder.Name, folder.ID, folder.ParentID);
233
234 foreach (IInventoryDataPlugin plugin in m_plugins)
235 {
236 plugin.moveInventoryFolder(folder);
237 }
238
239 // FIXME: Should return false on failure
240 return true;
241 }
242
243 // See IInventoryServices
244 public virtual bool AddItem(InventoryItemBase item)
245 {
246 m_log.DebugFormat(
247 "[AGENT INVENTORY]: Adding item {0} {1} to folder {2}", item.Name, item.ID, item.Folder);
248
249 foreach (IInventoryDataPlugin plugin in m_plugins)
250 {
251 plugin.addInventoryItem(item);
252 }
253
254 // FIXME: Should return false on failure
255 return true;
256 }
257
258 // See IInventoryServices
259 public virtual bool UpdateItem(InventoryItemBase item)
260 {
261 m_log.InfoFormat(
262 "[AGENT INVENTORY]: Updating item {0} {1} in folder {2}", item.Name, item.ID, item.Folder);
263
264 foreach (IInventoryDataPlugin plugin in m_plugins)
265 {
266 plugin.updateInventoryItem(item);
267 }
268
269 // FIXME: Should return false on failure
270 return true;
271 }
272
273 // See IInventoryServices
274 public virtual bool DeleteItem(InventoryItemBase item)
275 {
276 m_log.InfoFormat(
277 "[AGENT INVENTORY]: Deleting item {0} {1} from folder {2}", item.Name, item.ID, item.Folder);
278
279 foreach (IInventoryDataPlugin plugin in m_plugins)
280 {
281 plugin.deleteInventoryItem(item.ID);
282 }
283
284 // FIXME: Should return false on failure
285 return true;
286 }
287
288 public virtual InventoryItemBase QueryItem(InventoryItemBase item)
289 {
290 foreach (IInventoryDataPlugin plugin in m_plugins)
291 {
292 InventoryItemBase result = plugin.queryInventoryItem(item.ID);
293 if (result != null)
294 return result;
295 }
296
297 return null;
298 }
299
300 public virtual InventoryFolderBase QueryFolder(InventoryFolderBase item)
301 {
302 foreach (IInventoryDataPlugin plugin in m_plugins)
303 {
304 InventoryFolderBase result = plugin.queryInventoryFolder(item.ID);
305 if (result != null)
306 return result;
307 }
308
309 return null;
310 }
311
312 /// <summary>
313 /// Purge a folder of all items items and subfolders.
314 ///
315 /// FIXME: Really nasty in a sense, because we have to query the database to get information we may
316 /// already know... Needs heavy refactoring.
317 /// </summary>
318 /// <param name="folder"></param>
319 public virtual bool PurgeFolder(InventoryFolderBase folder)
320 {
321 m_log.DebugFormat(
322 "[AGENT INVENTORY]: Purging folder {0} {1} of its contents", folder.Name, folder.ID);
323
324 List<InventoryFolderBase> subFolders = RequestSubFolders(folder.ID);
325
326 foreach (InventoryFolderBase subFolder in subFolders)
327 {
328// m_log.DebugFormat("[AGENT INVENTORY]: Deleting folder {0} {1}", subFolder.Name, subFolder.ID);
329
330 foreach (IInventoryDataPlugin plugin in m_plugins)
331 {
332 plugin.deleteInventoryFolder(subFolder.ID);
333 }
334 }
335
336 List<InventoryItemBase> items = RequestFolderItems(folder.ID);
337
338 foreach (InventoryItemBase item in items)
339 {
340 DeleteItem(item);
341 }
342
343 // FIXME: Should return false on failure
344 return true;
345 }
346
347 private void AddNewInventorySet(UsersInventory inventory)
348 {
349 foreach (InventoryFolderBase folder in inventory.Folders.Values)
350 {
351 AddFolder(folder);
352 }
353 }
354
355 public InventoryItemBase GetInventoryItem(UUID itemID)
356 {
357 foreach (IInventoryDataPlugin plugin in m_plugins)
358 {
359 InventoryItemBase item = plugin.getInventoryItem(itemID);
360 if (item != null)
361 return item;
362 }
363
364 return null;
365 }
366
367 /// <summary>
368 /// Used to create a new user inventory.
369 /// </summary>
370 private class UsersInventory
371 {
372 public Dictionary<UUID, InventoryFolderBase> Folders = new Dictionary<UUID, InventoryFolderBase>();
373 public Dictionary<UUID, InventoryItemBase> Items = new Dictionary<UUID, InventoryItemBase>();
374
375 public virtual void CreateNewInventorySet(UUID user)
376 {
377 InventoryFolderBase folder = new InventoryFolderBase();
378
379 folder.ParentID = UUID.Zero;
380 folder.Owner = user;
381 folder.ID = UUID.Random();
382 folder.Name = "My Inventory";
383 folder.Type = (short)AssetType.Folder;
384 folder.Version = 1;
385 Folders.Add(folder.ID, folder);
386
387 UUID rootFolder = folder.ID;
388
389 folder = new InventoryFolderBase();
390 folder.ParentID = rootFolder;
391 folder.Owner = user;
392 folder.ID = UUID.Random();
393 folder.Name = "Animations";
394 folder.Type = (short)AssetType.Animation;
395 folder.Version = 1;
396 Folders.Add(folder.ID, folder);
397
398 folder = new InventoryFolderBase();
399 folder.ParentID = rootFolder;
400 folder.Owner = user;
401 folder.ID = UUID.Random();
402 folder.Name = "Body Parts";
403 folder.Type = (short)AssetType.Bodypart;
404 folder.Version = 1;
405 Folders.Add(folder.ID, folder);
406
407 folder = new InventoryFolderBase();
408 folder.ParentID = rootFolder;
409 folder.Owner = user;
410 folder.ID = UUID.Random();
411 folder.Name = "Calling Cards";
412 folder.Type = (short)AssetType.CallingCard;
413 folder.Version = 1;
414 Folders.Add(folder.ID, folder);
415
416 folder = new InventoryFolderBase();
417 folder.ParentID = rootFolder;
418 folder.Owner = user;
419 folder.ID = UUID.Random();
420 folder.Name = "Clothing";
421 folder.Type = (short)AssetType.Clothing;
422 folder.Version = 1;
423 Folders.Add(folder.ID, folder);
424
425 folder = new InventoryFolderBase();
426 folder.ParentID = rootFolder;
427 folder.Owner = user;
428 folder.ID = UUID.Random();
429 folder.Name = "Gestures";
430 folder.Type = (short)AssetType.Gesture;
431 folder.Version = 1;
432 Folders.Add(folder.ID, folder);
433
434 folder = new InventoryFolderBase();
435 folder.ParentID = rootFolder;
436 folder.Owner = user;
437 folder.ID = UUID.Random();
438 folder.Name = "Landmarks";
439 folder.Type = (short)AssetType.Landmark;
440 folder.Version = 1;
441 Folders.Add(folder.ID, folder);
442
443 folder = new InventoryFolderBase();
444 folder.ParentID = rootFolder;
445 folder.Owner = user;
446 folder.ID = UUID.Random();
447 folder.Name = "Lost And Found";
448 folder.Type = (short)AssetType.LostAndFoundFolder;
449 folder.Version = 1;
450 Folders.Add(folder.ID, folder);
451
452 folder = new InventoryFolderBase();
453 folder.ParentID = rootFolder;
454 folder.Owner = user;
455 folder.ID = UUID.Random();
456 folder.Name = "Notecards";
457 folder.Type = (short)AssetType.Notecard;
458 folder.Version = 1;
459 Folders.Add(folder.ID, folder);
460
461 folder = new InventoryFolderBase();
462 folder.ParentID = rootFolder;
463 folder.Owner = user;
464 folder.ID = UUID.Random();
465 folder.Name = "Objects";
466 folder.Type = (short)AssetType.Object;
467 folder.Version = 1;
468 Folders.Add(folder.ID, folder);
469
470 folder = new InventoryFolderBase();
471 folder.ParentID = rootFolder;
472 folder.Owner = user;
473 folder.ID = UUID.Random();
474 folder.Name = "Photo Album";
475 folder.Type = (short)AssetType.SnapshotFolder;
476 folder.Version = 1;
477 Folders.Add(folder.ID, folder);
478
479 folder = new InventoryFolderBase();
480 folder.ParentID = rootFolder;
481 folder.Owner = user;
482 folder.ID = UUID.Random();
483 folder.Name = "Scripts";
484 folder.Type = (short)AssetType.LSLText;
485 folder.Version = 1;
486 Folders.Add(folder.ID, folder);
487
488 folder = new InventoryFolderBase();
489 folder.ParentID = rootFolder;
490 folder.Owner = user;
491 folder.ID = UUID.Random();
492 folder.Name = "Sounds";
493 folder.Type = (short)AssetType.Sound;
494 folder.Version = 1;
495 Folders.Add(folder.ID, folder);
496
497 folder = new InventoryFolderBase();
498 folder.ParentID = rootFolder;
499 folder.Owner = user;
500 folder.ID = UUID.Random();
501 folder.Name = "Textures";
502 folder.Type = (short)AssetType.Texture;
503 folder.Version = 1;
504 Folders.Add(folder.ID, folder);
505
506 folder = new InventoryFolderBase();
507 folder.ParentID = rootFolder;
508 folder.Owner = user;
509 folder.ID = UUID.Random();
510 folder.Name = "Trash";
511 folder.Type = (short)AssetType.TrashFolder;
512 folder.Version = 1;
513 Folders.Add(folder.ID, folder);
514 }
515 }
516 }
517}
diff --git a/OpenSim/Framework/Communications/Tests/LoginServiceTests.cs b/OpenSim/Framework/Communications/Tests/LoginServiceTests.cs
index 6f86704..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;
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..67bff4c 100644
--- a/OpenSim/Framework/Console/RemoteConsole.cs
+++ b/OpenSim/Framework/Console/RemoteConsole.cs
@@ -50,8 +50,6 @@ namespace OpenSim.Framework.Console
50 // 50 //
51 public class RemoteConsole : CommandConsole 51 public class RemoteConsole : CommandConsole
52 { 52 {
53 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
54
55 private IHttpServer m_Server = null; 53 private IHttpServer m_Server = null;
56 private IConfigSource m_Config = null; 54 private IConfigSource m_Config = null;
57 55
@@ -217,6 +215,12 @@ namespace OpenSim.Framework.Console
217 id.AppendChild(xmldoc.CreateTextNode(sessionID.ToString())); 215 id.AppendChild(xmldoc.CreateTextNode(sessionID.ToString()));
218 216
219 rootElement.AppendChild(id); 217 rootElement.AppendChild(id);
218
219 XmlElement prompt = xmldoc.CreateElement("", "Prompt", "");
220 prompt.AppendChild(xmldoc.CreateTextNode(DefaultPrompt));
221
222 rootElement.AppendChild(prompt);
223
220 rootElement.AppendChild(MainConsole.Instance.Commands.GetXml(xmldoc)); 224 rootElement.AppendChild(MainConsole.Instance.Commands.GetXml(xmldoc));
221 225
222 reply["str_response_string"] = xmldoc.InnerXml; 226 reply["str_response_string"] = xmldoc.InnerXml;
diff --git a/OpenSim/Framework/GridConfig.cs b/OpenSim/Framework/GridConfig.cs
index 87fd3f0..9aa5d03 100644
--- a/OpenSim/Framework/GridConfig.cs
+++ b/OpenSim/Framework/GridConfig.cs
@@ -98,10 +98,10 @@ namespace OpenSim.Framework
98 "True", 98 "True",
99 false); 99 false);
100 m_configMember.addConfigurationOption("console_user", ConfigurationOption.ConfigurationTypes.TYPE_STRING, 100 m_configMember.addConfigurationOption("console_user", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
101 "Remote console access user name [Default: disabled]", "0", false); 101 "Remote console access user name [Default: disabled]", "", false);
102 102
103 m_configMember.addConfigurationOption("console_pass", ConfigurationOption.ConfigurationTypes.TYPE_STRING, 103 m_configMember.addConfigurationOption("console_pass", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
104 "Remote console access password [Default: disabled]", "0", false); 104 "Remote console access password [Default: disabled]", "", false);
105 105
106 } 106 }
107 107
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index c6cdcaa..444adf9 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -260,7 +260,7 @@ namespace OpenSim.Framework
260 IClientAPI remoteClient, List<UUID> itemIDs); 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/MessageServerConfig.cs b/OpenSim/Framework/MessageServerConfig.cs
index 61e5ea7..884c0ea 100644
--- a/OpenSim/Framework/MessageServerConfig.cs
+++ b/OpenSim/Framework/MessageServerConfig.cs
@@ -91,10 +91,10 @@ namespace OpenSim.Framework
91 m_configMember.addConfigurationOption("published_ip", ConfigurationOption.ConfigurationTypes.TYPE_STRING, 91 m_configMember.addConfigurationOption("published_ip", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
92 "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, 93 m_configMember.addConfigurationOption("console_user", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
94 "Remote console access user name [Default: disabled]", "0", false); 94 "Remote console access user name [Default: disabled]", "", false);
95 95
96 m_configMember.addConfigurationOption("console_pass", ConfigurationOption.ConfigurationTypes.TYPE_STRING, 96 m_configMember.addConfigurationOption("console_pass", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
97 "Remote console access password [Default: disabled]", "0", false); 97 "Remote console access password [Default: disabled]", "", false);
98 98
99 } 99 }
100 100
diff --git a/OpenSim/Framework/Servers/HttpServer/PollServiceWorkerThread.cs b/OpenSim/Framework/Servers/HttpServer/PollServiceWorkerThread.cs
index d8cbeac..41fb376 100644
--- a/OpenSim/Framework/Servers/HttpServer/PollServiceWorkerThread.cs
+++ b/OpenSim/Framework/Servers/HttpServer/PollServiceWorkerThread.cs
@@ -59,6 +59,8 @@ using System.IO;
59using System.Text; 59using System.Text;
60using HttpServer; 60using HttpServer;
61using OpenMetaverse; 61using OpenMetaverse;
62using System.Reflection;
63using log4net;
62 64
63namespace OpenSim.Framework.Servers.HttpServer 65namespace OpenSim.Framework.Servers.HttpServer
64{ 66{
@@ -66,6 +68,10 @@ namespace OpenSim.Framework.Servers.HttpServer
66 68
67 public class PollServiceWorkerThread 69 public class PollServiceWorkerThread
68 { 70 {
71 private static readonly ILog m_log =
72 LogManager.GetLogger(
73 MethodBase.GetCurrentMethod().DeclaringType);
74
69 public event ReQueuePollServiceItem ReQueue; 75 public event ReQueuePollServiceItem ReQueue;
70 76
71 private readonly BaseHttpServer m_server; 77 private readonly BaseHttpServer m_server;
@@ -92,31 +98,36 @@ namespace OpenSim.Framework.Servers.HttpServer
92 while (m_running) 98 while (m_running)
93 { 99 {
94 PollServiceHttpRequest req = m_request.Dequeue(); 100 PollServiceHttpRequest req = m_request.Dequeue();
95 if (req.PollServiceArgs.HasEvents(req.PollServiceArgs.Id)) 101 try
96 { 102 {
97 StreamReader str = new StreamReader(req.Request.Body); 103 if (req.PollServiceArgs.HasEvents(req.PollServiceArgs.Id))
98
99 Hashtable responsedata = req.PollServiceArgs.GetEvents(req.PollServiceArgs.Id, str.ReadToEnd());
100 m_server.DoHTTPGruntWork(responsedata,
101 new OSHttpResponse(new HttpResponse(req.HttpContext, req.Request),req.HttpContext));
102 }
103 else
104 {
105 if ((Environment.TickCount - req.RequestTime) > m_timeout)
106 { 104 {
107 m_server.DoHTTPGruntWork(req.PollServiceArgs.NoEvents(), 105 StreamReader str = new StreamReader(req.Request.Body);
106
107 Hashtable responsedata = req.PollServiceArgs.GetEvents(req.PollServiceArgs.Id, str.ReadToEnd());
108 m_server.DoHTTPGruntWork(responsedata,
108 new OSHttpResponse(new HttpResponse(req.HttpContext, req.Request),req.HttpContext)); 109 new OSHttpResponse(new HttpResponse(req.HttpContext, req.Request),req.HttpContext));
109 } 110 }
110 else 111 else
111 { 112 {
112 ReQueuePollServiceItem reQueueItem = ReQueue; 113 if ((Environment.TickCount - req.RequestTime) > m_timeout)
113 if (reQueueItem != null) 114 {
114 reQueueItem(req); 115 m_server.DoHTTPGruntWork(req.PollServiceArgs.NoEvents(),
116 new OSHttpResponse(new HttpResponse(req.HttpContext, req.Request),req.HttpContext));
117 }
118 else
119 {
120 ReQueuePollServiceItem reQueueItem = ReQueue;
121 if (reQueueItem != null)
122 reQueueItem(req);
123 }
115 } 124 }
116 } 125 }
126 catch (Exception e)
127 {
128 m_log.ErrorFormat("Exception in poll service thread: " + e.ToString());
129 }
117 } 130 }
118
119
120 } 131 }
121 132
122 internal void Enqueue(PollServiceHttpRequest pPollServiceHttpRequest) 133 internal void Enqueue(PollServiceHttpRequest pPollServiceHttpRequest)
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/UserConfig.cs b/OpenSim/Framework/UserConfig.cs
index b9e3665..16f265c 100644
--- a/OpenSim/Framework/UserConfig.cs
+++ b/OpenSim/Framework/UserConfig.cs
@@ -158,10 +158,10 @@ namespace OpenSim.Framework
158 "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);
159 159
160 m_configMember.addConfigurationOption("console_user", ConfigurationOption.ConfigurationTypes.TYPE_STRING, 160 m_configMember.addConfigurationOption("console_user", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
161 "Remote console access user name [Default: disabled]", "0", false); 161 "Remote console access user name [Default: disabled]", "", false);
162 162
163 m_configMember.addConfigurationOption("console_pass", ConfigurationOption.ConfigurationTypes.TYPE_STRING, 163 m_configMember.addConfigurationOption("console_pass", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
164 "Remote console access password [Default: disabled]", "0", false); 164 "Remote console access password [Default: disabled]", "", false);
165 165
166 } 166 }
167 167
generated by cgit v1.1 at 2024-12-17 11:46:29 +0000