diff options
| author | Teravus Ovares (Dan Olivares) | 2009-08-26 11:48:05 -0400 |
|---|---|---|
| committer | Teravus Ovares (Dan Olivares) | 2009-08-26 11:48:05 -0400 |
| commit | 54e05a083d2aeb7a892647f64edfd52db80ce5ed (patch) | |
| tree | 1fca51f8dd19c0f4871d8e1b875511c6087b3675 /OpenSim/Grid/UserServer.Modules | |
| parent | * It turns out that Physics heightmap values were being stored in managed mem... (diff) | |
| parent | Add reference to OpenMetaverse.dll to UserServer.Modules to make MSVS happy (diff) | |
| download | opensim-SC-54e05a083d2aeb7a892647f64edfd52db80ce5ed.zip opensim-SC-54e05a083d2aeb7a892647f64edfd52db80ce5ed.tar.gz opensim-SC-54e05a083d2aeb7a892647f64edfd52db80ce5ed.tar.bz2 opensim-SC-54e05a083d2aeb7a892647f64edfd52db80ce5ed.tar.xz | |
Merge branch 'master' of ssh://MyConnection/var/git/opensim
Diffstat (limited to 'OpenSim/Grid/UserServer.Modules')
| -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 | } |