Merge

1 files changed, 1 insertions, 2 deletions

diff --git a/indra/llinventory/llsettingssky.cpp b/indra/llinventory/llsettingssky.cpp
index 475b5fcf79..fc783f99e0 100644
--- a/indra/llinventory/llsettingssky.cpp
+++ b/indra/llinventory/llsettingssky.cpp
@@ -615,9 +615,8 @@ LLSD LLSettingsSky::defaults(const LLSettingsBase::TrackPosition& position)
 
         // give the sun and moon slightly different tracks through the sky
         // instead of positioning them at opposite poles from each other...
-        // but keep them on opposite sides of the sky.
         sunquat  = convert_azimuth_and_altitude_to_quat(altitude,                   azimuth);
-        moonquat = convert_azimuth_and_altitude_to_quat(-(altitude + (F_PI * 0.125f)), azimuth + (F_PI * 1.125f));
+        moonquat = convert_azimuth_and_altitude_to_quat(altitude + (F_PI * 0.125f), azimuth + (F_PI * 0.125f));
 
         // Magic constants copied form dfltsetting.xml 
         dfltsetting[SETTING_CLOUD_COLOR]        = LLColor4(0.4099, 0.4099, 0.4099, 0.0).getValue();