diff options
author | Justin Clark-Casey (justincc) | 2012-01-05 19:40:54 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2012-01-05 19:40:54 +0000 |
commit | c201b54b8524033310c59fe353616e84616a542e (patch) | |
tree | 06a233f77d38b984fd65f7592c6fcdbd1ffc1ef0 /OpenSim/Region/CoreModules/Avatar | |
parent | Commenting out DataSnapShot message "Registering service discovery capability... (diff) | |
download | opensim-SC-c201b54b8524033310c59fe353616e84616a542e.zip opensim-SC-c201b54b8524033310c59fe353616e84616a542e.tar.gz opensim-SC-c201b54b8524033310c59fe353616e84616a542e.tar.bz2 opensim-SC-c201b54b8524033310c59fe353616e84616a542e.tar.xz |
Improve "app rebake" command to return a better message if no uploaded texture ids were available for the rebake request
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs index 9df0592..d68d28c 100644 --- a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs | |||
@@ -321,8 +321,10 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory | |||
321 | return (defonly ? false : true); | 321 | return (defonly ? false : true); |
322 | } | 322 | } |
323 | 323 | ||
324 | public void RequestRebake(IScenePresence sp, bool missingTexturesOnly) | 324 | public int RequestRebake(IScenePresence sp, bool missingTexturesOnly) |
325 | { | 325 | { |
326 | int texturesRebaked = 0; | ||
327 | |||
326 | for (int i = 0; i < AvatarAppearance.BAKE_INDICES.Length; i++) | 328 | for (int i = 0; i < AvatarAppearance.BAKE_INDICES.Length; i++) |
327 | { | 329 | { |
328 | int idx = AvatarAppearance.BAKE_INDICES[i]; | 330 | int idx = AvatarAppearance.BAKE_INDICES[i]; |
@@ -359,8 +361,11 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory | |||
359 | face.TextureID, idx, sp.Name); | 361 | face.TextureID, idx, sp.Name); |
360 | } | 362 | } |
361 | 363 | ||
364 | texturesRebaked++; | ||
362 | sp.ControllingClient.SendRebakeAvatarTextures(face.TextureID); | 365 | sp.ControllingClient.SendRebakeAvatarTextures(face.TextureID); |
363 | } | 366 | } |
367 | |||
368 | return texturesRebaked; | ||
364 | } | 369 | } |
365 | 370 | ||
366 | #endregion | 371 | #endregion |