diff options
author | Teravus Ovares (Dan Olivares) | 2009-08-25 17:36:04 -0400 |
---|---|---|
committer | Teravus Ovares (Dan Olivares) | 2009-08-25 17:36:04 -0400 |
commit | 5f794d3e599c45d37fed508de24216c8888a2fba (patch) | |
tree | d67bf3f91fc0ae4bf16552e31d5249249d71be6c /OpenSim/Grid | |
parent | Merge branch 'master' of ssh://MyConnection/var/git/opensim (diff) | |
download | opensim-SC_OLD-5f794d3e599c45d37fed508de24216c8888a2fba.zip opensim-SC_OLD-5f794d3e599c45d37fed508de24216c8888a2fba.tar.gz opensim-SC_OLD-5f794d3e599c45d37fed508de24216c8888a2fba.tar.bz2 opensim-SC_OLD-5f794d3e599c45d37fed508de24216c8888a2fba.tar.xz |
A slightly modified version of
http://opensimulator.org/mantis/view.php?id=4040 by jhurliman. The patch didn't match up, so I winged it here. My effort to manually merge the patch seems to make sense, so I'm going to commit it.
Diffstat (limited to 'OpenSim/Grid')
-rw-r--r-- | OpenSim/Grid/UserServer.Modules/UserServerAvatarAppearanceModule.cs | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/OpenSim/Grid/UserServer.Modules/UserServerAvatarAppearanceModule.cs b/OpenSim/Grid/UserServer.Modules/UserServerAvatarAppearanceModule.cs index 7941679..88918d1 100644 --- a/OpenSim/Grid/UserServer.Modules/UserServerAvatarAppearanceModule.cs +++ b/OpenSim/Grid/UserServer.Modules/UserServerAvatarAppearanceModule.cs | |||
@@ -110,7 +110,12 @@ namespace OpenSim.Grid.UserServer.Modules | |||
110 | if (requestData.Contains("owner")) | 110 | if (requestData.Contains("owner")) |
111 | { | 111 | { |
112 | AvatarAppearance appearance = new AvatarAppearance(requestData); | 112 | AvatarAppearance appearance = new AvatarAppearance(requestData); |
113 | m_userDataBaseService.UpdateUserAppearance(new UUID((string)requestData["owner"]), appearance); | 113 | |
114 | // TODO: Sometime in the future we may have a database layer that is capable of updating appearance when | ||
115 | // the TextureEntry is null. When that happens, this check can be removed | ||
116 | if (appearance.Texture != null) | ||
117 | m_userDataBaseService.UpdateUserAppearance(new UUID((string)requestData["owner"]), appearance); | ||
118 | |||
114 | responseData = new Hashtable(); | 119 | responseData = new Hashtable(); |
115 | responseData["returnString"] = "TRUE"; | 120 | responseData["returnString"] = "TRUE"; |
116 | } | 121 | } |