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/Runtime | |
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 'OpenSim/Region/ScriptEngine/Shared/Api/Runtime')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs | 33 |
1 files changed, 29 insertions, 4 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs index f3142e6..70d489e 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs | |||
@@ -81,11 +81,21 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
81 | return m_OSSL_Functions.osGetCurrentSunHour(); | 81 | return m_OSSL_Functions.osGetCurrentSunHour(); |
82 | } | 82 | } |
83 | 83 | ||
84 | public double osGetSunParam(string param) | ||
85 | { | ||
86 | return m_OSSL_Functions.osGetSunParam(param); | ||
87 | } | ||
88 | // Deprecated | ||
84 | public double osSunGetParam(string param) | 89 | public double osSunGetParam(string param) |
85 | { | 90 | { |
86 | return m_OSSL_Functions.osSunGetParam(param); | 91 | return m_OSSL_Functions.osSunGetParam(param); |
87 | } | 92 | } |
88 | 93 | ||
94 | public void osSetSunParam(string param, double value) | ||
95 | { | ||
96 | m_OSSL_Functions.osSetSunParam(param, value); | ||
97 | } | ||
98 | // Deprecated | ||
89 | public void osSunSetParam(string param, double value) | 99 | public void osSunSetParam(string param, double value) |
90 | { | 100 | { |
91 | m_OSSL_Functions.osSunSetParam(param, value); | 101 | m_OSSL_Functions.osSunSetParam(param, value); |
@@ -97,14 +107,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
97 | } | 107 | } |
98 | 108 | ||
99 | // Not yet plugged in as available OSSL functions, so commented out | 109 | // Not yet plugged in as available OSSL functions, so commented out |
100 | // void osWindParamSet(string plugin, string param, float value) | 110 | // void osSetWindParam(string plugin, string param, float value) |
101 | // { | 111 | // { |
102 | // m_OSSL_Functions.osWindParamSet(plugin, param, value); | 112 | // m_OSSL_Functions.osSetWindParam(plugin, param, value); |
103 | // } | 113 | // } |
104 | // | 114 | // |
105 | // float osWindParamGet(string plugin, string param) | 115 | // float osGetWindParam(string plugin, string param) |
106 | // { | 116 | // { |
107 | // return m_OSSL_Functions.osWindParamGet(plugin, param); | 117 | // return m_OSSL_Functions.osGetWindParam(plugin, param); |
108 | // } | 118 | // } |
109 | 119 | ||
110 | public void osParcelJoin(vector pos1, vector pos2) | 120 | public void osParcelJoin(vector pos1, vector pos2) |
@@ -165,11 +175,21 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
165 | blend, disp, timer, alpha, face); | 175 | blend, disp, timer, alpha, face); |
166 | } | 176 | } |
167 | 177 | ||
178 | public LSL_Float osGetTerrainHeight(int x, int y) | ||
179 | { | ||
180 | return m_OSSL_Functions.osGetTerrainHeight(x, y); | ||
181 | } | ||
182 | // Deprecated | ||
168 | public LSL_Float osTerrainGetHeight(int x, int y) | 183 | public LSL_Float osTerrainGetHeight(int x, int y) |
169 | { | 184 | { |
170 | return m_OSSL_Functions.osTerrainGetHeight(x, y); | 185 | return m_OSSL_Functions.osTerrainGetHeight(x, y); |
171 | } | 186 | } |
172 | 187 | ||
188 | public LSL_Integer osSetTerrainHeight(int x, int y, double val) | ||
189 | { | ||
190 | return m_OSSL_Functions.osSetTerrainHeight(x, y, val); | ||
191 | } | ||
192 | // Deprecated | ||
173 | public LSL_Integer osTerrainSetHeight(int x, int y, double val) | 193 | public LSL_Integer osTerrainSetHeight(int x, int y, double val) |
174 | { | 194 | { |
175 | return m_OSSL_Functions.osTerrainSetHeight(x, y, val); | 195 | return m_OSSL_Functions.osTerrainSetHeight(x, y, val); |
@@ -333,6 +353,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
333 | return m_OSSL_Functions.osSetPenCap(drawList, direction, type); | 353 | return m_OSSL_Functions.osSetPenCap(drawList, direction, type); |
334 | } | 354 | } |
335 | 355 | ||
356 | public string osSetPenColor(string drawList, string color) | ||
357 | { | ||
358 | return m_OSSL_Functions.osSetPenColor(drawList, color); | ||
359 | } | ||
360 | // Deprecated | ||
336 | public string osSetPenColour(string drawList, string colour) | 361 | public string osSetPenColour(string drawList, string colour) |
337 | { | 362 | { |
338 | return m_OSSL_Functions.osSetPenColour(drawList, colour); | 363 | return m_OSSL_Functions.osSetPenColour(drawList, colour); |