diff --git a/indra/CMakeLists.txt b/indra/CMakeLists.txt
index 3b1c1e467..11d3f7ab7 100644
--- a/indra/CMakeLists.txt
+++ b/indra/CMakeLists.txt
@@ -30,6 +30,8 @@ include(Versions)
include(UnixInstall)
+set (GCC_DISABLE_FATAL_WARNINGS TRUE)
+
if (NOT CMAKE_CONFIGURATION_TYPES AND NOT CMAKE_BUILD_TYPE)
set(CMAKE_BUILD_TYPE ReleaseSSE2 CACHE STRING
"Build type. One of: Debug Release ReleaseSSE2 RelWithDebInfo" FORCE)
diff --git a/indra/lscript/lscript_library/lscript_library.cpp b/indra/lscript/lscript_library/lscript_library.cpp
index ffbb91340..919fb758c 100644
--- a/indra/lscript/lscript_library/lscript_library.cpp
+++ b/indra/lscript/lscript_library/lscript_library.cpp
@@ -462,29 +462,35 @@ void LLScriptLibrary::init()
addFunction(10.f, 0.f, dummy_func, "llGetLinkNumberOfSides", "i", "i");
// IDEVO Name lookup calls, see lscript_avatar_names.h
- addFunction(10.f, 0.f, dummy_func, "llGetUsername", "s", "k");
- addFunction(10.f, 0.f, dummy_func, "llRequestUsername", "k", "k");
- addFunction(10.f, 0.f, dummy_func, "llGetDisplayName", "s", "k");
+ addFunction(10.f, 0.f, dummy_func, "llGetUsername", "s", "k");
+ addFunction(10.f, 0.f, dummy_func, "llRequestUsername", "k", "k");
+ addFunction(10.f, 0.f, dummy_func, "llGetDisplayName", "s", "k");
addFunction(10.f, 0.f, dummy_func, "llRequestDisplayName", "k", "k");
-
addFunction(10.f, 0.f, dummy_func, "llGetEnv", "s", "s");
addFunction(10.f, 0.f, dummy_func, "llRegionSayTo", NULL, "kis");
// Adding missing (more recent) LSL functions.
- addFunction(10.f, 0.f, dummy_func, "llCastRay", "l", "vvl");
- addFunction(10.f, 0.f, dummy_func, "llGetSPMaxMemory", "i", NULL);
- addFunction(10.f, 0.f, dummy_func, "llGetUsedMemory", "i", NULL);
- addFunction(10.f, 0.f, dummy_func, "llGodLikeRezObject", NULL, "kv");
- addFunction(10.f, 0.f, dummy_func, "llScriptProfiler", NULL, "i");
- addFunction(10.f, 0.f, dummy_func, "llSetInventoryPermMask", NULL, "sii");
- addFunction(10.f, 0.f, dummy_func, "llSetObjectPermMask", NULL, "ii");
-
- // energy, sleep, dummy_func, name, return type, parameters, help text, gods-only
-
- // IF YOU ADD NEW SCRIPT CALLS, YOU MUST PUT THEM AT THE END OF THIS LIST.
- // Otherwise the bytecode numbers for each call will be wrong, and all
- // existing scripts will crash.
+ addFunction(10.f, 0.f, dummy_func, "llCastRay", "l", "vvl");
+ addFunction(10.f, 0.f, dummy_func, "llGetSPMaxMemory", "i", NULL);
+ addFunction(10.f, 0.f, dummy_func, "llGetUsedMemory", "i", NULL);
+ addFunction(10.f, 0.f, dummy_func, "llGodLikeRezObject", NULL, "kv");
+ addFunction(10.f, 0.f, dummy_func, "llScriptProfiler", NULL, "i");
+ addFunction(10.f, 0.f, dummy_func, "llSetInventoryPermMask", NULL, "sii");
+ addFunction(10.f, 0.f, dummy_func, "llSetObjectPermMask", NULL, "ii");
+ // Even more recent
+ addFunction(10.f, 0.f, dummy_func, "llSetMemoryLimit", "i", "i");
+ addFunction(10.f, 0.f, dummy_func, "llSetLinkMedia", "i", "iil");
+ addFunction(10.f, 0.f, dummy_func, "llGetLinkMedia", "l", "iil");
+ addFunction(10.f, 0.f, dummy_func, "llClearLinkMedia", "i", "ii");
+ addFunction(10.f, 0.f, dummy_func, "llSetLinkCamera", NULL, "ivv");
+ addFunction(10.f, 0.f, dummy_func, "llSetContentType", NULL, "ki");
+ addFunction(10.f, 0.f, dummy_func, "llLinkSitTarget", NULL, "ivr");
+ addFunction(10.f, 0.f, dummy_func, "llAvatarOnLinkSitTarget", "k", "i");
+ /* No info on these new functions yet....
+ * addFunction(10.f, 0.f, dummy_func, "llSetVelocity", "", "");
+ * addFunction(10.f, 0.f, dummy_func, "llSetRotationalVelocity", "", "");
+ */
// REGARDING OSSL FUNCTIONS
// These additions should be posted underneath the llFunctions
@@ -496,6 +502,8 @@ void LLScriptLibrary::init()
// OSSL corrections and syntax additions added + set in same order as found in OSSL_stub.cs of OpenSim Source (Updated PM October-21-2010
// based on OpenSimulator Ver. 0.7.x DEV/Master Git # a7acb650d400a280a7b9edabd304376dff9c81af - a7acb65-r/14142
// Updates by WhiteStar Magic
+
+ // It should be noted though, that the order of OSSL functions is not important for correct functionality.
addFunction(10.f, 0.f, dummy_func, "osSetRegionWaterHeight", NULL, "f");
addFunction(10.f, 0.f, dummy_func, "osSetRegionSunSettings", NULL, "iif");
@@ -583,12 +591,15 @@ void LLScriptLibrary::init()
addFunction(10.f, 0.f, dummy_func, "osUnixTimeToTimestamp", "s", "i");
addFunction(10.f, 0.f, dummy_func, "osSetPenColor", NULL, "ss");
addFunction(10.f, 0.f, dummy_func, "osGetSunParam","f", "s");
- addFunction(10.f, 0.f, dummy_func, "osSetSunParam", "sf", NULL);
+ addFunction(10.f, 0.f, dummy_func, "osSetSunParam", NULL, "sf");
addFunction(10.f, 0.f, dummy_func, "osSetParcelDetails", NULL, "vl");
addFunction(10.f, 0.f, dummy_func, "osGetTerrainHeight", "f", "ii");
addFunction(10.f, 0.f, dummy_func, "osSetTerrainHeight", NULL, "iif");
addFunction(10.f, 0.f, dummy_func, "osGetAvatarList", "l", NULL);
addFunction(10.f, 0.f, dummy_func, "osTeleportOwner", NULL, "svv");
+ addFunction(10.f, 0.f, dummy_func, "osGetWindParam","f", "ss");
+ addFunction(10.f, 0.f, dummy_func, "osSetWindParam", NULL, "ssf");
+
// LightShare functions
addFunction(10.f, 0.f, dummy_func, "cmSetWindlightScene", "i", "l");
@@ -599,6 +610,20 @@ void LLScriptLibrary::init()
addFunction(10.f, 0.f, dummy_func, "lsSetWindlightScene", "i", "l");
addFunction(10.f, 0.f, dummy_func, "lsSetWindlightSceneTargeted", "i", "lk");
addFunction(10.f, 0.f, dummy_func, "lsGetWindlightScene", "l", "l");
+
+ // New OSSL functions 08-10-2011
+ addFunction(10.f, 0.f, dummy_func, "osNpcSaveAppearance", "k", "ks");
+ addFunction(10.f, 0.f, dummy_func, "osNpcLoadAppearance", NULL, "ks");
+ addFunction(10.f, 0.f, dummy_func, "osNpcMoveToTarget", NULL, "kvi");
+ addFunction(10.f, 0.f, dummy_func, "osOwnerSaveAppearance", "k", "s");
+
+ // More new stuffs
+ addFunction(10.f, 0.f, dummy_func, "osNpcGetRot", "r", "k");
+ addFunction(10.f, 0.f, dummy_func, "osNpcSetRot", NULL, "kr");
+ addFunction(10.f, 0.f, dummy_func, "osAgentSaveAppearance", "k", "ks");
+ addFunction(10.f, 0.f, dummy_func, "osNpcGetPos", "v", "k");
+ addFunction(10.f, 0.f, dummy_func, "osNpcStopMoveToTarget", NULL, "k");
+
}
LLScriptLibraryFunction::LLScriptLibraryFunction(F32 eu, F32 st, void (*exec_func)(LLScriptLibData *, LLScriptLibData *, const LLUUID &), const char *name, const char *ret_type, const char *args, BOOL god_only)
diff --git a/indra/newview/app_settings/windlight/days/Colder%20Tones.xml b/indra/newview/app_settings/windlight/days/Colder%20Tones.xml
new file mode 100644
index 000000000..63d0b099e
--- /dev/null
+++ b/indra/newview/app_settings/windlight/days/Colder%20Tones.xml
@@ -0,0 +1,28 @@
+
+
+
+ 0
+ Midnight
+
+
+ 0.24999989569187164
+ Purple
+
+
+ 0.49999979138374329
+ Blue Midday
+
+
+ 0.74999970197677612
+ Blizzard
+
+
+ 0.87499958276748657
+ Ghost
+
+
+ 0.99999958276748657
+ Midnight
+
+
+
diff --git a/indra/newview/app_settings/windlight/days/Dynamic%20Richness.xml b/indra/newview/app_settings/windlight/days/Dynamic%20Richness.xml
new file mode 100644
index 000000000..f75b52e6e
--- /dev/null
+++ b/indra/newview/app_settings/windlight/days/Dynamic%20Richness.xml
@@ -0,0 +1,32 @@
+
+
+
+ 0
+ Night
+
+
+ 0.12499994784593582
+ Blizzard
+
+
+ 0.24999989569187164
+ Sunrise
+
+
+ 0.49999979138374329
+ Midday 3
+
+
+ 0.68749970197677612
+ Pirate
+
+
+ 0.81249970197677612
+ Coastal Sunset
+
+
+ 0.99999958276748657
+ Midnight
+
+
+
diff --git a/indra/newview/app_settings/windlight/days/Pirate%27s%20Dream.xml b/indra/newview/app_settings/windlight/days/Pirate%27s%20Dream.xml
new file mode 100644
index 000000000..6dc1ba9f4
--- /dev/null
+++ b/indra/newview/app_settings/windlight/days/Pirate%27s%20Dream.xml
@@ -0,0 +1,44 @@
+
+
+
+ 0
+ A-12AM
+
+
+ 0.12499994784593582
+ A-3AM
+
+
+ 0.22222213447093964
+ Barcelona
+
+
+ 0.30208322405815125
+ Sunrise
+
+
+ 0.37499985098838806
+ Sailor's Delight
+
+
+ 0.53819423913955688
+ Coastal Afternoon
+
+
+ 0.63194417953491211
+ Pirate
+
+
+ 0.7048608660697937
+ Desert Sunset
+
+
+ 0.74999970197677612
+ Coastal Sunset
+
+
+ 0.87499958276748657
+ Blizzard
+
+
+
diff --git a/indra/newview/app_settings/windlight/days/Psycho%20Strobe%21.xml b/indra/newview/app_settings/windlight/days/Psycho%20Strobe%21.xml
new file mode 100644
index 000000000..302af5a9b
--- /dev/null
+++ b/indra/newview/app_settings/windlight/days/Psycho%20Strobe%21.xml
@@ -0,0 +1,72 @@
+
+
+
+ 0
+ Sheer Surreality
+
+
+ 0.062499973922967911
+ A-12AM
+
+
+ 0.12499994784593582
+ Sheer Surreality
+
+
+ 0.18749992549419403
+ A-3AM
+
+
+ 0.24999989569187164
+ Sheer Surreality
+
+
+ 0.31249985098838806
+ A-6AM
+
+
+ 0.37499985098838806
+ Sheer Surreality
+
+
+ 0.43749979138374329
+ A-9AM
+
+
+ 0.49999979138374329
+ Sheer Surreality
+
+
+ 0.5624997615814209
+ A-12PM
+
+
+ 0.62499970197677612
+ Sheer Surreality
+
+
+ 0.68749970197677612
+ A-3PM
+
+
+ 0.74999970197677612
+ Sheer Surreality
+
+
+ 0.81249970197677612
+ A-6PM
+
+
+ 0.87499958276748657
+ Sheer Surreality
+
+
+ 0.93749958276748657
+ A-9PM
+
+
+ 0.99999958276748657
+ Sheer Surreality
+
+
+
diff --git a/indra/newview/app_settings/windlight/days/Tropicalia.xml b/indra/newview/app_settings/windlight/days/Tropicalia.xml
new file mode 100644
index 000000000..89a56d4a1
--- /dev/null
+++ b/indra/newview/app_settings/windlight/days/Tropicalia.xml
@@ -0,0 +1,32 @@
+
+
+
+ 0.062499973922967911
+ Purple
+
+
+ 0.16666659712791443
+ Funky Funky
+
+
+ 0.31249985098838806
+ Sunrise
+
+
+ 0.49999979138374329
+ Fine Day
+
+
+ 0.66666638851165771
+ Desert Sunset
+
+
+ 0.74999970197677612
+ Sailor's Delight
+
+
+ 0.95833295583724976
+ Midnight
+
+
+
diff --git a/indra/newview/app_settings/windlight/days/Weird-O.xml b/indra/newview/app_settings/windlight/days/Weird-O.xml
new file mode 100644
index 000000000..1e312f246
--- /dev/null
+++ b/indra/newview/app_settings/windlight/days/Weird-O.xml
@@ -0,0 +1,56 @@
+
+
+
+ 0
+ Funky Funky
+
+
+ 0.13194438815116882
+ Funky Funky Funky
+
+
+ 0.26041656732559204
+ Gelatto
+
+
+ 0.40624985098838806
+ Funky Funky Funky
+
+
+ 0.43749979138374329
+ Ghost
+
+
+ 0.46874979138374329
+ Gelatto
+
+
+ 0.5486108660697937
+ Sheer Surreality
+
+
+ 0.6076386570930481
+ Gelatto
+
+
+ 0.68055528402328491
+ Ghost
+
+
+ 0.75694411993026733
+ Sheer Surreality
+
+
+ 0.87847185134887695
+ Gelatto
+
+
+ 0.91319411993026733
+ Funky Funky Funky
+
+
+ 0.96527737379074097
+ Funky Funky Funky
+
+
+
diff --git a/indra/newview/app_settings/windlight/skies/B5%2DShadowDancing.xml b/indra/newview/app_settings/windlight/skies/B5%2DShadowDancing.xml
new file mode 100644
index 000000000..a1a8f026d
--- /dev/null
+++ b/indra/newview/app_settings/windlight/skies/B5%2DShadowDancing.xml
@@ -0,0 +1,141 @@
+
+
+
diff --git a/indra/newview/app_settings/windlight/skies/Bryn%20Oh%27s%20Annas%20Many%20Murders.xml b/indra/newview/app_settings/windlight/skies/Bryn%20Oh%27s%20Annas%20Many%20Murders.xml
new file mode 100644
index 000000000..f585ddb6d
--- /dev/null
+++ b/indra/newview/app_settings/windlight/skies/Bryn%20Oh%27s%20Annas%20Many%20Murders.xml
@@ -0,0 +1,141 @@
+
+
+
diff --git a/indra/newview/app_settings/windlight/skies/Bryn%20Oh%27s%20BLUNIVERSE.xml b/indra/newview/app_settings/windlight/skies/Bryn%20Oh%27s%20BLUNIVERSE.xml
new file mode 100644
index 000000000..8c2082e43
--- /dev/null
+++ b/indra/newview/app_settings/windlight/skies/Bryn%20Oh%27s%20BLUNIVERSE.xml
@@ -0,0 +1,141 @@
+
+
+
diff --git a/indra/newview/app_settings/windlight/skies/Bryn%20Oh%27s%20Immersiva%20Grey%20Dust.xml b/indra/newview/app_settings/windlight/skies/Bryn%20Oh%27s%20Immersiva%20Grey%20Dust.xml
new file mode 100644
index 000000000..2a07b39d0
--- /dev/null
+++ b/indra/newview/app_settings/windlight/skies/Bryn%20Oh%27s%20Immersiva%20Grey%20Dust.xml
@@ -0,0 +1,141 @@
+
+
+
diff --git a/indra/newview/app_settings/windlight/skies/Bryn%20Oh%27s%20Mayfly.xml b/indra/newview/app_settings/windlight/skies/Bryn%20Oh%27s%20Mayfly.xml
new file mode 100644
index 000000000..272d1e041
--- /dev/null
+++ b/indra/newview/app_settings/windlight/skies/Bryn%20Oh%27s%20Mayfly.xml
@@ -0,0 +1,141 @@
+
+
+
diff --git a/indra/newview/app_settings/windlight/skies/Fairy%20blue%20%28Paulina%29.xml b/indra/newview/app_settings/windlight/skies/Fairy%20blue%20%28Paulina%29.xml
new file mode 100644
index 000000000..a426aac29
--- /dev/null
+++ b/indra/newview/app_settings/windlight/skies/Fairy%20blue%20%28Paulina%29.xml
@@ -0,0 +1,141 @@
+
+
+
diff --git a/indra/newview/app_settings/windlight/skies/Fairy%20dark%20blue%20%28Paulina%29.xml b/indra/newview/app_settings/windlight/skies/Fairy%20dark%20blue%20%28Paulina%29.xml
new file mode 100644
index 000000000..4fbdfe121
--- /dev/null
+++ b/indra/newview/app_settings/windlight/skies/Fairy%20dark%20blue%20%28Paulina%29.xml
@@ -0,0 +1,141 @@
+
+
+
diff --git a/indra/newview/app_settings/windlight/skies/Fairy%20light%20pink%20%28Paulina%29.xml b/indra/newview/app_settings/windlight/skies/Fairy%20light%20pink%20%28Paulina%29.xml
new file mode 100644
index 000000000..a3d67ac73
--- /dev/null
+++ b/indra/newview/app_settings/windlight/skies/Fairy%20light%20pink%20%28Paulina%29.xml
@@ -0,0 +1,141 @@
+
+
+
diff --git a/indra/newview/app_settings/windlight/skies/Fairy%20warm%20pinks%20%28Paulina%29.xml b/indra/newview/app_settings/windlight/skies/Fairy%20warm%20pinks%20%28Paulina%29.xml
new file mode 100644
index 000000000..72d3345c4
--- /dev/null
+++ b/indra/newview/app_settings/windlight/skies/Fairy%20warm%20pinks%20%28Paulina%29.xml
@@ -0,0 +1,141 @@
+
+
+
diff --git a/indra/newview/app_settings/windlight/skies/Midday.xml b/indra/newview/app_settings/windlight/skies/Midday.xml
new file mode 100644
index 000000000..119b3e141
--- /dev/null
+++ b/indra/newview/app_settings/windlight/skies/Midday.xml
@@ -0,0 +1,141 @@
+
+
+
diff --git a/indra/newview/app_settings/windlight/skies/Midnight.xml b/indra/newview/app_settings/windlight/skies/Midnight.xml
new file mode 100644
index 000000000..0aba31214
--- /dev/null
+++ b/indra/newview/app_settings/windlight/skies/Midnight.xml
@@ -0,0 +1,141 @@
+
+
+
diff --git a/indra/newview/app_settings/windlight/skies/Orac%20%2D%20Black%20fog%201.xml b/indra/newview/app_settings/windlight/skies/Orac%20%2D%20Black%20fog%201.xml
new file mode 100644
index 000000000..4dee8354e
--- /dev/null
+++ b/indra/newview/app_settings/windlight/skies/Orac%20%2D%20Black%20fog%201.xml
@@ -0,0 +1,141 @@
+
+
+
diff --git a/indra/newview/app_settings/windlight/skies/Orac%20%2D%20Black%20fog%202.xml b/indra/newview/app_settings/windlight/skies/Orac%20%2D%20Black%20fog%202.xml
new file mode 100644
index 000000000..ef93fdc08
--- /dev/null
+++ b/indra/newview/app_settings/windlight/skies/Orac%20%2D%20Black%20fog%202.xml
@@ -0,0 +1,141 @@
+
+
+
diff --git a/indra/newview/app_settings/windlight/skies/Orac%20%2D%20Drawing%20blue.xml b/indra/newview/app_settings/windlight/skies/Orac%20%2D%20Drawing%20blue.xml
new file mode 100644
index 000000000..69a23e7f9
--- /dev/null
+++ b/indra/newview/app_settings/windlight/skies/Orac%20%2D%20Drawing%20blue.xml
@@ -0,0 +1,141 @@
+
+
+
diff --git a/indra/newview/app_settings/windlight/skies/Orac%20%2D%20Drawing%20extreme.xml b/indra/newview/app_settings/windlight/skies/Orac%20%2D%20Drawing%20extreme.xml
new file mode 100644
index 000000000..09d9c3546
--- /dev/null
+++ b/indra/newview/app_settings/windlight/skies/Orac%20%2D%20Drawing%20extreme.xml
@@ -0,0 +1,141 @@
+
+
+
diff --git a/indra/newview/app_settings/windlight/skies/Orac%20%2D%20Drawing%20green.xml b/indra/newview/app_settings/windlight/skies/Orac%20%2D%20Drawing%20green.xml
new file mode 100644
index 000000000..9343abe71
--- /dev/null
+++ b/indra/newview/app_settings/windlight/skies/Orac%20%2D%20Drawing%20green.xml
@@ -0,0 +1,141 @@
+
+
+
diff --git a/indra/newview/app_settings/windlight/skies/Orac%20%2D%20Drawing%20red.xml b/indra/newview/app_settings/windlight/skies/Orac%20%2D%20Drawing%20red.xml
new file mode 100644
index 000000000..0ce00b1e8
--- /dev/null
+++ b/indra/newview/app_settings/windlight/skies/Orac%20%2D%20Drawing%20red.xml
@@ -0,0 +1,141 @@
+
+
+
diff --git a/indra/newview/app_settings/windlight/skies/Orac%20%2D%20Drawing%20underground%20comic.xml b/indra/newview/app_settings/windlight/skies/Orac%20%2D%20Drawing%20underground%20comic.xml
new file mode 100644
index 000000000..62ebaa233
--- /dev/null
+++ b/indra/newview/app_settings/windlight/skies/Orac%20%2D%20Drawing%20underground%20comic.xml
@@ -0,0 +1,141 @@
+
+
+
diff --git a/indra/newview/app_settings/windlight/skies/Orac%20%2D%20fog.xml b/indra/newview/app_settings/windlight/skies/Orac%20%2D%20fog.xml
new file mode 100644
index 000000000..088f09cbb
--- /dev/null
+++ b/indra/newview/app_settings/windlight/skies/Orac%20%2D%20fog.xml
@@ -0,0 +1,141 @@
+
+
+
diff --git a/indra/newview/app_settings/windlight/skies/Orac%20%2D%20gray.xml b/indra/newview/app_settings/windlight/skies/Orac%20%2D%20gray.xml
new file mode 100644
index 000000000..fbbf36485
--- /dev/null
+++ b/indra/newview/app_settings/windlight/skies/Orac%20%2D%20gray.xml
@@ -0,0 +1,141 @@
+
+
+
diff --git a/indra/newview/app_settings/windlight/skies/Orac%20%2D%20green.xml b/indra/newview/app_settings/windlight/skies/Orac%20%2D%20green.xml
new file mode 100644
index 000000000..8c5e8f119
--- /dev/null
+++ b/indra/newview/app_settings/windlight/skies/Orac%20%2D%20green.xml
@@ -0,0 +1,141 @@
+
+
+
diff --git a/indra/newview/app_settings/windlight/skies/Orange%20Incubus.xml b/indra/newview/app_settings/windlight/skies/Orange%20Incubus.xml
new file mode 100644
index 000000000..6ab92ce6f
--- /dev/null
+++ b/indra/newview/app_settings/windlight/skies/Orange%20Incubus.xml
@@ -0,0 +1,142 @@
+
+
+
+
diff --git a/indra/newview/app_settings/windlight/skies/PaperSnow.xml b/indra/newview/app_settings/windlight/skies/PaperSnow.xml
new file mode 100644
index 000000000..a34ac8df6
--- /dev/null
+++ b/indra/newview/app_settings/windlight/skies/PaperSnow.xml
@@ -0,0 +1,141 @@
+
+
+
diff --git a/indra/newview/app_settings/windlight/skies/Places%20Abracadabra.xml b/indra/newview/app_settings/windlight/skies/Places%20Abracadabra.xml
new file mode 100644
index 000000000..21e73f0a4
--- /dev/null
+++ b/indra/newview/app_settings/windlight/skies/Places%20Abracadabra.xml
@@ -0,0 +1,141 @@
+
+
+
diff --git a/indra/newview/app_settings/windlight/skies/Places%20Abracadabra2.xml b/indra/newview/app_settings/windlight/skies/Places%20Abracadabra2.xml
new file mode 100644
index 000000000..55158516c
--- /dev/null
+++ b/indra/newview/app_settings/windlight/skies/Places%20Abracadabra2.xml
@@ -0,0 +1,141 @@
+
+
+
diff --git a/indra/newview/app_settings/windlight/skies/Places%20Abracadabra3.xml b/indra/newview/app_settings/windlight/skies/Places%20Abracadabra3.xml
new file mode 100644
index 000000000..9b5388ab6
--- /dev/null
+++ b/indra/newview/app_settings/windlight/skies/Places%20Abracadabra3.xml
@@ -0,0 +1,141 @@
+
+
+
diff --git a/indra/newview/app_settings/windlight/skies/Places%20Annamaria.xml b/indra/newview/app_settings/windlight/skies/Places%20Annamaria.xml
new file mode 100644
index 000000000..15876975d
--- /dev/null
+++ b/indra/newview/app_settings/windlight/skies/Places%20Annamaria.xml
@@ -0,0 +1,141 @@
+
+
+
diff --git a/indra/newview/app_settings/windlight/skies/Places%20Astryls%20Wild.xml b/indra/newview/app_settings/windlight/skies/Places%20Astryls%20Wild.xml
new file mode 100644
index 000000000..c9783190b
--- /dev/null
+++ b/indra/newview/app_settings/windlight/skies/Places%20Astryls%20Wild.xml
@@ -0,0 +1,141 @@
+
+
+
diff --git a/indra/newview/app_settings/windlight/skies/Places%20Babbage.xml b/indra/newview/app_settings/windlight/skies/Places%20Babbage.xml
new file mode 100644
index 000000000..a7176d14e
--- /dev/null
+++ b/indra/newview/app_settings/windlight/skies/Places%20Babbage.xml
@@ -0,0 +1,141 @@
+
+
+
diff --git a/indra/newview/app_settings/windlight/skies/Places%20Beach%20Cay%20Surreal.xml b/indra/newview/app_settings/windlight/skies/Places%20Beach%20Cay%20Surreal.xml
new file mode 100644
index 000000000..1b06037ae
--- /dev/null
+++ b/indra/newview/app_settings/windlight/skies/Places%20Beach%20Cay%20Surreal.xml
@@ -0,0 +1,141 @@
+
+
+
diff --git a/indra/newview/app_settings/windlight/skies/Places%20Beach%20Cay.xml b/indra/newview/app_settings/windlight/skies/Places%20Beach%20Cay.xml
new file mode 100644
index 000000000..d4fa195fe
--- /dev/null
+++ b/indra/newview/app_settings/windlight/skies/Places%20Beach%20Cay.xml
@@ -0,0 +1,141 @@
+
+
+
diff --git a/indra/newview/app_settings/windlight/skies/Places%20Bentham.xml b/indra/newview/app_settings/windlight/skies/Places%20Bentham.xml
new file mode 100644
index 000000000..db35e04ec
--- /dev/null
+++ b/indra/newview/app_settings/windlight/skies/Places%20Bentham.xml
@@ -0,0 +1,141 @@
+
+
+
diff --git a/indra/newview/app_settings/windlight/skies/Places%20Cornfield.xml b/indra/newview/app_settings/windlight/skies/Places%20Cornfield.xml
new file mode 100644
index 000000000..77416688e
--- /dev/null
+++ b/indra/newview/app_settings/windlight/skies/Places%20Cornfield.xml
@@ -0,0 +1,141 @@
+
+
+
diff --git a/indra/newview/app_settings/windlight/skies/Places%20Cromac.xml b/indra/newview/app_settings/windlight/skies/Places%20Cromac.xml
new file mode 100644
index 000000000..efec78721
--- /dev/null
+++ b/indra/newview/app_settings/windlight/skies/Places%20Cromac.xml
@@ -0,0 +1,141 @@
+
+
+
diff --git a/indra/newview/app_settings/windlight/skies/Places%20Crucible.xml b/indra/newview/app_settings/windlight/skies/Places%20Crucible.xml
new file mode 100644
index 000000000..08c15adf0
--- /dev/null
+++ b/indra/newview/app_settings/windlight/skies/Places%20Crucible.xml
@@ -0,0 +1,141 @@
+
+
+
diff --git a/indra/newview/app_settings/windlight/skies/Places%20District8.xml b/indra/newview/app_settings/windlight/skies/Places%20District8.xml
new file mode 100644
index 000000000..0ef69a361
--- /dev/null
+++ b/indra/newview/app_settings/windlight/skies/Places%20District8.xml
@@ -0,0 +1,141 @@
+
+
+
diff --git a/indra/newview/app_settings/windlight/skies/Places%20Duskwood.xml b/indra/newview/app_settings/windlight/skies/Places%20Duskwood.xml
new file mode 100644
index 000000000..2389e9660
--- /dev/null
+++ b/indra/newview/app_settings/windlight/skies/Places%20Duskwood.xml
@@ -0,0 +1,141 @@
+
+
+
diff --git a/indra/newview/app_settings/windlight/skies/Places%20Eridu.xml b/indra/newview/app_settings/windlight/skies/Places%20Eridu.xml
new file mode 100644
index 000000000..d93310016
--- /dev/null
+++ b/indra/newview/app_settings/windlight/skies/Places%20Eridu.xml
@@ -0,0 +1,141 @@
+
+
+
diff --git a/indra/newview/app_settings/windlight/skies/Places%20Erie.xml b/indra/newview/app_settings/windlight/skies/Places%20Erie.xml
new file mode 100644
index 000000000..7be0e3ffd
--- /dev/null
+++ b/indra/newview/app_settings/windlight/skies/Places%20Erie.xml
@@ -0,0 +1,141 @@
+
+
+
diff --git a/indra/newview/app_settings/windlight/skies/Places%20Eugene%202.xml b/indra/newview/app_settings/windlight/skies/Places%20Eugene%202.xml
new file mode 100644
index 000000000..85a0a2d93
--- /dev/null
+++ b/indra/newview/app_settings/windlight/skies/Places%20Eugene%202.xml
@@ -0,0 +1,141 @@
+
+
+
diff --git a/indra/newview/app_settings/windlight/skies/Places%20Eugene%20BL.xml b/indra/newview/app_settings/windlight/skies/Places%20Eugene%20BL.xml
new file mode 100644
index 000000000..2402f44d0
--- /dev/null
+++ b/indra/newview/app_settings/windlight/skies/Places%20Eugene%20BL.xml
@@ -0,0 +1,141 @@
+
+
+
diff --git a/indra/newview/app_settings/windlight/skies/Places%20Greed.xml b/indra/newview/app_settings/windlight/skies/Places%20Greed.xml
new file mode 100644
index 000000000..268716b94
--- /dev/null
+++ b/indra/newview/app_settings/windlight/skies/Places%20Greed.xml
@@ -0,0 +1,141 @@
+
+
+
diff --git a/indra/newview/app_settings/windlight/skies/Places%20Greed2.xml b/indra/newview/app_settings/windlight/skies/Places%20Greed2.xml
new file mode 100644
index 000000000..ec5282f7e
--- /dev/null
+++ b/indra/newview/app_settings/windlight/skies/Places%20Greed2.xml
@@ -0,0 +1,141 @@
+
+
+
diff --git a/indra/newview/app_settings/windlight/skies/Places%20Imagine.xml b/indra/newview/app_settings/windlight/skies/Places%20Imagine.xml
new file mode 100644
index 000000000..48fba1e31
--- /dev/null
+++ b/indra/newview/app_settings/windlight/skies/Places%20Imagine.xml
@@ -0,0 +1,141 @@
+
+
+
diff --git a/indra/newview/app_settings/windlight/skies/Places%20Kingsport.xml b/indra/newview/app_settings/windlight/skies/Places%20Kingsport.xml
new file mode 100644
index 000000000..dfaf68596
--- /dev/null
+++ b/indra/newview/app_settings/windlight/skies/Places%20Kingsport.xml
@@ -0,0 +1,141 @@
+
+
+
diff --git a/indra/newview/app_settings/windlight/skies/Places%20Kunming.xml b/indra/newview/app_settings/windlight/skies/Places%20Kunming.xml
new file mode 100644
index 000000000..e641bebcc
--- /dev/null
+++ b/indra/newview/app_settings/windlight/skies/Places%20Kunming.xml
@@ -0,0 +1,141 @@
+
+
+
diff --git a/indra/newview/app_settings/windlight/skies/Places%20Las%20Legunas.xml b/indra/newview/app_settings/windlight/skies/Places%20Las%20Legunas.xml
new file mode 100644
index 000000000..4121f8fa6
--- /dev/null
+++ b/indra/newview/app_settings/windlight/skies/Places%20Las%20Legunas.xml
@@ -0,0 +1,141 @@
+
+
+
diff --git a/indra/newview/app_settings/windlight/skies/Places%20Legacies.xml b/indra/newview/app_settings/windlight/skies/Places%20Legacies.xml
new file mode 100644
index 000000000..a8284bb2a
--- /dev/null
+++ b/indra/newview/app_settings/windlight/skies/Places%20Legacies.xml
@@ -0,0 +1,141 @@
+
+
+
diff --git a/indra/newview/app_settings/windlight/skies/Places%20Midian.xml b/indra/newview/app_settings/windlight/skies/Places%20Midian.xml
new file mode 100644
index 000000000..40a34a4a9
--- /dev/null
+++ b/indra/newview/app_settings/windlight/skies/Places%20Midian.xml
@@ -0,0 +1,141 @@
+
+
+
diff --git a/indra/newview/app_settings/windlight/skies/Places%20Mother.xml b/indra/newview/app_settings/windlight/skies/Places%20Mother.xml
new file mode 100644
index 000000000..753cf0706
--- /dev/null
+++ b/indra/newview/app_settings/windlight/skies/Places%20Mother.xml
@@ -0,0 +1,141 @@
+
+
+
diff --git a/indra/newview/app_settings/windlight/skies/Places%20Old%20New%20York.xml b/indra/newview/app_settings/windlight/skies/Places%20Old%20New%20York.xml
new file mode 100644
index 000000000..df356084b
--- /dev/null
+++ b/indra/newview/app_settings/windlight/skies/Places%20Old%20New%20York.xml
@@ -0,0 +1,141 @@
+
+
+
diff --git a/indra/newview/app_settings/windlight/skies/Places%20Paris%202.xml b/indra/newview/app_settings/windlight/skies/Places%20Paris%202.xml
new file mode 100644
index 000000000..431ee1867
--- /dev/null
+++ b/indra/newview/app_settings/windlight/skies/Places%20Paris%202.xml
@@ -0,0 +1,141 @@
+
+
+
diff --git a/indra/newview/app_settings/windlight/skies/Places%20Paris.xml b/indra/newview/app_settings/windlight/skies/Places%20Paris.xml
new file mode 100644
index 000000000..ebd2970c9
--- /dev/null
+++ b/indra/newview/app_settings/windlight/skies/Places%20Paris.xml
@@ -0,0 +1,141 @@
+
+
+
diff --git a/indra/newview/app_settings/windlight/skies/Places%20Pathfinder.xml b/indra/newview/app_settings/windlight/skies/Places%20Pathfinder.xml
new file mode 100644
index 000000000..43e69daea
--- /dev/null
+++ b/indra/newview/app_settings/windlight/skies/Places%20Pathfinder.xml
@@ -0,0 +1,141 @@
+
+
+
diff --git a/indra/newview/app_settings/windlight/skies/Places%20Sand.xml b/indra/newview/app_settings/windlight/skies/Places%20Sand.xml
new file mode 100644
index 000000000..da66198d5
--- /dev/null
+++ b/indra/newview/app_settings/windlight/skies/Places%20Sand.xml
@@ -0,0 +1,141 @@
+
+
+
diff --git a/indra/newview/app_settings/windlight/skies/Places%20Terre%20Des%20Mortes.xml b/indra/newview/app_settings/windlight/skies/Places%20Terre%20Des%20Mortes.xml
new file mode 100644
index 000000000..00ae35765
--- /dev/null
+++ b/indra/newview/app_settings/windlight/skies/Places%20Terre%20Des%20Mortes.xml
@@ -0,0 +1,141 @@
+
+
+
diff --git a/indra/newview/app_settings/windlight/skies/Places%20Urbania.xml b/indra/newview/app_settings/windlight/skies/Places%20Urbania.xml
new file mode 100644
index 000000000..4aed800ea
--- /dev/null
+++ b/indra/newview/app_settings/windlight/skies/Places%20Urbania.xml
@@ -0,0 +1,141 @@
+
+
+
diff --git a/indra/newview/app_settings/windlight/skies/Places%20Wiccan.xml b/indra/newview/app_settings/windlight/skies/Places%20Wiccan.xml
new file mode 100644
index 000000000..7e220c9ff
--- /dev/null
+++ b/indra/newview/app_settings/windlight/skies/Places%20Wiccan.xml
@@ -0,0 +1,141 @@
+
+
+
diff --git a/indra/newview/app_settings/windlight/skies/Places%20alirium.xml b/indra/newview/app_settings/windlight/skies/Places%20alirium.xml
new file mode 100644
index 000000000..6bed05a85
--- /dev/null
+++ b/indra/newview/app_settings/windlight/skies/Places%20alirium.xml
@@ -0,0 +1,141 @@
+
+
+
diff --git a/indra/newview/app_settings/windlight/skies/Places%2DEmbryo.xml b/indra/newview/app_settings/windlight/skies/Places%2DEmbryo.xml
new file mode 100644
index 000000000..66d490aa9
--- /dev/null
+++ b/indra/newview/app_settings/windlight/skies/Places%2DEmbryo.xml
@@ -0,0 +1,141 @@
+
+
+
diff --git a/indra/newview/app_settings/windlight/skies/StrawberrySingh%2Ecom%20%2D%20Closeups.xml b/indra/newview/app_settings/windlight/skies/StrawberrySingh%2Ecom%20%2D%20Closeups.xml
new file mode 100644
index 000000000..d9a45e832
--- /dev/null
+++ b/indra/newview/app_settings/windlight/skies/StrawberrySingh%2Ecom%20%2D%20Closeups.xml
@@ -0,0 +1,141 @@
+
+
+
diff --git a/indra/newview/app_settings/windlight/skies/Sunrise.xml b/indra/newview/app_settings/windlight/skies/Sunrise.xml
new file mode 100644
index 000000000..bbc7aeec5
--- /dev/null
+++ b/indra/newview/app_settings/windlight/skies/Sunrise.xml
@@ -0,0 +1,141 @@
+
+
+
diff --git a/indra/newview/app_settings/windlight/skies/Sunset%20Pink%20%28Paulina%29.xml b/indra/newview/app_settings/windlight/skies/Sunset%20Pink%20%28Paulina%29.xml
new file mode 100644
index 000000000..9b5b74f03
--- /dev/null
+++ b/indra/newview/app_settings/windlight/skies/Sunset%20Pink%20%28Paulina%29.xml
@@ -0,0 +1,141 @@
+
+
+
diff --git a/indra/newview/app_settings/windlight/skies/Sunset.xml b/indra/newview/app_settings/windlight/skies/Sunset.xml
new file mode 100644
index 000000000..ebf08e1a3
--- /dev/null
+++ b/indra/newview/app_settings/windlight/skies/Sunset.xml
@@ -0,0 +1,142 @@
+
+
+
+
diff --git a/indra/newview/app_settings/windlight/skies/Surreal%20%2D%20Brazil%20%28Paulina%29.xml b/indra/newview/app_settings/windlight/skies/Surreal%20%2D%20Brazil%20%28Paulina%29.xml
new file mode 100644
index 000000000..97044da7b
--- /dev/null
+++ b/indra/newview/app_settings/windlight/skies/Surreal%20%2D%20Brazil%20%28Paulina%29.xml
@@ -0,0 +1,141 @@
+
+
+
diff --git a/indra/newview/app_settings/windlight/skies/Surreal%20%2D%20Fire%20%28Paulina%29.xml b/indra/newview/app_settings/windlight/skies/Surreal%20%2D%20Fire%20%28Paulina%29.xml
new file mode 100644
index 000000000..5519f5ec9
--- /dev/null
+++ b/indra/newview/app_settings/windlight/skies/Surreal%20%2D%20Fire%20%28Paulina%29.xml
@@ -0,0 +1,141 @@
+
+
+
diff --git a/indra/newview/app_settings/windlight/skies/Surreal%20%2D%20Flirt%20%28Paulina%29.xml b/indra/newview/app_settings/windlight/skies/Surreal%20%2D%20Flirt%20%28Paulina%29.xml
new file mode 100644
index 000000000..70dd0d106
--- /dev/null
+++ b/indra/newview/app_settings/windlight/skies/Surreal%20%2D%20Flirt%20%28Paulina%29.xml
@@ -0,0 +1,141 @@
+
+
+
diff --git a/indra/newview/app_settings/windlight/skies/Surreal%20%2D%20Night%20%28Paulina%29.xml b/indra/newview/app_settings/windlight/skies/Surreal%20%2D%20Night%20%28Paulina%29.xml
new file mode 100644
index 000000000..80ee99ef6
--- /dev/null
+++ b/indra/newview/app_settings/windlight/skies/Surreal%20%2D%20Night%20%28Paulina%29.xml
@@ -0,0 +1,141 @@
+
+
+
diff --git a/indra/newview/app_settings/windlight/skies/Surreal%20%2D%20Summer%20%28Paulina%29.xml b/indra/newview/app_settings/windlight/skies/Surreal%20%2D%20Summer%20%28Paulina%29.xml
new file mode 100644
index 000000000..6929904cc
--- /dev/null
+++ b/indra/newview/app_settings/windlight/skies/Surreal%20%2D%20Summer%20%28Paulina%29.xml
@@ -0,0 +1,141 @@
+
+
+
diff --git a/indra/newview/app_settings/windlight/skies/names.txt b/indra/newview/app_settings/windlight/skies/names.txt
new file mode 100644
index 000000000..2d80cde58
--- /dev/null
+++ b/indra/newview/app_settings/windlight/skies/names.txt
@@ -0,0 +1,77 @@
+- Orac - Black fog 1
+- Orac - Black fog 2
+- Orac - Drawing blue
+- Orac - Drawing extreme
+- Orac - Drawing green
+- Orac - Drawing red
+- Orac - Drawing underground comic
+- Orac - fog
+- Orac - gray
+- Orac - green
+AnaLu - outdoor city night
+AnaLutetia - AvatarOpt(2)
+AnaLutetia - AvatarOpt2 whiter
+AnaLutetia - outdoor
+AnaLutetia - Studio Light
+AnaLutetia - STUDIO2
+AnaLutetia - STUDIO3
+AnaLutetia-default
+AnaLutetia-outdoor2(2)
+AnaLutetia
+B5-ShadowDancing
+CB'%s %Rouge 1
+CB'%s %Rouge 2
+CB'%s %Rouge 3
+CB'%s %Rouge 4
+CB'%s %Rouge 5
+CB'%s %Rouge 6
+Fairy blue (Paulina)
+Fairy dark blue (Paulina)
+Fairy light pink (Paulina)
+Fairy warm pinks (Paulina)
+PaperSnow
+Places Abracadabra
+Places Abracadabra2
+Places Abracadabra3
+Places alirium
+Places Annamaria
+Places Astryls Wild
+Places Babbage
+Places Beach Cay Surreal
+Places Beach Cay
+Places Bentham
+Places Cornfield
+Places Cromac
+Places Crucible
+Places District8
+Places Duskwood
+Places Eridu
+Places Erie
+Places Eugene 2
+Places Eugene BL
+Places Greed
+Places Greed2
+Places Imagine
+Places Kingsport
+Places Kunming
+Places Las Legunas
+Places Legacies
+Places Midian
+Places Mother
+Places Old New York
+Places Paris 2
+Places Paris
+Places Pathfinder
+Places Sand
+Places Terre Des Mortes
+Places Urbania
+Places Wiccan
+Places-Embryo
+StrawberrySingh.com - Closeups
+Sunset Pink (Paulina)
+Surreal - Brazil (Paulina)
+Surreal - Fire (Paulina)
+Surreal - Flirt (Paulina)
+Surreal - Night (Paulina)
+Surreal - Summer (Paulina)
+wastelands
\ No newline at end of file
diff --git a/indra/newview/app_settings/windlight/skies/wastelands.xml b/indra/newview/app_settings/windlight/skies/wastelands.xml
new file mode 100644
index 000000000..ffb22cf37
--- /dev/null
+++ b/indra/newview/app_settings/windlight/skies/wastelands.xml
@@ -0,0 +1,141 @@
+
+
+
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/en-us/strings.xml b/indra/newview/skins/default/xui/en-us/strings.xml
index 83db17102..070399959 100644
--- a/indra/newview/skins/default/xui/en-us/strings.xml
+++ b/indra/newview/skins/default/xui/en-us/strings.xml
@@ -1739,6 +1739,46 @@ llSetObjectPermMask( integer mask, integer value )
Sets the given permission mask to the new value on the root object the task is attached to.
(Requires god mode)
+
+integer llSetMemoryLimit( integer limit )
+Request ''limit'' bytes to be reserved for this script.
+
+
+integer llSetLinkMedia( integer link, integer face, list params )
+Set the media params for a particular face on the linked prim(s) without a delay.
+
+
+list llGetLinkMedia( integer link, integer face, list params )
+Returns a list with the media params for a particular face on a linked prim, given the desired list of named params.
+
+
+integer llClearLinkMedia( integer link, integer face )
+Clears the media and all params from the given face on the linked prim(s).
+
+
+llSetLinkCamera( integer link, vector eye, vector at )
+Sets the camera eye offset, and the offset that the camera is looking at, for avatars that sit on the linked prim.
+
+
+llSetContentType( key request_id, integer content_type )
+Set the Internet media type of an LSL HTTP server response.
+
+
+llLinkSitTarget( integer link, vector offset, rotation rot );
+Set the sit location for the linked prim(s). The sit location is relative to the prim's position and rotation.
+
+
+key llAvatarOnLinkSitTarget( integer link )
+Returns a key that is the UUID of the user seated on the prim.
+
+
+
+
@@ -2244,4 +2284,62 @@ list lsGetWindlightScene(list rules)
Get the current WindLight settings.
(Reguires LightShare)
+
+
+
+key osNpcSaveAppearance(key npc, string notecardName)
+Saves the NPC's appearance to a notecard.
+(OpenSim only.)
+
+
+osNpcLoadAppearance(key npc, string notecardName)
+Loads the NPC's appearance from a notecard with appearance data.
+Notecards can also be loaded by UUID.
+(OpenSim only.)
+
+
+osNpcMoveToTarget(key npc, vector position, integer options)
+Moves the NPC to a target at a given vector, using options to walk or to fly there.
+(OpenSim only.)
+
+
+key osOwnerSaveAppearance(string notecardName)
+Saves the owner's appearance to a notecard inside the prim that holds the script.
+(OpenSim only.)
+
+
+rotation osNpcGetRot(key npc)
+Retrieves the rotation of an NPC
+(OpenSim only.)
+
+
+osNpcSetRot(key npc, rotation rot)
+Sets an NPC's rotation.
+(OpenSim only.)
+
+
+key osOwnerSaveAppearance(key avatarId, string notecardName)
+Saves an avatar's appearance to a notecard inside the prim that holds the script.
+(OpenSim only.)
+
+
+vector osNpcGetPos(key npc)
+Retrieves the vector of an NPC's position within a region.
+(OpenSim only.)
+
+
+osNpcStopMoveToTarget(key npc)
+Makes an NPC stop moving to a target.
+(OpenSim only.)
+
+
+float osGetWindParam(string plugin, string param)
+Gets the value of param property for plugin module.
+(OpenSim only.)
+
+
+osSetWindParam(string plugin, string param, float value)
+Sets value of param property for plugin module.
+(OpenSim only.)
+