diff options
-rw-r--r-- | OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs | 27 |
1 files changed, 23 insertions, 4 deletions
diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs index 1a7d044..9de7c0e 100644 --- a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs +++ b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs | |||
@@ -1568,7 +1568,6 @@ namespace OpenSim.Region.ScriptEngine.Common | |||
1568 | public void llStopHover() | 1568 | public void llStopHover() |
1569 | { | 1569 | { |
1570 | m_host.AddScriptLPS(1); | 1570 | m_host.AddScriptLPS(1); |
1571 | m_host.AddScriptLPS(1); | ||
1572 | NotImplemented("llStopHover"); | 1571 | NotImplemented("llStopHover"); |
1573 | } | 1572 | } |
1574 | 1573 | ||
@@ -2165,11 +2164,13 @@ namespace OpenSim.Region.ScriptEngine.Common | |||
2165 | public void llPushObject(string target, LSL_Types.Vector3 impulse, LSL_Types.Vector3 ang_impulse, int local) | 2164 | public void llPushObject(string target, LSL_Types.Vector3 impulse, LSL_Types.Vector3 ang_impulse, int local) |
2166 | { | 2165 | { |
2167 | m_host.AddScriptLPS(1); | 2166 | m_host.AddScriptLPS(1); |
2167 | NotImplemented("llPushObject"); | ||
2168 | } | 2168 | } |
2169 | 2169 | ||
2170 | public void llPassCollisions(int pass) | 2170 | public void llPassCollisions(int pass) |
2171 | { | 2171 | { |
2172 | m_host.AddScriptLPS(1); | 2172 | m_host.AddScriptLPS(1); |
2173 | NotImplemented("llPassCollisions"); | ||
2173 | } | 2174 | } |
2174 | 2175 | ||
2175 | public string llGetScriptName() | 2176 | public string llGetScriptName() |
@@ -2195,24 +2196,28 @@ namespace OpenSim.Region.ScriptEngine.Common | |||
2195 | public int llGetNumberOfSides() | 2196 | public int llGetNumberOfSides() |
2196 | { | 2197 | { |
2197 | m_host.AddScriptLPS(1); | 2198 | m_host.AddScriptLPS(1); |
2199 | NotImplemented("llGetNumberOfSides"); | ||
2198 | return 0; | 2200 | return 0; |
2199 | } | 2201 | } |
2200 | 2202 | ||
2201 | public LSL_Types.Quaternion llAxisAngle2Rot(LSL_Types.Vector3 axis, double angle) | 2203 | public LSL_Types.Quaternion llAxisAngle2Rot(LSL_Types.Vector3 axis, double angle) |
2202 | { | 2204 | { |
2203 | m_host.AddScriptLPS(1); | 2205 | m_host.AddScriptLPS(1); |
2206 | NotImplemented("llAxisAngle2Rot"); | ||
2204 | return new LSL_Types.Quaternion(); | 2207 | return new LSL_Types.Quaternion(); |
2205 | } | 2208 | } |
2206 | 2209 | ||
2207 | public LSL_Types.Vector3 llRot2Axis(LSL_Types.Quaternion rot) | 2210 | public LSL_Types.Vector3 llRot2Axis(LSL_Types.Quaternion rot) |
2208 | { | 2211 | { |
2209 | m_host.AddScriptLPS(1); | 2212 | m_host.AddScriptLPS(1); |
2213 | NotImplemented("llRot2Axis"); | ||
2210 | return new LSL_Types.Vector3(); | 2214 | return new LSL_Types.Vector3(); |
2211 | } | 2215 | } |
2212 | 2216 | ||
2213 | public void llRot2Angle() | 2217 | public void llRot2Angle() |
2214 | { | 2218 | { |
2215 | m_host.AddScriptLPS(1); | 2219 | m_host.AddScriptLPS(1); |
2220 | NotImplemented("llRot2Angle"); | ||
2216 | } | 2221 | } |
2217 | 2222 | ||
2218 | public double llAcos(double val) | 2223 | public double llAcos(double val) |
@@ -2230,23 +2235,27 @@ namespace OpenSim.Region.ScriptEngine.Common | |||
2230 | public double llAngleBetween(LSL_Types.Quaternion a, LSL_Types.Quaternion b) | 2235 | public double llAngleBetween(LSL_Types.Quaternion a, LSL_Types.Quaternion b) |
2231 | { | 2236 | { |
2232 | m_host.AddScriptLPS(1); | 2237 | m_host.AddScriptLPS(1); |
2238 | NotImplemented("llAngleBetween"); | ||
2233 | return 0; | 2239 | return 0; |
2234 | } | 2240 | } |
2235 | 2241 | ||
2236 | public string llGetInventoryKey(string name) | 2242 | public string llGetInventoryKey(string name) |
2237 | { | 2243 | { |
2238 | m_host.AddScriptLPS(1); | 2244 | m_host.AddScriptLPS(1); |
2245 | NotImplemented("llGetInventoryKey"); | ||
2239 | return String.Empty; | 2246 | return String.Empty; |
2240 | } | 2247 | } |
2241 | 2248 | ||
2242 | public void llAllowInventoryDrop(int add) | 2249 | public void llAllowInventoryDrop(int add) |
2243 | { | 2250 | { |
2244 | m_host.AddScriptLPS(1); | 2251 | m_host.AddScriptLPS(1); |
2252 | NotImplemented("llAllowInventoryDrop"); | ||
2245 | } | 2253 | } |
2246 | 2254 | ||
2247 | public LSL_Types.Vector3 llGetSunDirection() | 2255 | public LSL_Types.Vector3 llGetSunDirection() |
2248 | { | 2256 | { |
2249 | m_host.AddScriptLPS(1); | 2257 | m_host.AddScriptLPS(1); |
2258 | NotImplemented("llGetSunDirection"); | ||
2250 | return new LSL_Types.Vector3(); | 2259 | return new LSL_Types.Vector3(); |
2251 | } | 2260 | } |
2252 | 2261 | ||
@@ -5164,6 +5173,7 @@ namespace OpenSim.Region.ScriptEngine.Common | |||
5164 | // Adam's super super custom animation functions | 5173 | // Adam's super super custom animation functions |
5165 | public void osAvatarPlayAnimation(string avatar, string animation) | 5174 | public void osAvatarPlayAnimation(string avatar, string animation) |
5166 | { | 5175 | { |
5176 | m_host.AddScriptLPS(1); | ||
5167 | if (World.Entities.ContainsKey(avatar) && World.Entities[avatar] is ScenePresence) | 5177 | if (World.Entities.ContainsKey(avatar) && World.Entities[avatar] is ScenePresence) |
5168 | { | 5178 | { |
5169 | ScenePresence target = (ScenePresence)World.Entities[avatar]; | 5179 | ScenePresence target = (ScenePresence)World.Entities[avatar]; |
@@ -5173,6 +5183,7 @@ namespace OpenSim.Region.ScriptEngine.Common | |||
5173 | 5183 | ||
5174 | public void osAvatarStopAnimation(string avatar, string animation) | 5184 | public void osAvatarStopAnimation(string avatar, string animation) |
5175 | { | 5185 | { |
5186 | m_host.AddScriptLPS(1); | ||
5176 | if (World.Entities.ContainsKey(avatar) && World.Entities[avatar] is ScenePresence) | 5187 | if (World.Entities.ContainsKey(avatar) && World.Entities[avatar] is ScenePresence) |
5177 | { | 5188 | { |
5178 | ScenePresence target = (ScenePresence)World.Entities[avatar]; | 5189 | ScenePresence target = (ScenePresence)World.Entities[avatar]; |
@@ -5183,86 +5194,94 @@ namespace OpenSim.Region.ScriptEngine.Common | |||
5183 | //Texture draw functions | 5194 | //Texture draw functions |
5184 | public string osMovePen(string drawList, int x, int y) | 5195 | public string osMovePen(string drawList, int x, int y) |
5185 | { | 5196 | { |
5197 | m_host.AddScriptLPS(1); | ||
5186 | drawList += "MoveTo " + x + "," + y + ";"; | 5198 | drawList += "MoveTo " + x + "," + y + ";"; |
5187 | return drawList; | 5199 | return drawList; |
5188 | } | 5200 | } |
5189 | 5201 | ||
5190 | public string osDrawLine(string drawList, int startX, int startY, int endX, int endY) | 5202 | public string osDrawLine(string drawList, int startX, int startY, int endX, int endY) |
5191 | { | 5203 | { |
5204 | m_host.AddScriptLPS(1); | ||
5192 | drawList += "MoveTo "+ startX+","+ startY +"; LineTo "+endX +","+endY +"; "; | 5205 | drawList += "MoveTo "+ startX+","+ startY +"; LineTo "+endX +","+endY +"; "; |
5193 | return drawList; | 5206 | return drawList; |
5194 | } | 5207 | } |
5195 | 5208 | ||
5196 | public string osDrawLine(string drawList, int endX, int endY) | 5209 | public string osDrawLine(string drawList, int endX, int endY) |
5197 | { | 5210 | { |
5211 | m_host.AddScriptLPS(1); | ||
5198 | drawList += "LineTo " + endX + "," + endY + "; "; | 5212 | drawList += "LineTo " + endX + "," + endY + "; "; |
5199 | return drawList; | 5213 | return drawList; |
5200 | } | 5214 | } |
5201 | 5215 | ||
5202 | public string osDrawText(string drawList, string text) | 5216 | public string osDrawText(string drawList, string text) |
5203 | { | 5217 | { |
5218 | m_host.AddScriptLPS(1); | ||
5204 | drawList += "Text " + text + "; "; | 5219 | drawList += "Text " + text + "; "; |
5205 | return drawList; | 5220 | return drawList; |
5206 | } | 5221 | } |
5207 | 5222 | ||
5208 | public string osDrawEllipse(string drawList, int width, int height) | 5223 | public string osDrawEllipse(string drawList, int width, int height) |
5209 | { | 5224 | { |
5225 | m_host.AddScriptLPS(1); | ||
5210 | drawList += "Ellipse " + width + "," + height + "; "; | 5226 | drawList += "Ellipse " + width + "," + height + "; "; |
5211 | return drawList; | 5227 | return drawList; |
5212 | } | 5228 | } |
5213 | 5229 | ||
5214 | public string osDrawRectangle(string drawList, int width, int height) | 5230 | public string osDrawRectangle(string drawList, int width, int height) |
5215 | { | 5231 | { |
5232 | m_host.AddScriptLPS(1); | ||
5216 | drawList += "Rectangle " + width + "," + height + "; "; | 5233 | drawList += "Rectangle " + width + "," + height + "; "; |
5217 | return drawList; | 5234 | return drawList; |
5218 | } | 5235 | } |
5219 | 5236 | ||
5220 | public string osDrawFilledRectangle(string drawList, int width, int height) | 5237 | public string osDrawFilledRectangle(string drawList, int width, int height) |
5221 | { | 5238 | { |
5239 | m_host.AddScriptLPS(1); | ||
5222 | drawList += "FillRectangle " + width + "," + height + "; "; | 5240 | drawList += "FillRectangle " + width + "," + height + "; "; |
5223 | return drawList; | 5241 | return drawList; |
5224 | } | 5242 | } |
5225 | 5243 | ||
5226 | public string osSetFontSize(string drawList, int fontSize) | 5244 | public string osSetFontSize(string drawList, int fontSize) |
5227 | { | 5245 | { |
5246 | m_host.AddScriptLPS(1); | ||
5228 | drawList += "FontSize "+ fontSize +"; "; | 5247 | drawList += "FontSize "+ fontSize +"; "; |
5229 | return drawList; | 5248 | return drawList; |
5230 | } | 5249 | } |
5231 | 5250 | ||
5232 | public string osSetPenSize(string drawList, int penSize) | 5251 | public string osSetPenSize(string drawList, int penSize) |
5233 | { | 5252 | { |
5253 | m_host.AddScriptLPS(1); | ||
5234 | drawList += "PenSize " + penSize + "; "; | 5254 | drawList += "PenSize " + penSize + "; "; |
5235 | return drawList; | 5255 | return drawList; |
5236 | } | 5256 | } |
5237 | 5257 | ||
5238 | public string osSetPenColour(string drawList, string colour) | 5258 | public string osSetPenColour(string drawList, string colour) |
5239 | { | 5259 | { |
5260 | m_host.AddScriptLPS(1); | ||
5240 | drawList += "PenColour " + colour + "; "; | 5261 | drawList += "PenColour " + colour + "; "; |
5241 | return drawList; | 5262 | return drawList; |
5242 | } | 5263 | } |
5243 | 5264 | ||
5244 | public string osDrawImage(string drawList, int width, int height, string imageUrl) | 5265 | public string osDrawImage(string drawList, int width, int height, string imageUrl) |
5245 | { | 5266 | { |
5267 | m_host.AddScriptLPS(1); | ||
5246 | drawList +="Image " +width + "," + height+ ","+ imageUrl +"; " ; | 5268 | drawList +="Image " +width + "," + height+ ","+ imageUrl +"; " ; |
5247 | return drawList; | 5269 | return drawList; |
5248 | } | 5270 | } |
5249 | 5271 | ||
5250 | private void NotImplemented(string command) | 5272 | private void NotImplemented(string command) |
5251 | { | 5273 | { |
5252 | m_host.AddScriptLPS(1); | ||
5253 | if (throwErrorOnNotImplemented) | 5274 | if (throwErrorOnNotImplemented) |
5254 | throw new NotImplementedException("Command not implemented: " + command); | 5275 | throw new NotImplementedException("Command not implemented: " + command); |
5255 | } | 5276 | } |
5256 | 5277 | ||
5257 | private void Deprecated(string command) | 5278 | private void Deprecated(string command) |
5258 | { | 5279 | { |
5259 | m_host.AddScriptLPS(1); | ||
5260 | throw new Exception("Command deprecated: " + command); | 5280 | throw new Exception("Command deprecated: " + command); |
5261 | } | 5281 | } |
5262 | 5282 | ||
5263 | private void LSLError(string msg) | 5283 | private void LSLError(string msg) |
5264 | { | 5284 | { |
5265 | m_host.AddScriptLPS(1); | ||
5266 | throw new Exception("LSL Runtime Error: " + msg); | 5285 | throw new Exception("LSL Runtime Error: " + msg); |
5267 | } | 5286 | } |
5268 | } | 5287 | } |