aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorHomer Horwitz2008-12-14 18:17:35 +0000
committerHomer Horwitz2008-12-14 18:17:35 +0000
commitef2c0d115a9c0419c29d26e7b5cb929004390678 (patch)
tree5b18a3f9760d644484479bc969fd35a89d3a2ce1 /OpenSim
parentRemove use of time dilation in llGetTimeOfDay, llGetTime and llGetAndResetTime. (diff)
downloadopensim-SC_OLD-ef2c0d115a9c0419c29d26e7b5cb929004390678.zip
opensim-SC_OLD-ef2c0d115a9c0419c29d26e7b5cb929004390678.tar.gz
opensim-SC_OLD-ef2c0d115a9c0419c29d26e7b5cb929004390678.tar.bz2
opensim-SC_OLD-ef2c0d115a9c0419c29d26e7b5cb929004390678.tar.xz
Color was set twice, first correctly, then incorrectly, in SQLiteRegionData.
Removed the second set. Fixes Mantis#2380.
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Data/SQLite/SQLiteRegionData.cs2
1 files changed, 0 insertions, 2 deletions
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
1187 Convert.ToSingle( 1187 Convert.ToSingle(
1188 row["SitTargetOrientW"])); 1188 row["SitTargetOrientW"]));
1189 1189
1190 prim.Color = Color.FromArgb(Convert.ToInt32(row["ColorR"]), Convert.ToInt32(row["ColorG"]), Convert.ToInt32(row["ColorB"]));
1191
1192 prim.ClickAction = Convert.ToByte(row["ClickAction"]); 1190 prim.ClickAction = Convert.ToByte(row["ClickAction"]);
1193 prim.PayPrice[0] = Convert.ToInt32(row["PayPrice"]); 1191 prim.PayPrice[0] = Convert.ToInt32(row["PayPrice"]);
1194 prim.PayPrice[1] = Convert.ToInt32(row["PayButton1"]); 1192 prim.PayPrice[1] = Convert.ToInt32(row["PayButton1"]);