Merge remote-tracking branch 'mccabe/exp' into weekly

Conflicts: (Keeping these around as a record, there was some strangeness. .gitignore linden/indra/media_plugins/gstreamer010/media_plugin_gstreamer010.cpp linden/indra/newview/llfloaterregioninfo.cpp linden/indra/newview/llfloatertos.cpp linden/indra/newview/llpanellogin.cpp linden/indra/newview/skins/default/html/en-us/loading-error/index.html linden/indra/newview/skins/default/html/en-us/loading/loading.html linden/indra/newview/skins/default/xui/en-us/floater_about.xml linden/install.xml
author: David Seikel 2011-03-20 17:02:40 +1000
committer: David Seikel 2011-03-20 17:02:40 +1000
commit: 8c15fcec590c68337b8aa05d17793cd3c2a48068 (patch)
tree: e233ecfa79c6fe22f47dc0eba44c0300dc0daa71 /linden/indra/lscript/lscript_library/lscript_library.cpp
parent: The half arsed IRC support was broken. It's still not working, though it wor... (diff)
parent: Merge remote-tracking branch 'jacek/exp' into exp (diff)
download: meta-impy-8c15fcec590c68337b8aa05d17793cd3c2a48068.zip
meta-impy-8c15fcec590c68337b8aa05d17793cd3c2a48068.tar.gz
meta-impy-8c15fcec590c68337b8aa05d17793cd3c2a48068.tar.bz2
meta-impy-8c15fcec590c68337b8aa05d17793cd3c2a48068.tar.xz
1 files changed, 1 insertions, 0 deletions
diff --git a/linden/indra/lscript/lscript_library/lscript_library.cpp b/linden/indra/lscript/lscript_library/lscript_library.cpp
index 59f1824..6e170b9 100644
--- a/linden/indra/lscript/lscript_library/lscript_library.cpp
+++ b/linden/indra/lscript/lscript_library/lscript_library.cpp
@@ -571,6 +571,7 @@ void LLScriptLibrary::init()
        addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "osGetPrimitiveParams", "l", "kl", "List osGetPrimitiveParams(key prim, list rules)\nGets primitive Params.\n(OpenSim only.)")); 
        addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "osSetPrimitiveParams", NULL, "kl", "osSetPrimitiveParams(key prim, list rules)\nSets primitive Params.\n(OpenSim only.)")); 
        addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "osSetProjectionParams", NULL, "kikfff", "osSetProjectionParams(key prim. bool projection, key texture, float fov, float focus, float amb)\nSet Projection Paramaters (bool = true / false)\n(OpenSim only.)")); 
+        addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "osUnixTimeToTimestamp", "s", "i", "osUnixTimeToTimestamp(integer unixtime)\nConverts unixtime to an llGetTimeStamp() formated string.\n(OpenSim only.)")); 
        // LightShare functions
        addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "cmSetWindlightScene", "i", "l", "integer cmSetWindlightScene(list rules)\nSet the current WindLight scene. Restricted to estate managers and owners only."));
author	David Seikel	2011-03-20 17:02:40 +1000
committer	David Seikel	2011-03-20 17:02:40 +1000
commit	8c15fcec590c68337b8aa05d17793cd3c2a48068 (patch)
tree	e233ecfa79c6fe22f47dc0eba44c0300dc0daa71 /linden/indra/lscript/lscript_library/lscript_library.cpp
parent	The half arsed IRC support was broken. It's still not working, though it wor... (diff)
parent	Merge remote-tracking branch 'jacek/exp' into exp (diff)
download	meta-impy-8c15fcec590c68337b8aa05d17793cd3c2a48068.zip meta-impy-8c15fcec590c68337b8aa05d17793cd3c2a48068.tar.gz meta-impy-8c15fcec590c68337b8aa05d17793cd3c2a48068.tar.bz2 meta-impy-8c15fcec590c68337b8aa05d17793cd3c2a48068.tar.xz

diff --git a/linden/indra/lscript/lscript_library/lscript_library.cpp b/linden/indra/lscript/lscript_library/lscript_library.cpp index 59f1824..6e170b9 100644 --- a/linden/indra/lscript/lscript_library/lscript_library.cpp +++ b/linden/indra/lscript/lscript_library/lscript_library.cpp
@@ -571,6 +571,7 @@ void LLScriptLibrary::init()
571	addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "osGetPrimitiveParams", "l", "kl", "List osGetPrimitiveParams(key prim, list rules)\nGets primitive Params.\n(OpenSim only.)"));	571	addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "osGetPrimitiveParams", "l", "kl", "List osGetPrimitiveParams(key prim, list rules)\nGets primitive Params.\n(OpenSim only.)"));
572	addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "osSetPrimitiveParams", NULL, "kl", "osSetPrimitiveParams(key prim, list rules)\nSets primitive Params.\n(OpenSim only.)"));	572	addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "osSetPrimitiveParams", NULL, "kl", "osSetPrimitiveParams(key prim, list rules)\nSets primitive Params.\n(OpenSim only.)"));
573	addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "osSetProjectionParams", NULL, "kikfff", "osSetProjectionParams(key prim. bool projection, key texture, float fov, float focus, float amb)\nSet Projection Paramaters (bool = true / false)\n(OpenSim only.)"));	573	addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "osSetProjectionParams", NULL, "kikfff", "osSetProjectionParams(key prim. bool projection, key texture, float fov, float focus, float amb)\nSet Projection Paramaters (bool = true / false)\n(OpenSim only.)"));
		574	addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "osUnixTimeToTimestamp", "s", "i", "osUnixTimeToTimestamp(integer unixtime)\nConverts unixtime to an llGetTimeStamp() formated string.\n(OpenSim only.)"));
574		575
575	// LightShare functions	576	// LightShare functions
576	addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "cmSetWindlightScene", "i", "l", "integer cmSetWindlightScene(list rules)\nSet the current WindLight scene. Restricted to estate managers and owners only."));	577	addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "cmSetWindlightScene", "i", "l", "integer cmSetWindlightScene(list rules)\nSet the current WindLight scene. Restricted to estate managers and owners only."));