diff options
author | Teravus Ovares | 2008-06-14 20:33:03 +0000 |
---|---|---|
committer | Teravus Ovares | 2008-06-14 20:33:03 +0000 |
commit | 5cccd4f6e53789fe00d123af8d90a56871de2d8f (patch) | |
tree | ac7e71836605e0a6f5b39615241f51ae3d31ace5 /OpenSim/Region/Environment/Scenes | |
parent | * Fixes: 0001554: r5106 update fails to load on some regions with NullRef err... (diff) | |
download | opensim-SC-5cccd4f6e53789fe00d123af8d90a56871de2d8f.zip opensim-SC-5cccd4f6e53789fe00d123af8d90a56871de2d8f.tar.gz opensim-SC-5cccd4f6e53789fe00d123af8d90a56871de2d8f.tar.bz2 opensim-SC-5cccd4f6e53789fe00d123af8d90a56871de2d8f.tar.xz |
* Vintage 2, a good year.
Diffstat (limited to 'OpenSim/Region/Environment/Scenes')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.cs | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs index b6d8d0e..dcc92cc 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.cs | |||
@@ -1170,10 +1170,6 @@ namespace OpenSim.Region.Environment.Scenes | |||
1170 | // | 1170 | // |
1171 | try | 1171 | try |
1172 | { | 1172 | { |
1173 | LLColor texcolor = part.Shape.Textures.DefaultTexture.RGBA; | ||
1174 | |||
1175 | // Not sure why some of these are null, oh well. | ||
1176 | |||
1177 | if (part == null) | 1173 | if (part == null) |
1178 | continue; | 1174 | continue; |
1179 | 1175 | ||
@@ -1186,6 +1182,12 @@ namespace OpenSim.Region.Environment.Scenes | |||
1186 | if (part.Shape.Textures.DefaultTexture == null) | 1182 | if (part.Shape.Textures.DefaultTexture == null) |
1187 | continue; | 1183 | continue; |
1188 | 1184 | ||
1185 | LLColor texcolor = part.Shape.Textures.DefaultTexture.RGBA; | ||
1186 | |||
1187 | // Not sure why some of these are null, oh well. | ||
1188 | |||
1189 | |||
1190 | |||
1189 | 1191 | ||
1190 | 1192 | ||
1191 | int colorr = 255 - (int)(texcolor.R * 255f); | 1193 | int colorr = 255 - (int)(texcolor.R * 255f); |