diff options
author | Diva Canto | 2010-12-10 23:16:47 -0800 |
---|---|---|
committer | Diva Canto | 2010-12-10 23:16:47 -0800 |
commit | 18b10fab609787bc1bb1284fe174a900ab588e49 (patch) | |
tree | 0d612c1c63927d9a59f34e3129031033526c2edd /OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs | |
parent | Another stab at mantis #5256 (diff) | |
parent | Remove the restriction that you have to be logged in when loading/saving iars (diff) | |
download | opensim-SC_OLD-18b10fab609787bc1bb1284fe174a900ab588e49.zip opensim-SC_OLD-18b10fab609787bc1bb1284fe174a900ab588e49.tar.gz opensim-SC_OLD-18b10fab609787bc1bb1284fe174a900ab588e49.tar.bz2 opensim-SC_OLD-18b10fab609787bc1bb1284fe174a900ab588e49.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs index 10d61ca..da81a51 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs | |||
@@ -67,8 +67,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces | |||
67 | string osSetDynamicTextureDataBlendFace(string dynamicID, string contentType, string data, string extraParams, | 67 | string osSetDynamicTextureDataBlendFace(string dynamicID, string contentType, string data, string extraParams, |
68 | bool blend, int disp, int timer, int alpha, int face); | 68 | bool blend, int disp, int timer, int alpha, int face); |
69 | 69 | ||
70 | LSL_Float osTerrainGetHeight(int x, int y); | 70 | LSL_Float osGetTerrainHeight(int x, int y); |
71 | LSL_Integer osTerrainSetHeight(int x, int y, double val); | 71 | LSL_Float osTerrainGetHeight(int x, int y); // Deprecated |
72 | LSL_Integer osSetTerrainHeight(int x, int y, double val); | ||
73 | LSL_Integer osTerrainSetHeight(int x, int y, double val); //Deprecated | ||
72 | void osTerrainFlush(); | 74 | void osTerrainFlush(); |
73 | 75 | ||
74 | int osRegionRestart(double seconds); | 76 | int osRegionRestart(double seconds); |
@@ -107,7 +109,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces | |||
107 | string osSetFontName(string drawList, string fontName); | 109 | string osSetFontName(string drawList, string fontName); |
108 | string osSetFontSize(string drawList, int fontSize); | 110 | string osSetFontSize(string drawList, int fontSize); |
109 | string osSetPenSize(string drawList, int penSize); | 111 | string osSetPenSize(string drawList, int penSize); |
110 | string osSetPenColour(string drawList, string colour); | 112 | string osSetPenColor(string drawList, string color); |
113 | string osSetPenColour(string drawList, string colour); // Deprecated | ||
111 | string osSetPenCap(string drawList, string direction, string type); | 114 | string osSetPenCap(string drawList, string direction, string type); |
112 | string osDrawImage(string drawList, int width, int height, string imageUrl); | 115 | string osDrawImage(string drawList, int width, int height, string imageUrl); |
113 | vector osGetDrawStringSize(string contentType, string text, string fontName, int fontSize); | 116 | vector osGetDrawStringSize(string contentType, string text, string fontName, int fontSize); |
@@ -119,13 +122,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces | |||
119 | void osSetRegionSunSettings(bool useEstateSun, bool sunFixed, double sunHour); | 122 | void osSetRegionSunSettings(bool useEstateSun, bool sunFixed, double sunHour); |
120 | void osSetEstateSunSettings(bool sunFixed, double sunHour); | 123 | void osSetEstateSunSettings(bool sunFixed, double sunHour); |
121 | double osGetCurrentSunHour(); | 124 | double osGetCurrentSunHour(); |
122 | double osSunGetParam(string param); | 125 | double osGetSunParam(string param); |
123 | void osSunSetParam(string param, double value); | 126 | double osSunGetParam(string param); // Deprecated |
127 | void osSetSunParam(string param, double value); | ||
128 | void osSunSetParam(string param, double value); // Deprecated | ||
124 | 129 | ||
125 | // Wind Module Functions | 130 | // Wind Module Functions |
126 | string osWindActiveModelPluginName(); | 131 | string osWindActiveModelPluginName(); |
127 | void osWindParamSet(string plugin, string param, float value); | 132 | void osSetWindParam(string plugin, string param, float value); |
128 | float osWindParamGet(string plugin, string param); | 133 | float osGetWindParam(string plugin, string param); |
129 | 134 | ||
130 | // Parcel commands | 135 | // Parcel commands |
131 | void osParcelJoin(vector pos1, vector pos2); | 136 | void osParcelJoin(vector pos1, vector pos2); |