aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Grid/UserServer/UserManager.cs
diff options
context:
space:
mode:
authorSean Dague2008-05-19 19:08:59 +0000
committerSean Dague2008-05-19 19:08:59 +0000
commit9808f39b6f21c26ac0e8cf9c8a04cc8ab2bfa7e9 (patch)
treec823e351a3796d145bc71aee402c18cb89b8fb25 /OpenSim/Grid/UserServer/UserManager.cs
parent(from awebb) (diff)
downloadopensim-SC_OLD-9808f39b6f21c26ac0e8cf9c8a04cc8ab2bfa7e9.zip
opensim-SC_OLD-9808f39b6f21c26ac0e8cf9c8a04cc8ab2bfa7e9.tar.gz
opensim-SC_OLD-9808f39b6f21c26ac0e8cf9c8a04cc8ab2bfa7e9.tar.bz2
opensim-SC_OLD-9808f39b6f21c26ac0e8cf9c8a04cc8ab2bfa7e9.tar.xz
i can haz pantz?
You sure can. This change set restores pants (and the rest of the default appearance) in grid mode. The root issue had to do with serializing multi-faced textures to the grid server. This also restores the lookup path through the avatar factory module, as that seems the reasonable place to have it live. Some clean up patches are coming later as well, plus testing on standalone, but this should be in a good kicking around state for grid users.
Diffstat (limited to 'OpenSim/Grid/UserServer/UserManager.cs')
-rw-r--r--OpenSim/Grid/UserServer/UserManager.cs8
1 files changed, 7 insertions, 1 deletions
diff --git a/OpenSim/Grid/UserServer/UserManager.cs b/OpenSim/Grid/UserServer/UserManager.cs
index 307af34..1cf2a48 100644
--- a/OpenSim/Grid/UserServer/UserManager.cs
+++ b/OpenSim/Grid/UserServer/UserManager.cs
@@ -256,7 +256,13 @@ namespace OpenSim.Grid.UserServer
256 if (requestData.Contains("owner")) 256 if (requestData.Contains("owner"))
257 { 257 {
258 appearance = GetUserAppearance(new LLUUID((string)requestData["owner"])); 258 appearance = GetUserAppearance(new LLUUID((string)requestData["owner"]));
259 responseData = appearance.ToHashTable(); 259 if (appearance == null) {
260 responseData = new Hashtable();
261 responseData["error_type"] = "no appearance";
262 responseData["error_desc"] = "There was no appearance found for this avatar";
263 } else {
264 responseData = appearance.ToHashTable();
265 }
260 } 266 }
261 else 267 else
262 { 268 {