Diff of /trunk/IdealistViewer/Application/BaseIdealistViewer.cs
Parent Directory
| 
Revision Log
| 
Patch
| revision 67, Sat Nov 8 08:52:51 2008 UTC | revision 68, Sat Nov 8 11:26:31 2008 UTC | |
|---|---|---|
| # | Line 602 | Line 602 |
| 602 | ||
| 603 | if (tx.vObj != null && tex != null) | if (tx.vObj != null && tex != null) |
| 604 | { | { |
| 605 | textureMan.applyTexture(tex, tx.vObj); | textureMan.applyTexture(tex, tx.vObj, tx.textureID); |
| 606 | } | } |
| 607 | } | } |
| 608 | ||
| # | Line 2267 | Line 2267 |
| 2267 | ||
| 2268 | #endregion | #endregion |
| 2269 | ||
| 2270 | public void textureCompleteCallback(string tex, VObject vObj) | public void textureCompleteCallback(string tex, VObject vObj, UUID AssetID) |
| 2271 | { | { |
| 2272 | TextureComplete tx = new TextureComplete(); | TextureComplete tx = new TextureComplete(); |
| 2273 | tx.texture = tex; | tx.texture = tex; |
| 2274 | tx.vObj = vObj; | tx.vObj = vObj; |
| 2275 | tx.textureID = AssetID; | |
| 2276 | assignTextureQueue.Enqueue(tx); | assignTextureQueue.Enqueue(tx); |
| 2277 | } | } |
| 2278 | } | } |
| # | Line 2280 | Line 2281 |
| 2281 | { | { |
| 2282 | public VObject vObj; | public VObject vObj; |
| 2283 | public string texture; | public string texture; |
| 2284 | public UUID textureID; | |
| 2285 | ||
| 2286 | } | } |
| 2287 | } | } |
|
||||||||
| ViewVC Help | |
| Powered by ViewVC 1.0.0 |
