aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorTeravus Ovares2008-03-09 13:04:58 +0000
committerTeravus Ovares2008-03-09 13:04:58 +0000
commit7a9e572e8a49909d2fea52dcf298c07dfe2bb0e9 (patch)
tree053f2e8c0a7c14857554084336082049625e3142
parentUpdate svn properties. (diff)
downloadopensim-SC_OLD-7a9e572e8a49909d2fea52dcf298c07dfe2bb0e9.zip
opensim-SC_OLD-7a9e572e8a49909d2fea52dcf298c07dfe2bb0e9.tar.gz
opensim-SC_OLD-7a9e572e8a49909d2fea52dcf298c07dfe2bb0e9.tar.bz2
opensim-SC_OLD-7a9e572e8a49909d2fea52dcf298c07dfe2bb0e9.tar.xz
Linux Compile error if Color is compared against null. Documentation for System.Drawing.Color says it returns a Color with all Components as 0 if the String passed isn't a known color, so the null check has been commented out
-rw-r--r--OpenSim/Region/Environment/Modules/VectorRenderModule.cs11
1 files changed, 8 insertions, 3 deletions
diff --git a/OpenSim/Region/Environment/Modules/VectorRenderModule.cs b/OpenSim/Region/Environment/Modules/VectorRenderModule.cs
index 6b80eb1..19bcc88 100644
--- a/OpenSim/Region/Environment/Modules/VectorRenderModule.cs
+++ b/OpenSim/Region/Environment/Modules/VectorRenderModule.cs
@@ -229,12 +229,17 @@ namespace OpenSim.Region.Environment.Modules
229 { 229 {
230 nextLine = nextLine.Remove(0, 9); 230 nextLine = nextLine.Remove(0, 9);
231 nextLine = nextLine.Trim(); 231 nextLine = nextLine.Trim();
232
233 // Linux Compile error if Color is compared against null
234 // Documentation for System.Drawing.Color says it returns
235 // a Color with all Components as 0 if the String passed
236 // isn't a known color
232 Color newColour = Color.FromName(nextLine); 237 Color newColour = Color.FromName(nextLine);
233 if (newColour != null) 238 //if (newColour != null)
234 { 239 //{
235 myBrush.Color = newColour; 240 myBrush.Color = newColour;
236 drawPen.Color = newColour; 241 drawPen.Color = newColour;
237 } 242 //}
238 } 243 }
239 } 244 }
240 } 245 }