From ef2c0d115a9c0419c29d26e7b5cb929004390678 Mon Sep 17 00:00:00 2001
From: Homer Horwitz
Date: Sun, 14 Dec 2008 18:17:35 +0000
Subject: Color was set twice, first correctly, then incorrectly, in
 SQLiteRegionData. Removed the second set. Fixes Mantis#2380.

---
 OpenSim/Data/SQLite/SQLiteRegionData.cs | 2 --
 1 file changed, 2 deletions(-)

(limited to 'OpenSim/Data/SQLite/SQLiteRegionData.cs')

diff --git a/OpenSim/Data/SQLite/SQLiteRegionData.cs b/OpenSim/Data/SQLite/SQLiteRegionData.cs
index cf6653a..78c57ed 100644
--- a/OpenSim/Data/SQLite/SQLiteRegionData.cs
+++ b/OpenSim/Data/SQLite/SQLiteRegionData.cs
@@ -1187,8 +1187,6 @@ namespace OpenSim.Data.SQLite
                                                          Convert.ToSingle(
                                                                           row["SitTargetOrientW"]));
 
-            prim.Color = Color.FromArgb(Convert.ToInt32(row["ColorR"]), Convert.ToInt32(row["ColorG"]), Convert.ToInt32(row["ColorB"]));
-
             prim.ClickAction = Convert.ToByte(row["ClickAction"]);
             prim.PayPrice[0] = Convert.ToInt32(row["PayPrice"]);
             prim.PayPrice[1] = Convert.ToInt32(row["PayButton1"]);
-- 
cgit v1.1