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/Framework/Communications/LoginResponse.cs | |
parent | light the mysql region tests (diff) | |
download | opensim-SC-fe9aea258ff4142e718b4916ccefeeedef229768.zip opensim-SC-fe9aea258ff4142e718b4916ccefeeedef229768.tar.gz opensim-SC-fe9aea258ff4142e718b4916ccefeeedef229768.tar.bz2 opensim-SC-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 '')
-rw-r--r-- | OpenSim/Framework/Communications/LoginResponse.cs | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/OpenSim/Framework/Communications/LoginResponse.cs b/OpenSim/Framework/Communications/LoginResponse.cs index 435852d4..db504f9 100644 --- a/OpenSim/Framework/Communications/LoginResponse.cs +++ b/OpenSim/Framework/Communications/LoginResponse.cs | |||
@@ -60,6 +60,7 @@ namespace OpenSim.Framework.Communications | |||
60 | private ArrayList inventoryLibraryOwner; | 60 | private ArrayList inventoryLibraryOwner; |
61 | private ArrayList inventoryLibRoot; | 61 | private ArrayList inventoryLibRoot; |
62 | private ArrayList inventoryLibrary; | 62 | private ArrayList inventoryLibrary; |
63 | private ArrayList activeGestures; | ||
63 | 64 | ||
64 | private UserInfo userProfile; | 65 | private UserInfo userProfile; |
65 | 66 | ||
@@ -124,6 +125,7 @@ namespace OpenSim.Framework.Communications | |||
124 | agentInventory = new ArrayList(); | 125 | agentInventory = new ArrayList(); |
125 | inventoryLibrary = new ArrayList(); | 126 | inventoryLibrary = new ArrayList(); |
126 | inventoryLibraryOwner = new ArrayList(); | 127 | inventoryLibraryOwner = new ArrayList(); |
128 | activeGestures = new ArrayList(); | ||
127 | 129 | ||
128 | xmlRpcResponse = new XmlRpcResponse(); | 130 | xmlRpcResponse = new XmlRpcResponse(); |
129 | // defaultXmlRpcResponse = new XmlRpcResponse(); | 131 | // defaultXmlRpcResponse = new XmlRpcResponse(); |
@@ -355,7 +357,7 @@ namespace OpenSim.Framework.Communications | |||
355 | responseData["inventory-skel-lib"] = inventoryLibrary; | 357 | responseData["inventory-skel-lib"] = inventoryLibrary; |
356 | responseData["inventory-root"] = inventoryRoot; | 358 | responseData["inventory-root"] = inventoryRoot; |
357 | responseData["inventory-lib-root"] = inventoryLibRoot; | 359 | responseData["inventory-lib-root"] = inventoryLibRoot; |
358 | responseData["gestures"] = new ArrayList(); // todo | 360 | responseData["gestures"] = activeGestures; |
359 | responseData["inventory-lib-owner"] = inventoryLibraryOwner; | 361 | responseData["inventory-lib-owner"] = inventoryLibraryOwner; |
360 | responseData["initial-outfit"] = initialOutfit; | 362 | responseData["initial-outfit"] = initialOutfit; |
361 | responseData["start_location"] = startLocation; | 363 | responseData["start_location"] = startLocation; |
@@ -452,7 +454,7 @@ namespace OpenSim.Framework.Communications | |||
452 | 454 | ||
453 | #endregion Inventory | 455 | #endregion Inventory |
454 | 456 | ||
455 | map["gestures"] = new LLSDArray(); // todo | 457 | map["gestures"] = ArrayListToLLSDArray(activeGestures); |
456 | 458 | ||
457 | map["initial-outfit"] = ArrayListToLLSDArray(initialOutfit); | 459 | map["initial-outfit"] = ArrayListToLLSDArray(initialOutfit); |
458 | map["start_location"] = LLSD.FromString(startLocation); | 460 | map["start_location"] = LLSD.FromString(startLocation); |
@@ -699,6 +701,12 @@ namespace OpenSim.Framework.Communications | |||
699 | set { inventoryLibRoot = value; } | 701 | set { inventoryLibRoot = value; } |
700 | } | 702 | } |
701 | 703 | ||
704 | public ArrayList ActiveGestures | ||
705 | { | ||
706 | get { return activeGestures; } | ||
707 | set { activeGestures = value; } | ||
708 | } | ||
709 | |||
702 | public string Home | 710 | public string Home |
703 | { | 711 | { |
704 | get { return home; } | 712 | get { return home; } |