2 files changed, 8 insertions, 3 deletions

diff --git a/linden/indra/llcommon/indra_constants.h b/linden/indra/llcommon/indra_constants.h
index 279d280..b765d4d 100644
--- a/linden/indra/llcommon/indra_constants.h
+++ b/linden/indra/llcommon/indra_constants.h
@@ -153,6 +153,11 @@ const	char	WATER_LAYER_CODE				= 'W';
 const   char    WIND_LAYER_CODE                                 = '7';
 const   char    CLOUD_LAYER_CODE                                = '8';
 
+// Extended land layer for Aurora Sim
+const   char    AURORA_LAND_LAYER_CODE                  = 'M';
+const   char    AURORA_WIND_LAYER_CODE                  = '9';
+const   char    AURORA_CLOUD_LAYER_CODE                 = ':';
+
 // keys
 // Bit masks for various keyboard modifier keys.
 const MASK MASK_NONE =                  0x0000;
diff --git a/linden/indra/llcommon/lltimer.cpp b/linden/indra/llcommon/lltimer.cpp
index 2d283ec..b825c1e 100644
--- a/linden/indra/llcommon/lltimer.cpp
+++ b/linden/indra/llcommon/lltimer.cpp
@@ -529,14 +529,14 @@ struct tm* utc_to_offset_time(time_t utc_time, S32 offset, BOOL DST)
 {
         if (DST)
         {
-                //Subtract one then
-                offset--;
+                //Add one then
+                offset++;
         }
 
         // We subtract off the PST/PDT offset _before_ getting
         // "UTC" time, because this will handle wrapping around
         // for 5 AM UTC -> 10 PM PDT of the previous day.
-        utc_time -= offset * MIN_PER_HOUR * SEC_PER_MIN;
+        utc_time -= (-1 * offset) * MIN_PER_HOUR * SEC_PER_MIN;
  
         // Internal buffer to PST/PDT (see above)
         struct tm* internal_time = gmtime(&utc_time);