diff options
author | Homer Horwitz | 2008-09-24 21:12:21 +0000 |
---|---|---|
committer | Homer Horwitz | 2008-09-24 21:12:21 +0000 |
commit | fe9aea258ff4142e718b4916ccefeeedef229768 (patch) | |
tree | f60c40697833392b35788fbc5cd97a5014bb29b7 /OpenSim/Grid/InventoryServer | |
parent | light the mysql region tests (diff) | |
download | opensim-SC_OLD-fe9aea258ff4142e718b4916ccefeeedef229768.zip opensim-SC_OLD-fe9aea258ff4142e718b4916ccefeeedef229768.tar.gz opensim-SC_OLD-fe9aea258ff4142e718b4916ccefeeedef229768.tar.bz2 opensim-SC_OLD-fe9aea258ff4142e718b4916ccefeeedef229768.tar.xz |
Add persistence of active gestures. This needs an UGAIM update to work.
Active gestures are sent as part of the login-response. Added
fetchActiveGestures to SQLite and MySQL; added an empty one for MSSQL and
NHibernate. Using the empty ones won't cause errors, but doesn't provide
persistence either, of course.
Diffstat (limited to 'OpenSim/Grid/InventoryServer')
-rw-r--r-- | OpenSim/Grid/InventoryServer/GridInventoryService.cs | 9 | ||||
-rw-r--r-- | OpenSim/Grid/InventoryServer/Main.cs | 5 |
2 files changed, 14 insertions, 0 deletions
diff --git a/OpenSim/Grid/InventoryServer/GridInventoryService.cs b/OpenSim/Grid/InventoryServer/GridInventoryService.cs index 4d58775..6f7672e 100644 --- a/OpenSim/Grid/InventoryServer/GridInventoryService.cs +++ b/OpenSim/Grid/InventoryServer/GridInventoryService.cs | |||
@@ -233,5 +233,14 @@ namespace OpenSim.Grid.InventoryServer | |||
233 | 233 | ||
234 | return CreateNewUserInventory(userID); | 234 | return CreateNewUserInventory(userID); |
235 | } | 235 | } |
236 | |||
237 | public List<InventoryItemBase> GetActiveGestures(Guid rawUserID) | ||
238 | { | ||
239 | UUID userID = new UUID(rawUserID); | ||
240 | |||
241 | m_log.InfoFormat("[GRID AGENT INVENTORY]: fetching active gestures for user {0}", userID); | ||
242 | |||
243 | return GetActiveGestures(userID); | ||
244 | } | ||
236 | } | 245 | } |
237 | } | 246 | } |
diff --git a/OpenSim/Grid/InventoryServer/Main.cs b/OpenSim/Grid/InventoryServer/Main.cs index 9f40d16..3b990e7 100644 --- a/OpenSim/Grid/InventoryServer/Main.cs +++ b/OpenSim/Grid/InventoryServer/Main.cs | |||
@@ -123,6 +123,11 @@ namespace OpenSim.Grid.InventoryServer | |||
123 | m_httpServer.AddStreamHandler( | 123 | m_httpServer.AddStreamHandler( |
124 | new RestDeserialiseTrustedHandler<Guid, List<InventoryFolderBase>> | 124 | new RestDeserialiseTrustedHandler<Guid, List<InventoryFolderBase>> |
125 | ("POST", "/RootFolders/", m_inventoryService.GetInventorySkeleton, m_inventoryService.CheckTrustSource)); | 125 | ("POST", "/RootFolders/", m_inventoryService.GetInventorySkeleton, m_inventoryService.CheckTrustSource)); |
126 | |||
127 | // for persistent active gestures | ||
128 | m_httpServer.AddStreamHandler( | ||
129 | new RestDeserialiseTrustedHandler<Guid, List<InventoryItemBase>> | ||
130 | ("POST", "/ActiveGestures/", m_inventoryService.GetActiveGestures, m_inventoryService.CheckTrustSource)); | ||
126 | } | 131 | } |
127 | 132 | ||
128 | private void Work() | 133 | private void Work() |