aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2012-01-05 19:40:54 +0000
committerJustin Clark-Casey (justincc)2012-01-05 19:40:54 +0000
commitc201b54b8524033310c59fe353616e84616a542e (patch)
tree06a233f77d38b984fd65f7592c6fcdbd1ffc1ef0 /OpenSim
parentCommenting out DataSnapShot message "Registering service discovery capability... (diff)
downloadopensim-SC_OLD-c201b54b8524033310c59fe353616e84616a542e.zip
opensim-SC_OLD-c201b54b8524033310c59fe353616e84616a542e.tar.gz
opensim-SC_OLD-c201b54b8524033310c59fe353616e84616a542e.tar.bz2
opensim-SC_OLD-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')
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/LLImageManager.cs12
-rw-r--r--OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs7
-rw-r--r--OpenSim/Region/Framework/Interfaces/IAvatarFactoryModule.cs5
-rw-r--r--OpenSim/Region/OptionalModules/Avatar/Appearance/AppearanceInfoModule.cs13
4 files changed, 25 insertions, 12 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLImageManager.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLImageManager.cs
index 3e31b7d..b53f0af 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLImageManager.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLImageManager.cs
@@ -107,9 +107,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
107 } 107 }
108 else 108 else
109 { 109 {
110// m_log.DebugFormat( 110 m_log.DebugFormat(
111// "[LL IMAGE MANAGER]: Received duplicate of existing request for {0}, start packet {1} from {2}", 111 "[LL IMAGE MANAGER]: Received duplicate of existing request for {0}, start packet {1} from {2}",
112// newRequest.RequestedAssetID, newRequest.PacketNumber, m_client.Name); 112 newRequest.RequestedAssetID, newRequest.PacketNumber, m_client.Name);
113 113
114 //m_log.DebugFormat("[TEX]: (UPD) ID={0}: D={1}, S={2}, P={3}", 114 //m_log.DebugFormat("[TEX]: (UPD) ID={0}: D={1}, S={2}, P={3}",
115 // newRequest.RequestedAssetID, newRequest.DiscardLevel, newRequest.PacketNumber, newRequest.Priority); 115 // newRequest.RequestedAssetID, newRequest.DiscardLevel, newRequest.PacketNumber, newRequest.Priority);
@@ -168,9 +168,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
168 } 168 }
169 else 169 else
170 { 170 {
171// m_log.DebugFormat( 171 m_log.DebugFormat(
172// "[LL IMAGE MANAGER]: Received request for {0}, start packet {1} from {2}", 172 "[LL IMAGE MANAGER]: Received request for {0}, start packet {1} from {2}",
173// newRequest.RequestedAssetID, newRequest.PacketNumber, m_client.Name); 173 newRequest.RequestedAssetID, newRequest.PacketNumber, m_client.Name);
174 174
175 //m_log.DebugFormat("[TEX]: (NEW) ID={0}: D={1}, S={2}, P={3}", 175 //m_log.DebugFormat("[TEX]: (NEW) ID={0}: D={1}, S={2}, P={3}",
176 // newRequest.RequestedAssetID, newRequest.DiscardLevel, newRequest.PacketNumber, newRequest.Priority); 176 // newRequest.RequestedAssetID, newRequest.DiscardLevel, newRequest.PacketNumber, newRequest.Priority);
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
diff --git a/OpenSim/Region/Framework/Interfaces/IAvatarFactoryModule.cs b/OpenSim/Region/Framework/Interfaces/IAvatarFactoryModule.cs
index 04df9c3..39a760c 100644
--- a/OpenSim/Region/Framework/Interfaces/IAvatarFactoryModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IAvatarFactoryModule.cs
@@ -82,7 +82,10 @@ namespace OpenSim.Region.Framework.Interfaces
82 /// If true, only request a rebake for the textures that are missing. 82 /// If true, only request a rebake for the textures that are missing.
83 /// If false then we request a rebake of all textures for which we already have references. 83 /// If false then we request a rebake of all textures for which we already have references.
84 /// </param> 84 /// </param>
85 void RequestRebake(IScenePresence sp, bool missingTexturesOnly); 85 /// <returns>
86 /// Number of rebake requests made. This will depend upon whether we've previously received texture IDs.
87 /// </returns>
88 int RequestRebake(IScenePresence sp, bool missingTexturesOnly);
86 89
87 void QueueAppearanceSend(UUID agentid); 90 void QueueAppearanceSend(UUID agentid);
88 void QueueAppearanceSave(UUID agentid); 91 void QueueAppearanceSave(UUID agentid);
diff --git a/OpenSim/Region/OptionalModules/Avatar/Appearance/AppearanceInfoModule.cs b/OpenSim/Region/OptionalModules/Avatar/Appearance/AppearanceInfoModule.cs
index 7e15718..39cd4c9 100644
--- a/OpenSim/Region/OptionalModules/Avatar/Appearance/AppearanceInfoModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/Appearance/AppearanceInfoModule.cs
@@ -240,11 +240,16 @@ namespace OpenSim.Region.OptionalModules.Avatar.Appearance
240 ScenePresence sp = scene.GetScenePresence(firstname, lastname); 240 ScenePresence sp = scene.GetScenePresence(firstname, lastname);
241 if (sp != null && !sp.IsChildAgent) 241 if (sp != null && !sp.IsChildAgent)
242 { 242 {
243 MainConsole.Instance.OutputFormat( 243 int rebakesRequested = scene.AvatarFactory.RequestRebake(sp, false);
244 "Requesting rebake of uploaded textures for {0}",
245 sp.Name, scene.RegionInfo.RegionName);
246 244
247 scene.AvatarFactory.RequestRebake(sp, false); 245 if (rebakesRequested > 0)
246 MainConsole.Instance.OutputFormat(
247 "Requesting rebake of {0} uploaded textures for {1} in {2}",
248 rebakesRequested, sp.Name, scene.RegionInfo.RegionName);
249 else
250 MainConsole.Instance.OutputFormat(
251 "No texture IDs available for rebake request for {0} in {1}",
252 sp.Name, scene.RegionInfo.RegionName);
248 } 253 }
249 } 254 }
250 } 255 }