diff options
| author | Teravus Ovares | 2007-12-30 07:06:14 +0000 |
|---|---|---|
| committer | Teravus Ovares | 2007-12-30 07:06:14 +0000 |
| commit | d430bc62a9b07d3cf1d3294c301f9681467ef30c (patch) | |
| tree | 3bc5f783033caf358eea690ce7acce459b58b8a4 /OpenSim/Region/Environment/Scenes | |
| parent | * This update rolls back the packetpool and LibSL changes. Please retest and... (diff) | |
| download | opensim-SC-d430bc62a9b07d3cf1d3294c301f9681467ef30c.zip opensim-SC-d430bc62a9b07d3cf1d3294c301f9681467ef30c.tar.gz opensim-SC-d430bc62a9b07d3cf1d3294c301f9681467ef30c.tar.bz2 opensim-SC-d430bc62a9b07d3cf1d3294c301f9681467ef30c.tar.xz | |
* Patch from Alondria that re-fixes llSetColor
Diffstat (limited to 'OpenSim/Region/Environment/Scenes')
| -rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneObjectPart.cs | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs index d35cb76..e211b66 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs | |||
| @@ -1336,25 +1336,25 @@ namespace OpenSim.Region.Environment.Scenes | |||
| 1336 | // info | 1336 | // info |
| 1337 | public void UpdateTexture(LLObject.TextureEntry tex) | 1337 | public void UpdateTexture(LLObject.TextureEntry tex) |
| 1338 | { | 1338 | { |
| 1339 | LLColor tmpcolor; | 1339 | //LLColor tmpcolor; |
| 1340 | for (uint i = 0; i < 32; i++) | 1340 | //for (uint i = 0; i < 32; i++) |
| 1341 | { | 1341 | //{ |
| 1342 | if (tex.FaceTextures[i] != null) | 1342 | // if (tex.FaceTextures[i] != null) |
| 1343 | { | 1343 | // { |
| 1344 | tmpcolor = tex.GetFace((uint) i).RGBA; | 1344 | // tmpcolor = tex.GetFace((uint) i).RGBA; |
| 1345 | tmpcolor.A = tmpcolor.A*255; | 1345 | // tmpcolor.A = tmpcolor.A*255; |
| 1346 | tmpcolor.R = tmpcolor.R*255; | 1346 | // tmpcolor.R = tmpcolor.R*255; |
| 1347 | tmpcolor.G = tmpcolor.G*255; | 1347 | // tmpcolor.G = tmpcolor.G*255; |
| 1348 | tmpcolor.B = tmpcolor.B*255; | 1348 | // tmpcolor.B = tmpcolor.B*255; |
| 1349 | tex.FaceTextures[i].RGBA = tmpcolor; | 1349 | // tex.FaceTextures[i].RGBA = tmpcolor; |
| 1350 | } | 1350 | // } |
| 1351 | } | 1351 | //} |
| 1352 | tmpcolor = tex.DefaultTexture.RGBA; | 1352 | //tmpcolor = tex.DefaultTexture.RGBA; |
| 1353 | tmpcolor.A = tmpcolor.A*255; | 1353 | //tmpcolor.A = tmpcolor.A*255; |
| 1354 | tmpcolor.R = tmpcolor.R*255; | 1354 | //tmpcolor.R = tmpcolor.R*255; |
| 1355 | tmpcolor.G = tmpcolor.G*255; | 1355 | //tmpcolor.G = tmpcolor.G*255; |
| 1356 | tmpcolor.B = tmpcolor.B*255; | 1356 | //tmpcolor.B = tmpcolor.B*255; |
| 1357 | tex.DefaultTexture.RGBA = tmpcolor; | 1357 | //tex.DefaultTexture.RGBA = tmpcolor; |
| 1358 | UpdateTextureEntry(tex.ToBytes()); | 1358 | UpdateTextureEntry(tex.ToBytes()); |
| 1359 | } | 1359 | } |
| 1360 | 1360 | ||
| @@ -1735,4 +1735,4 @@ namespace OpenSim.Region.Environment.Scenes | |||
| 1735 | } | 1735 | } |
| 1736 | } | 1736 | } |
| 1737 | } | 1737 | } |
| 1738 | } \ No newline at end of file | 1738 | } |