8 files changed, 341 insertions, 279 deletions

diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands_Interface.cs b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands_Interface.cs
index c56ff2f..beddbc5 100644
--- a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands_Interface.cs
+++ b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands_Interface.cs
@@ -48,16 +48,16 @@ namespace OpenSim.Region.ScriptEngine.Common
         int llFloor(double f);

         int llCeil(double f);

         int llRound(double f);

-        double llVecMag(Axiom.Math.Vector3 v);

-        Axiom.Math.Vector3 llVecNorm(Axiom.Math.Vector3 v);

-        double llVecDist(Axiom.Math.Vector3 a, Axiom.Math.Vector3 b);

-        Axiom.Math.Vector3 llRot2Euler(Axiom.Math.Quaternion r);

-        Axiom.Math.Quaternion llEuler2Rot(Axiom.Math.Vector3 v);

-        Axiom.Math.Quaternion llAxes2Rot(Axiom.Math.Vector3 fwd, Axiom.Math.Vector3 left, Axiom.Math.Vector3 up);

-        Axiom.Math.Vector3 llRot2Fwd(Axiom.Math.Quaternion r);

-        Axiom.Math.Vector3 llRot2Left(Axiom.Math.Quaternion r);

-        Axiom.Math.Vector3 llRot2Up(Axiom.Math.Quaternion r);

-        Axiom.Math.Quaternion llRotBetween(Axiom.Math.Vector3 start, Axiom.Math.Vector3 end);

+        double llVecMag(LSL_Types.Vector3 v);

+        LSL_Types.Vector3 llVecNorm(LSL_Types.Vector3 v);

+        double llVecDist(LSL_Types.Vector3 a, LSL_Types.Vector3 b);

+        LSL_Types.Vector3 llRot2Euler(LSL_Types.Quaternion r);

+        LSL_Types.Quaternion llEuler2Rot(LSL_Types.Vector3 v);

+        LSL_Types.Quaternion llAxes2Rot(LSL_Types.Vector3 fwd, LSL_Types.Vector3 left, LSL_Types.Vector3 up);

+        LSL_Types.Vector3 llRot2Fwd(LSL_Types.Quaternion r);

+        LSL_Types.Vector3 llRot2Left(LSL_Types.Quaternion r);

+        LSL_Types.Vector3 llRot2Up(LSL_Types.Quaternion r);

+        LSL_Types.Quaternion llRotBetween(LSL_Types.Vector3 start, LSL_Types.Vector3 end);

         void llWhisper(int channelID, string text);

         //void llSay(int channelID, string text);

         void llSay(int channelID, string text);

@@ -72,73 +72,73 @@ namespace OpenSim.Region.ScriptEngine.Common
         string llDetectedKey(int number);

         string llDetectedOwner(int number);

         int llDetectedType(int number);

-        Axiom.Math.Vector3 llDetectedPos(int number);

-        Axiom.Math.Vector3 llDetectedVel(int number);

-        Axiom.Math.Vector3 llDetectedGrab(int number);

-        Axiom.Math.Quaternion llDetectedRot(int number);

+        LSL_Types.Vector3 llDetectedPos(int number);

+        LSL_Types.Vector3 llDetectedVel(int number);

+        LSL_Types.Vector3 llDetectedGrab(int number);

+        LSL_Types.Quaternion llDetectedRot(int number);

         int llDetectedGroup(int number);

         int llDetectedLinkNumber(int number);

         void llDie();

-        double llGround(Axiom.Math.Vector3 offset);

-        double llCloud(Axiom.Math.Vector3 offset);

-        Axiom.Math.Vector3 llWind(Axiom.Math.Vector3 offset);

+        double llGround(LSL_Types.Vector3 offset);

+        double llCloud(LSL_Types.Vector3 offset);

+        LSL_Types.Vector3 llWind(LSL_Types.Vector3 offset);

         void llSetStatus(int status, int value);

         int llGetStatus(int status);

-        void llSetScale(Axiom.Math.Vector3 scale);

-        Axiom.Math.Vector3 llGetScale();

-        void llSetColor(Axiom.Math.Vector3 color, int face);

+        void llSetScale(LSL_Types.Vector3 scale);

+        LSL_Types.Vector3 llGetScale();

+        void llSetColor(LSL_Types.Vector3 color, int face);

         double llGetAlpha(int face);

         void llSetAlpha(double alpha, int face);

-        Axiom.Math.Vector3 llGetColor(int face);

+        LSL_Types.Vector3 llGetColor(int face);

         void llSetTexture(string texture, int face);

         void llScaleTexture(double u, double v, int face);

         void llOffsetTexture(double u, double v, int face);

         void llRotateTexture(double rotation, int face);

         string llGetTexture(int face);

-        void llSetPos(Axiom.Math.Vector3 pos);

+        void llSetPos(LSL_Types.Vector3 pos);

 

         //wiki: vector llGetPos()

-        Axiom.Math.Vector3 llGetPos();

+        LSL_Types.Vector3 llGetPos();

         //wiki: vector llGetLocalPos()

-        Axiom.Math.Vector3 llGetLocalPos();

+        LSL_Types.Vector3 llGetLocalPos();

         //wiki: llSetRot(rotation rot)

-        void llSetRot(Axiom.Math.Quaternion rot);

+        void llSetRot(LSL_Types.Quaternion rot);

         //wiki: rotation llGetRot()

-        Axiom.Math.Quaternion llGetRot();

+        LSL_Types.Quaternion llGetRot();

         //wiki: rotation llGetLocalRot()

-        Axiom.Math.Quaternion llGetLocalRot();

+        LSL_Types.Quaternion llGetLocalRot();

         //wiki: llSetForce(vector force, integer local)

-        void llSetForce(Axiom.Math.Vector3 force, int local);

+        void llSetForce(LSL_Types.Vector3 force, int local);

         //wiki: vector llGetForce()

-        Axiom.Math.Vector3 llGetForce();

+        LSL_Types.Vector3 llGetForce();

         //wiki: integer llTarget(vector position, double range)

-        int llTarget(Axiom.Math.Vector3 position, double range);

+        int llTarget(LSL_Types.Vector3 position, double range);

         //wiki: llTargetRemove(integer number)

         void llTargetRemove(int number);

         //wiki: integer llRotTarget(rotation rot, double error)

-        int llRotTarget(Axiom.Math.Quaternion rot, double error);

+        int llRotTarget(LSL_Types.Quaternion rot, double error);

         //wiki: integer llRotTargetRemove(integer number)

         void llRotTargetRemove(int number);

         //wiki: llMoveToTarget(vector target, double tau)

-        void llMoveToTarget(Axiom.Math.Vector3 target, double tau);

+        void llMoveToTarget(LSL_Types.Vector3 target, double tau);

         //wiki: llStopMoveToTarget()

         void llStopMoveToTarget();

         //wiki: llApplyImpulse(vector force, integer local)

-        void llApplyImpulse(Axiom.Math.Vector3 force, int local);

+        void llApplyImpulse(LSL_Types.Vector3 force, int local);

         //wiki: llapplyRotationalImpulse(vector force, integer local)

-        void llApplyRotationalImpulse(Axiom.Math.Vector3 force, int local);

+        void llApplyRotationalImpulse(LSL_Types.Vector3 force, int local);

         //wiki: llSetTorque(vector torque, integer local)

-        void llSetTorque(Axiom.Math.Vector3 torque, int local);

+        void llSetTorque(LSL_Types.Vector3 torque, int local);

         //wiki: vector llGetTorque()

-        Axiom.Math.Vector3 llGetTorque();

+        LSL_Types.Vector3 llGetTorque();

         //wiki: llSeForceAndTorque(vector force, vector torque, integer local)

-        void llSetForceAndTorque(Axiom.Math.Vector3 force, Axiom.Math.Vector3 torque, int local);

+        void llSetForceAndTorque(LSL_Types.Vector3 force, LSL_Types.Vector3 torque, int local);

         //wiki: vector llGetVel()

-        Axiom.Math.Vector3 llGetVel();

+        LSL_Types.Vector3 llGetVel();

         //wiki: vector llGetAccel()

-        Axiom.Math.Vector3 llGetAccel();

+        LSL_Types.Vector3 llGetAccel();

         //wiki: vector llGetOmega()

-        Axiom.Math.Vector3 llGetOmega();

+        LSL_Types.Vector3 llGetOmega();

         //wiki: double llGetTimeOfDay()

         double llGetTimeOfDay();

         //wiki: double llGetWallclock()

@@ -188,9 +188,9 @@ namespace OpenSim.Region.ScriptEngine.Common
         //wiki: (deprecated)

         void llMakeFire();

         //wiki: llRezObject(string inventory, vector pos, vector rel, rotation rot, integer param)

-        void llRezObject(string inventory, Axiom.Math.Vector3 pos, Axiom.Math.Quaternion rot, int param);

+        void llRezObject(string inventory, LSL_Types.Vector3 pos, LSL_Types.Quaternion rot, int param);

         //wiki: llLookAt(vector target, double strength, double damping)

-        void llLookAt(Axiom.Math.Vector3 target, double strength, double damping);

+        void llLookAt(LSL_Types.Vector3 target, double strength, double damping);

         //wiki: llStopLookAt()

         void llStopLookAt();

         //wiki: llSetTimerEvent(double sec)

@@ -234,7 +234,7 @@ namespace OpenSim.Region.ScriptEngine.Common
         //wiki: (deprecated) llSoundPreload()

         void llSoundPreload();

         //wiki: llRotLookAt(rotation target, double strength, double damping)

-        void llRotLookAt(Axiom.Math.Quaternion target, double strength, double damping);

+        void llRotLookAt(LSL_Types.Quaternion target, double strength, double damping);

         //wiki: integer llStringLength(string str)

         int llStringLength(string str);

         //wiki: llStartAnimation(string anim)

@@ -246,11 +246,11 @@ namespace OpenSim.Region.ScriptEngine.Common
         //wiki: (deprecated) llStopPointAt

         void llStopPointAt();

         //wiki: llTargetOmega(vector axis, double spinrate, double gain)

-        void llTargetOmega(Axiom.Math.Vector3 axis, double spinrate, double gain);

+        void llTargetOmega(LSL_Types.Vector3 axis, double spinrate, double gain);

         //wiki: integer llGetStartParameter()

         int llGetStartParameter();

         //wiki: llGodLikeRezObject(key inventory, vector pos)

-        void llGodLikeRezObject(string inventory, Axiom.Math.Vector3 pos);

+        void llGodLikeRezObject(string inventory, LSL_Types.Vector3 pos);

         //wiki: llRequestPermissions(key agent, integer perm)

         void llRequestPermissions(string agent, int perm);

         //wiki: key llGetPermissionsKey()

@@ -260,7 +260,7 @@ namespace OpenSim.Region.ScriptEngine.Common
         //wiki integer llGetLinkNumber()

         int llGetLinkNumber();

         //wiki: llSetLinkColor(integer linknumber, vector color, integer face)

-        void llSetLinkColor(int linknumber, Axiom.Math.Vector3 color, int face);

+        void llSetLinkColor(int linknumber, LSL_Types.Vector3 color, int face);

         //wiki: llCreateLink(key target, integer parent)

         void llCreateLink(string target, int parent);

         //wiki: llBreakLink(integer linknum)

@@ -284,9 +284,9 @@ namespace OpenSim.Region.ScriptEngine.Common
         //wiki: llRemoveInventory(string item)

         void llRemoveInventory(string item);

         //wiki: llSetText(string text, vector color, double alpha)

-        void llSetText(string text, Axiom.Math.Vector3 color, double alpha);

+        void llSetText(string text, LSL_Types.Vector3 color, double alpha);

         //wiki: double llWater(vector offset)

-        double llWater(Axiom.Math.Vector3 offset);

+        double llWater(LSL_Types.Vector3 offset);

         //wiki: llPassTouches(integer pass)

         void llPassTouches(int pass);

         //wiki: key llRequestAgentData(key id, integer data)

@@ -310,7 +310,7 @@ namespace OpenSim.Region.ScriptEngine.Common
         //wiki: llMessageLinked(integer linknum, integer num, string str, key id)

         void llMessageLinked(int linknum, int num, string str, string id);

         //wiki: llPushObject(key target, vector impulse, vector ang_impulse, integer local)

-        void llPushObject(string target, Axiom.Math.Vector3 impulse, Axiom.Math.Vector3 ang_impulse, int local);

+        void llPushObject(string target, LSL_Types.Vector3 impulse, LSL_Types.Vector3 ang_impulse, int local);

         //wiki: llPassCollisions(integer pass)

         void llPassCollisions(int pass);

         //wiki: string llGetScriptName()

@@ -318,26 +318,26 @@ namespace OpenSim.Region.ScriptEngine.Common
         //wiki: integer llGetNumberOfSides()

         int llGetNumberOfSides();

         //wiki: rotation llAxisAngle2Rot(vector axis, double angle)

-        Axiom.Math.Quaternion llAxisAngle2Rot(Axiom.Math.Vector3 axis, double angle);

+        LSL_Types.Quaternion llAxisAngle2Rot(LSL_Types.Vector3 axis, double angle);

         //wiki: vector llRot2Axis(rotation rot)

-        Axiom.Math.Vector3 llRot2Axis(Axiom.Math.Quaternion rot);

+        LSL_Types.Vector3 llRot2Axis(LSL_Types.Quaternion rot);

         void llRot2Angle();

         //wiki: double llAcos(double val)

         double llAcos(double val);

         //wiki: double llAsin(double val)

         double llAsin(double val);

         //wiki: double llAngleBetween(rotation a, rotation b)

-        double llAngleBetween(Axiom.Math.Quaternion a, Axiom.Math.Quaternion b);

+        double llAngleBetween(LSL_Types.Quaternion a, LSL_Types.Quaternion b);

         //wiki: string llGetInventoryKey(string name)

         string llGetInventoryKey(string name);

         //wiki: llAllowInventoryDrop(integer add)

         void llAllowInventoryDrop(int add);

         //wiki: vector llGetSunDirection()

-        Axiom.Math.Vector3 llGetSunDirection();

+        LSL_Types.Vector3 llGetSunDirection();

         //wiki: vector llGetTextureOffset(integer face)

-        Axiom.Math.Vector3 llGetTextureOffset(int face);

+        LSL_Types.Vector3 llGetTextureOffset(int face);

         //wiki: vector llGetTextureScale(integer side)

-        Axiom.Math.Vector3 llGetTextureScale(int side);

+        LSL_Types.Vector3 llGetTextureScale(int side);

         //wiki: double llGetTextureRot(integer side)

         double llGetTextureRot(int side);

         //wiki: integer llSubStringIndex(string source, string pattern)

@@ -345,7 +345,7 @@ namespace OpenSim.Region.ScriptEngine.Common
         //wiki: key llGetOwnerKey(key id)

         string llGetOwnerKey(string id);

         //wiki: vector llGetCenterOfMass()

-        Axiom.Math.Vector3 llGetCenterOfMass();

+        LSL_Types.Vector3 llGetCenterOfMass();

         //wiki: list llListSort(list src, integer stride, integer ascending)

         List<string> llListSort(List<string> src, int stride, int ascending);

         //integer llGetListLength(list src)

@@ -359,9 +359,9 @@ namespace OpenSim.Region.ScriptEngine.Common
         //wiki: key llList2Key(list src, integer index)

         string llList2Key(List<string> src, int index);

         //wiki: vector llList2Vector(list src, integer index)

-        Axiom.Math.Vector3 llList2Vector(List<string> src, int index);

+        LSL_Types.Vector3 llList2Vector(List<string> src, int index);

         //wiki rotation llList2Rot(list src, integer index)

-        Axiom.Math.Quaternion llList2Rot(List<string> src, int index);

+        LSL_Types.Quaternion llList2Rot(List<string> src, int index);

         //wiki: list llList2List(list src, integer start, integer end)

         List<string> llList2List(List<string> src, int start, int end);

         //wiki: llDeleteSubList(list src, integer start, integer end)

@@ -377,7 +377,7 @@ namespace OpenSim.Region.ScriptEngine.Common
         //wiki: list llList2ListStrided( list src, integer start, integer end, integer stride )

         List<string> llList2ListStrided(List<string> src, int start, int end, int stride);

         //wiki: vector llGetRegionCorner( )

-        Axiom.Math.Vector3 llGetRegionCorner();

+        LSL_Types.Vector3 llGetRegionCorner();

         //wiki: list llListInsertList( list dest, list src, integer start )

         List<string> llListInsertList(List<string> dest, List<string> src, int start);

         //wiki: integer llListFindList( list src, list test )

@@ -389,7 +389,7 @@ namespace OpenSim.Region.ScriptEngine.Common
         //wiki: string llGetDate()

         string llGetDate();

         //wiki: integer llEdgeOfWorld(vector pos, vector dir)

-        int llEdgeOfWorld(Axiom.Math.Vector3 pos, Axiom.Math.Vector3 dir);

+        int llEdgeOfWorld(LSL_Types.Vector3 pos, LSL_Types.Vector3 dir);

         //wiki: integer llGetAgentInfo(key id)

         int llGetAgentInfo(string id);

         //wiki: llAdjustSoundVolume(double volume)

@@ -403,28 +403,28 @@ namespace OpenSim.Region.ScriptEngine.Common
         //wiki: llSetTextureAnim(integer mode, integer face, integer sizex, integer sizey, double start, double length, double rate)

         void llSetTextureAnim(int mode, int face, int sizex, int sizey, double start, double length, double rate);

         //wiki: llTriggerSoundLimited(string sound, double volume, vector top_north_east, vector bottom_south_west)

-        void llTriggerSoundLimited(string sound, double volume, Axiom.Math.Vector3 top_north_east, Axiom.Math.Vector3 bottom_south_west);

+        void llTriggerSoundLimited(string sound, double volume, LSL_Types.Vector3 top_north_east, LSL_Types.Vector3 bottom_south_west);

         //wiki: llEjectFromLand(key pest)

         void llEjectFromLand(string pest);

         void llParseString2List();

         //wiki: integer llOverMyLand(key id)

         int llOverMyLand(string id);

         //wiki: key llGetLandOwnerAt(vector pos)

-        string llGetLandOwnerAt(Axiom.Math.Vector3 pos);

+        string llGetLandOwnerAt(LSL_Types.Vector3 pos);

         //wiki: key llGetNotecardLine(string name, integer line)

         string llGetNotecardLine(string name, int line);

         //wiki: vector llGetAgentSize(key id)

-        Axiom.Math.Vector3 llGetAgentSize(string id);

+        LSL_Types.Vector3 llGetAgentSize(string id);

         //wiki: integer llSameGroup(key agent)

         int llSameGroup(string agent);

         //wiki: llUnSit(key id)

         void llUnSit(string id);

         //wiki: vector llGroundSlope(vector offset)

-        Axiom.Math.Vector3 llGroundSlope(Axiom.Math.Vector3 offset);

+        LSL_Types.Vector3 llGroundSlope(LSL_Types.Vector3 offset);

         //wiki: vector llGroundNormal(vector offset)

-        Axiom.Math.Vector3 llGroundNormal(Axiom.Math.Vector3 offset);

+        LSL_Types.Vector3 llGroundNormal(LSL_Types.Vector3 offset);

         //wiki: vector llGroundContour(vector offset)

-        Axiom.Math.Vector3 llGroundContour(Axiom.Math.Vector3 offset);

+        LSL_Types.Vector3 llGroundContour(LSL_Types.Vector3 offset);

         //wiki: integer llGetAttached()

         int llGetAttached();

         //wiki: integer llGetFreeMemory()

@@ -445,15 +445,15 @@ namespace OpenSim.Region.ScriptEngine.Common
         //wiki: llSetVehicledoubleParam(integer param, double value)

         void llSetVehicledoubleParam(int param, double value);

         //wiki: llSetVehicleVectorParam(integer param, vector vec)

-        void llSetVehicleVectorParam(int param, Axiom.Math.Vector3 vec);

+        void llSetVehicleVectorParam(int param, LSL_Types.Vector3 vec);

         //wiki: llSetVehicleRotationParam(integer param, rotation rot)

-        void llSetVehicleRotationParam(int param, Axiom.Math.Quaternion rot);

+        void llSetVehicleRotationParam(int param, LSL_Types.Quaternion rot);

         //wiki: llSetVehicleFlags(integer flags)

         void llSetVehicleFlags(int flags);

         //wiki: llRemoveVehicleFlags(integer flags)

         void llRemoveVehicleFlags(int flags);

         //wiki: llSitTarget(vector offset, rotation rot)

-        void llSitTarget(Axiom.Math.Vector3 offset, Axiom.Math.Quaternion rot);

+        void llSitTarget(LSL_Types.Vector3 offset, LSL_Types.Quaternion rot);

         //wiki key llAvatarOnSitTarget()

         string llAvatarOnSitTarget();

         //wiki: llAddToLandPassList(key avatar, double hours)

@@ -463,12 +463,12 @@ namespace OpenSim.Region.ScriptEngine.Common
         //wiki: llSetSitText(string text)

         void llSetSitText(string text);

         //wiki: llSetCameraEyeOffset(vector offset)

-        void llSetCameraEyeOffset(Axiom.Math.Vector3 offset);

+        void llSetCameraEyeOffset(LSL_Types.Vector3 offset);

         //wiki: llSeteCameraAtOffset(vector offset)

-        void llSetCameraAtOffset(Axiom.Math.Vector3 offset);

+        void llSetCameraAtOffset(LSL_Types.Vector3 offset);

         void llDumpList2String();

         //wiki: integer llScriptDanger(vector pos)

-        void llScriptDanger(Axiom.Math.Vector3 pos);

+        void llScriptDanger(LSL_Types.Vector3 pos);

         //wiki: llDialog( key avatar, string message, list buttons, integer chat_channel )

         void llDialog(string avatar, string message, List<string> buttons, int chat_channel);

         //wiki: llVolumeDetect(integer detect)

@@ -512,9 +512,9 @@ namespace OpenSim.Region.ScriptEngine.Common
         //wiki: llSetParcelMusicURL(string url)

         void llSetParcelMusicURL(string url);

         //wiki: vector llGetRootPosition()

-        Axiom.Math.Vector3 llGetRootPosition();

+        LSL_Types.Vector3 llGetRootPosition();

         //wiki: rotation llGetRootRotation()

-        Axiom.Math.Quaternion llGetRootRotation();

+        LSL_Types.Quaternion llGetRootRotation();

         //wiki: string llGetObjectDesc()

         string llGetObjectDesc();

         //wiki: llSetObjectDesc(string desc)

@@ -532,7 +532,7 @@ namespace OpenSim.Region.ScriptEngine.Common
         //wiki: list llGetBoundingBox( key object )

         List<string> llGetBoundingBox(string obj);

         //wiki: vector llGetGeometricCenter()

-        Axiom.Math.Vector3 llGetGeometricCenter();

+        LSL_Types.Vector3 llGetGeometricCenter();

         void llGetPrimitiveParams();

         //wiki: string llIntegerToBase64(integer number)

         string llIntegerToBase64(int number);

@@ -543,11 +543,11 @@ namespace OpenSim.Region.ScriptEngine.Common
         //wiki: string llGetSimulatorHostname()

         string llGetSimulatorHostname();

         //llSetLocalRot(rotation rot)

-        void llSetLocalRot(Axiom.Math.Quaternion rot);

+        void llSetLocalRot(LSL_Types.Quaternion rot);

         //wiki: list llParseStringKeepNulls( string src, list separators, list spacers )

         List<string> llParseStringKeepNulls(string src, List<string> seperators, List<string> spacers);

         //wiki: llRezAtRoot(string inventory, vector position, vector velocity, rotation rot, integer param)

-        void llRezAtRoot(string inventory, Axiom.Math.Vector3 position, Axiom.Math.Vector3 velocity, Axiom.Math.Quaternion rot, int param);

+        void llRezAtRoot(string inventory, LSL_Types.Vector3 position, LSL_Types.Vector3 velocity, LSL_Types.Quaternion rot, int param);

         //wiki: integer llGetObjectPermMask(integer mask)

         int llGetObjectPermMask(int mask);

         //wiki: llSetObjectPermMask(integer mask, integer value)

@@ -579,9 +579,9 @@ namespace OpenSim.Region.ScriptEngine.Common
         //wiki: llSetPayPrice( integer price, list quick_pay_buttons )

         void llSetPayPrice(int price, List<string> quick_pay_buttons);

         //wiki: vector llGetCameraPos()

-        Axiom.Math.Vector3 llGetCameraPos();

+        LSL_Types.Vector3 llGetCameraPos();

         //wiki rotation llGetCameraRot()

-        Axiom.Math.Quaternion llGetCameraRot();

+        LSL_Types.Quaternion llGetCameraRot();

         //wiki: (deprecated)

         void llSetPrimURL();

         //wiki: (deprecated)

@@ -591,7 +591,7 @@ namespace OpenSim.Region.ScriptEngine.Common
         //wiki: string llUnescapeURL(string url)

         string llUnescapeURL(string url);

         //wiki: llMapDestination(string simname, vector pos, vector look_at)

-        void llMapDestination(string simname, Axiom.Math.Vector3 pos, Axiom.Math.Vector3 look_at);

+        void llMapDestination(string simname, LSL_Types.Vector3 pos, LSL_Types.Vector3 look_at);

         //wiki: llAddToLandBanList(key avatar, double hours)

         void llAddToLandBanList(string avatar, double hours);

         //wiki: llRemoveFromLandPassList(key avatar)

@@ -607,7 +607,7 @@ namespace OpenSim.Region.ScriptEngine.Common
         //wiki: integer llGetUnixTime()

         int llGetUnixTime();

         //wiki: integer llGetParcelFlags(vector pos)

-        int llGetParcelFlags(Axiom.Math.Vector3 pos);

+        int llGetParcelFlags(LSL_Types.Vector3 pos);

         //wiki: integer llGetRegionFlags()

         int llGetRegionFlags();

         //wiki: string llXorBase64StringsCorrect(string str1, string str2)

@@ -618,14 +618,14 @@ namespace OpenSim.Region.ScriptEngine.Common
         //wiki: llResetLandPassList()

         void llResetLandPassList();

         //wiki integer llGetParcelPrimCount(vector pos, integer category, integer sim_wide)

-        int llGetParcelPrimCount(Axiom.Math.Vector3 pos, int category, int sim_wide);

+        int llGetParcelPrimCount(LSL_Types.Vector3 pos, int category, int sim_wide);

         //wiki: list llGetParcelPrimOwners( vector pos )

-        List<string> llGetParcelPrimOwners(Axiom.Math.Vector3 pos);

+        List<string> llGetParcelPrimOwners(LSL_Types.Vector3 pos);

         //wiki: integer llGetObjectPrimCount(key object_id)

         int llGetObjectPrimCount(string object_id);

         //wiki: integer llGetParcelMaxPrims( vector pos, integer sim_wide )

-        int llGetParcelMaxPrims(Axiom.Math.Vector3 pos, int sim_wide);

+        int llGetParcelMaxPrims(LSL_Types.Vector3 pos, int sim_wide);

         //wiki list llGetParcelDetails(vector pos, list params)

-        List<string> llGetParcelDetails(Axiom.Math.Vector3 pos, List<string> param);

+        List<string> llGetParcelDetails(LSL_Types.Vector3 pos, List<string> param);

     }

 }

diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_Types.cs b/OpenSim/Region/ScriptEngine/Common/LSL_Types.cs
new file mode 100644
index 0000000..b151d5a
--- /dev/null
+++ b/OpenSim/Region/ScriptEngine/Common/LSL_Types.cs
@@ -0,0 +1,53 @@
+using System;

+

+namespace OpenSim.Region.ScriptEngine.Common

+{

+    [Serializable]

+    public class LSL_Types

+    {

+        [Serializable]

+        public struct Vector3

+        {

+            public double X;

+            public double Y;

+            public double Z;

+

+            public Vector3(Vector3 vector)

+                    {

+                            X = (float)vector.X;

+                            Y = (float)vector.Y;

+                            Z = (float)vector.Z;

+                }

+            public Vector3(double x, double y, double z)

+            {

+                X = x;

+                Y = y;

+                Z = z;

+            }

+        }

+        [Serializable]

+        public struct Quaternion

+        {

+            public double X;

+            public double Y;

+            public double Z;

+            public double R;

+

+            public Quaternion(Quaternion Quat)

+                    {

+                X = (float)Quat.X;

+                Y = (float)Quat.Y;

+                Z = (float)Quat.Z;

+                R = (float)Quat.R;

+            }

+            public Quaternion(double x, double y, double z, double r)

+            {

+                X = x;

+                Y = y;

+                Z = z;

+                R = r;

+            }

+

+        }

+    }

+}

diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/AppDomainManager.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/AppDomainManager.cs
index 2e1e3d1..7941ea2 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/AppDomainManager.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/AppDomainManager.cs
@@ -71,7 +71,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
             //ads.ApplicationName = "DotNetScriptEngine";

             //ads.DynamicBase = ads.ApplicationBase;

             

-            Console.WriteLine("AppDomain BaseDirectory: " + ads.ApplicationBase);

+            //Console.WriteLine("AppDomain BaseDirectory: " + ads.ApplicationBase);

             ads.DisallowBindingRedirects = false;

             ads.DisallowCodeDownload = true;

             ads.ShadowCopyFiles = "true";

@@ -95,13 +95,13 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
                 

             }

 

-            Console.WriteLine("Assembly file: " + this.GetType().Assembly.CodeBase);

-            Console.WriteLine("Assembly name: " + this.GetType().ToString());

+            //Console.WriteLine("Assembly file: " + this.GetType().Assembly.CodeBase);

+            //Console.WriteLine("Assembly name: " + this.GetType().ToString());

             //AD.CreateInstanceFrom(this.GetType().Assembly.CodeBase, "OpenSim.Region.ScriptEngine.DotNetEngine.ScriptEngine");

 

             //AD.Load(this.GetType().Assembly.CodeBase);

 

-            Console.WriteLine("Done preparing new appdomain.");

+            Console.WriteLine("Done preparing new AppDomain.");

             return AD;

 

         }

diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/Compiler.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/Compiler.cs
index 4c2ceb0..c29b9f4 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/Compiler.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/Compiler.cs
@@ -8,6 +8,7 @@ using System.Reflection;
 

 namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL

 {

+    

     public class Compiler

     {

         private LSL2CSConverter LSL_Converter = new LSL2CSConverter();

@@ -52,13 +53,17 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
             System.CodeDom.Compiler.CompilerParameters parameters = new CompilerParameters();

             parameters.IncludeDebugInformation = true;

             // Add all available assemblies

-            //foreach (Assembly asm in AppDomain.CurrentDomain.GetAssemblies())

-            //{

-            //    Console.WriteLine("Adding assembly: " + asm.Location);

-            //    parameters.ReferencedAssemblies.Add(asm.Location);

-            //}

+            foreach (Assembly asm in AppDomain.CurrentDomain.GetAssemblies())

+            {

+                //Console.WriteLine("Adding assembly: " + asm.Location);

+                //parameters.ReferencedAssemblies.Add(asm.Location);

+            }

 

-            parameters.ReferencedAssemblies.Add(this.GetType().Assembly.CodeBase);

+            string rootPath = Path.GetDirectoryName(this.GetType().Assembly.Location);

+            Console.WriteLine("Assembly location: " + rootPath);

+            parameters.ReferencedAssemblies.Add(Path.Combine(rootPath, "OpenSim.Region.ScriptEngine.Common.dll"));

+            parameters.ReferencedAssemblies.Add(Path.Combine(rootPath, "OpenSim.Region.ScriptEngine.DotNetEngine.dll"));

+            

             //parameters.ReferencedAssemblies.Add("OpenSim.Region.Environment");

             parameters.GenerateExecutable = false;

             parameters.OutputAssembly = OutFile;

diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL2CSConverter.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL2CSConverter.cs
index 81f8e2d..f41cd59 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL2CSConverter.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL2CSConverter.cs
@@ -18,8 +18,8 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
             DataTypes.Add("float", "double");

             DataTypes.Add("string", "string");

             DataTypes.Add("key", "string");

-            DataTypes.Add("vector", "Axiom.Math.Vector3");

-            DataTypes.Add("rotation", "Axiom.Math.Quaternion");

+            DataTypes.Add("vector", "LSL_Types.Vector3");

+            DataTypes.Add("rotation", "LSL_Types.Quaternion");

             DataTypes.Add("list", "list");

             DataTypes.Add("null", "null");

         }

@@ -205,8 +205,8 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
             Script = Regex.Replace(Script, @"^(\s*)((?!(if|switch|for)[^a-zA-Z0-9_])[a-zA-Z0-9_]*\s*\([^\)]*\)[^;]*\{)", @"$1void $2", RegexOptions.Compiled | RegexOptions.Multiline | RegexOptions.Singleline);

 

             // Replace <x,y,z> and <x,y,z,r>

-            Script = Regex.Replace(Script, @"<([^,>]*,[^,>]*,[^,>]*,[^,>]*)>", @"new Axiom.Math.Quaternion($1)", RegexOptions.Compiled | RegexOptions.Multiline | RegexOptions.Singleline);

-            Script = Regex.Replace(Script, @"<([^,>]*,[^,>]*,[^,>]*)>", @"new Axiom.Math.Vector3($1)", RegexOptions.Compiled | RegexOptions.Multiline | RegexOptions.Singleline);

+            Script = Regex.Replace(Script, @"<([^,>]*,[^,>]*,[^,>]*,[^,>]*)>", @"new LSL_Types.Quaternion($1)", RegexOptions.Compiled | RegexOptions.Multiline | RegexOptions.Singleline);

+            Script = Regex.Replace(Script, @"<([^,>]*,[^,>]*,[^,>]*)>", @"new LSL_Types.Vector3($1)", RegexOptions.Compiled | RegexOptions.Multiline | RegexOptions.Singleline);

 

             // Replace List []'s

             Script = Regex.Replace(Script, @"\[([^\]]*)\]", @"List.Parse($1)", RegexOptions.Compiled | RegexOptions.Multiline | RegexOptions.Singleline);

@@ -227,7 +227,12 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
 

 

             // Add namespace, class name and inheritance

-            Return = "namespace SecondLife {\r\n";

+            Return = "" +

+            "using System;\r\n" +

+            "using System.Collections.Generic;\r\n" +

+            "using System.Text;\r\n" +

+            "using OpenSim.Region.ScriptEngine.Common;\r\n" +

+            "namespace SecondLife {\r\n";

             Return += "[Serializable] public class Script : OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL.LSL_BaseClass {\r\n";

             Return += @"public Script() { }"+"\r\n";

             Return += Script;

diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL_BaseClass.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL_BaseClass.cs
index eb3d871..ff1676e 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL_BaseClass.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL_BaseClass.cs
@@ -66,16 +66,16 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
         public int llFloor(double f) { return m_LSL_Functions.llFloor(f); }

         public int llCeil(double f) { return m_LSL_Functions.llCeil(f); }

         public int llRound(double f) { return m_LSL_Functions.llRound(f); }

-        public double llVecMag(Axiom.Math.Vector3 v) { return m_LSL_Functions.llVecMag(v); }

-        public Axiom.Math.Vector3 llVecNorm(Axiom.Math.Vector3 v) { return m_LSL_Functions.llVecNorm(v); }

-        public double llVecDist(Axiom.Math.Vector3 a, Axiom.Math.Vector3 b) { return m_LSL_Functions.llVecDist(a, b); }

-        public Axiom.Math.Vector3 llRot2Euler(Axiom.Math.Quaternion r) { return m_LSL_Functions.llRot2Euler(r); }

-        public Axiom.Math.Quaternion llEuler2Rot(Axiom.Math.Vector3 v) { return m_LSL_Functions.llEuler2Rot(v); }

-        public Axiom.Math.Quaternion llAxes2Rot(Axiom.Math.Vector3 fwd, Axiom.Math.Vector3 left, Axiom.Math.Vector3 up) { return m_LSL_Functions.llAxes2Rot(fwd, left, up); }

-        public Axiom.Math.Vector3 llRot2Fwd(Axiom.Math.Quaternion r) { return m_LSL_Functions.llRot2Fwd(r); }

-        public Axiom.Math.Vector3 llRot2Left(Axiom.Math.Quaternion r) { return m_LSL_Functions.llRot2Left(r); }

-        public Axiom.Math.Vector3 llRot2Up(Axiom.Math.Quaternion r) { return m_LSL_Functions.llRot2Up(r); }

-        public Axiom.Math.Quaternion llRotBetween(Axiom.Math.Vector3 start, Axiom.Math.Vector3 end) { return m_LSL_Functions.llRotBetween(start, end); }

+        public double llVecMag(LSL_Types.Vector3 v) { return m_LSL_Functions.llVecMag(v); }

+        public LSL_Types.Vector3 llVecNorm(LSL_Types.Vector3 v) { return m_LSL_Functions.llVecNorm(v); }

+        public double llVecDist(LSL_Types.Vector3 a, LSL_Types.Vector3 b) { return m_LSL_Functions.llVecDist(a, b); }

+        public LSL_Types.Vector3 llRot2Euler(LSL_Types.Quaternion r) { return m_LSL_Functions.llRot2Euler(r); }

+        public LSL_Types.Quaternion llEuler2Rot(LSL_Types.Vector3 v) { return m_LSL_Functions.llEuler2Rot(v); }

+        public LSL_Types.Quaternion llAxes2Rot(LSL_Types.Vector3 fwd, LSL_Types.Vector3 left, LSL_Types.Vector3 up) { return m_LSL_Functions.llAxes2Rot(fwd, left, up); }

+        public LSL_Types.Vector3 llRot2Fwd(LSL_Types.Quaternion r) { return m_LSL_Functions.llRot2Fwd(r); }

+        public LSL_Types.Vector3 llRot2Left(LSL_Types.Quaternion r) { return m_LSL_Functions.llRot2Left(r); }

+        public LSL_Types.Vector3 llRot2Up(LSL_Types.Quaternion r) { return m_LSL_Functions.llRot2Up(r); }

+        public LSL_Types.Quaternion llRotBetween(LSL_Types.Vector3 start, LSL_Types.Vector3 end) { return m_LSL_Functions.llRotBetween(start, end); }

         public void llWhisper(int channelID, string text) { m_LSL_Functions.llWhisper(channelID, text); }

         public void llSay(int channelID, string text) { m_LSL_Functions.llSay(channelID, text); }

         //

@@ -92,27 +92,27 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
         public string llDetectedKey(int number) { return m_LSL_Functions.llDetectedKey(number); }

         public string llDetectedOwner(int number) { return m_LSL_Functions.llDetectedOwner(number); }

         public int llDetectedType(int number) { return m_LSL_Functions.llDetectedType(number); }

-        public Axiom.Math.Vector3 llDetectedPos(int number) { return m_LSL_Functions.llDetectedPos(number); }

-        public Axiom.Math.Vector3 llDetectedVel(int number) { return m_LSL_Functions.llDetectedVel(number); }

-        public Axiom.Math.Vector3 llDetectedGrab(int number) { return m_LSL_Functions.llDetectedGrab(number); }

-        public Axiom.Math.Quaternion llDetectedRot(int number) { return m_LSL_Functions.llDetectedRot(number); }

+        public LSL_Types.Vector3 llDetectedPos(int number) { return m_LSL_Functions.llDetectedPos(number); }

+        public LSL_Types.Vector3 llDetectedVel(int number) { return m_LSL_Functions.llDetectedVel(number); }

+        public LSL_Types.Vector3 llDetectedGrab(int number) { return m_LSL_Functions.llDetectedGrab(number); }

+        public LSL_Types.Quaternion llDetectedRot(int number) { return m_LSL_Functions.llDetectedRot(number); }

         public int llDetectedGroup(int number) { return m_LSL_Functions.llDetectedGroup(number); }

         public int llDetectedLinkNumber(int number) { return m_LSL_Functions.llDetectedLinkNumber(number); }

         //

         // DO NOT MODIFY HERE: MODIFY IN LSL_BuiltIn_Commands.cs

         //

         public void llDie() { m_LSL_Functions.llDie(); }

-        public double llGround(Axiom.Math.Vector3 offset) { return m_LSL_Functions.llGround(offset); }

-        public double llCloud(Axiom.Math.Vector3 offset) { return m_LSL_Functions.llCloud(offset); }

-        public Axiom.Math.Vector3 llWind(Axiom.Math.Vector3 offset) { return m_LSL_Functions.llWind(offset); }

+        public double llGround(LSL_Types.Vector3 offset) { return m_LSL_Functions.llGround(offset); }

+        public double llCloud(LSL_Types.Vector3 offset) { return m_LSL_Functions.llCloud(offset); }

+        public LSL_Types.Vector3 llWind(LSL_Types.Vector3 offset) { return m_LSL_Functions.llWind(offset); }

         public void llSetStatus(int status, int value) { m_LSL_Functions.llSetStatus(status, value); }

         public int llGetStatus(int status) { return m_LSL_Functions.llGetStatus(status); }

-        public void llSetScale(Axiom.Math.Vector3 scale) { m_LSL_Functions.llSetScale(scale); }

-        public Axiom.Math.Vector3 llGetScale() { return m_LSL_Functions.llGetScale(); }

-        public void llSetColor(Axiom.Math.Vector3 color, int face) { m_LSL_Functions.llSetColor(color, face); }

+        public void llSetScale(LSL_Types.Vector3 scale) { m_LSL_Functions.llSetScale(scale); }

+        public LSL_Types.Vector3 llGetScale() { return m_LSL_Functions.llGetScale(); }

+        public void llSetColor(LSL_Types.Vector3 color, int face) { m_LSL_Functions.llSetColor(color, face); }

         public double llGetAlpha(int face) { return m_LSL_Functions.llGetAlpha(face); }

         public void llSetAlpha(double alpha, int face) { m_LSL_Functions.llSetAlpha(alpha, face); }

-        public Axiom.Math.Vector3 llGetColor(int face) { return m_LSL_Functions.llGetColor(face); }

+        public LSL_Types.Vector3 llGetColor(int face) { return m_LSL_Functions.llGetColor(face); }

         public void llSetTexture(string texture, int face) { m_LSL_Functions.llSetTexture(texture, face); }

         public void llScaleTexture(double u, double v, int face) { m_LSL_Functions.llScaleTexture(u, v, face); }

         public void llOffsetTexture(double u, double v, int face) { m_LSL_Functions.llOffsetTexture(u, v, face); }

@@ -121,31 +121,31 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
         //

         // DO NOT MODIFY HERE: MODIFY IN LSL_BuiltIn_Commands.cs

         //

-        public void llSetPos(Axiom.Math.Vector3 pos) { m_LSL_Functions.llSetPos(pos); }

-        public Axiom.Math.Vector3 llGetPos() { return m_LSL_Functions.llGetPos(); }

-        public Axiom.Math.Vector3 llGetLocalPos() { return m_LSL_Functions.llGetLocalPos(); }

-        public void llSetRot(Axiom.Math.Quaternion rot) { m_LSL_Functions.llSetRot(rot); }

-        public Axiom.Math.Quaternion llGetRot() { return m_LSL_Functions.llGetRot(); }

-        public Axiom.Math.Quaternion llGetLocalRot() { return m_LSL_Functions.llGetLocalRot(); }

-        public void llSetForce(Axiom.Math.Vector3 force, int local) { m_LSL_Functions.llSetForce(force, local); }

-        public Axiom.Math.Vector3 llGetForce() { return m_LSL_Functions.llGetForce(); }

-        public int llTarget(Axiom.Math.Vector3 position, double range) { return m_LSL_Functions.llTarget(position, range); }

+        public void llSetPos(LSL_Types.Vector3 pos) { m_LSL_Functions.llSetPos(pos); }

+        public LSL_Types.Vector3 llGetPos() { return m_LSL_Functions.llGetPos(); }

+        public LSL_Types.Vector3 llGetLocalPos() { return m_LSL_Functions.llGetLocalPos(); }

+        public void llSetRot(LSL_Types.Quaternion rot) { m_LSL_Functions.llSetRot(rot); }

+        public LSL_Types.Quaternion llGetRot() { return m_LSL_Functions.llGetRot(); }

+        public LSL_Types.Quaternion llGetLocalRot() { return m_LSL_Functions.llGetLocalRot(); }

+        public void llSetForce(LSL_Types.Vector3 force, int local) { m_LSL_Functions.llSetForce(force, local); }

+        public LSL_Types.Vector3 llGetForce() { return m_LSL_Functions.llGetForce(); }

+        public int llTarget(LSL_Types.Vector3 position, double range) { return m_LSL_Functions.llTarget(position, range); }

         public void llTargetRemove(int number) { m_LSL_Functions.llTargetRemove(number); }

-        public int llRotTarget(Axiom.Math.Quaternion rot, double error) { return m_LSL_Functions.llRotTarget(rot, error); }

+        public int llRotTarget(LSL_Types.Quaternion rot, double error) { return m_LSL_Functions.llRotTarget(rot, error); }

         public void llRotTargetRemove(int number) { m_LSL_Functions.llRotTargetRemove(number); }

-        public void llMoveToTarget(Axiom.Math.Vector3 target, double tau) { m_LSL_Functions.llMoveToTarget(target, tau); }

+        public void llMoveToTarget(LSL_Types.Vector3 target, double tau) { m_LSL_Functions.llMoveToTarget(target, tau); }

         public void llStopMoveToTarget() { m_LSL_Functions.llStopMoveToTarget(); }

-        public void llApplyImpulse(Axiom.Math.Vector3 force, int local) { m_LSL_Functions.llApplyImpulse(force, local); }

+        public void llApplyImpulse(LSL_Types.Vector3 force, int local) { m_LSL_Functions.llApplyImpulse(force, local); }

         //

         // DO NOT MODIFY HERE: MODIFY IN LSL_BuiltIn_Commands.cs

         //

-        public void llApplyRotationalImpulse(Axiom.Math.Vector3 force, int local) { m_LSL_Functions.llApplyRotationalImpulse(force, local); }

-        public void llSetTorque(Axiom.Math.Vector3 torque, int local) { m_LSL_Functions.llSetTorque(torque, local); }

-        public Axiom.Math.Vector3 llGetTorque() { return m_LSL_Functions.llGetTorque(); }

-        public void llSetForceAndTorque(Axiom.Math.Vector3 force, Axiom.Math.Vector3 torque, int local) { m_LSL_Functions.llSetForceAndTorque(force, torque, local); }

-        public Axiom.Math.Vector3 llGetVel() { return m_LSL_Functions.llGetVel(); }

-        public Axiom.Math.Vector3 llGetAccel() { return m_LSL_Functions.llGetAccel(); }

-        public Axiom.Math.Vector3 llGetOmega() { return m_LSL_Functions.llGetOmega(); }

+        public void llApplyRotationalImpulse(LSL_Types.Vector3 force, int local) { m_LSL_Functions.llApplyRotationalImpulse(force, local); }

+        public void llSetTorque(LSL_Types.Vector3 torque, int local) { m_LSL_Functions.llSetTorque(torque, local); }

+        public LSL_Types.Vector3 llGetTorque() { return m_LSL_Functions.llGetTorque(); }

+        public void llSetForceAndTorque(LSL_Types.Vector3 force, LSL_Types.Vector3 torque, int local) { m_LSL_Functions.llSetForceAndTorque(force, torque, local); }

+        public LSL_Types.Vector3 llGetVel() { return m_LSL_Functions.llGetVel(); }

+        public LSL_Types.Vector3 llGetAccel() { return m_LSL_Functions.llGetAccel(); }

+        public LSL_Types.Vector3 llGetOmega() { return m_LSL_Functions.llGetOmega(); }

         public double llGetTimeOfDay() { return m_LSL_Functions.llGetTimeOfDay(); }

         public double llGetWallclock() { return m_LSL_Functions.llGetWallclock(); }

         public double llGetTime() { return m_LSL_Functions.llGetTime(); }

@@ -173,8 +173,8 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
         public void llMakeFountain() { m_LSL_Functions.llMakeFountain(); }

         public void llMakeSmoke() { m_LSL_Functions.llMakeSmoke(); }

         public void llMakeFire() { m_LSL_Functions.llMakeFire(); }

-        public void llRezObject(string inventory, Axiom.Math.Vector3 pos, Axiom.Math.Quaternion rot, int param) { m_LSL_Functions.llRezObject(inventory, pos, rot, param); }

-        public void llLookAt(Axiom.Math.Vector3 target, double strength, double damping) { m_LSL_Functions.llLookAt(target, strength, damping); }

+        public void llRezObject(string inventory, LSL_Types.Vector3 pos, LSL_Types.Quaternion rot, int param) { m_LSL_Functions.llRezObject(inventory, pos, rot, param); }

+        public void llLookAt(LSL_Types.Vector3 target, double strength, double damping) { m_LSL_Functions.llLookAt(target, strength, damping); }

         public void llStopLookAt() { m_LSL_Functions.llStopLookAt(); }

         public void llSetTimerEvent(double sec) { m_LSL_Functions.llSetTimerEvent(sec); }

         public void llSleep(double sec) { m_LSL_Functions.llSleep(sec); }

@@ -199,7 +199,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
         public void llStopHover() { m_LSL_Functions.llStopHover(); }

         public void llMinEventDelay(double delay) { m_LSL_Functions.llMinEventDelay(delay); }

         public void llSoundPreload() { m_LSL_Functions.llSoundPreload(); }

-        public void llRotLookAt(Axiom.Math.Quaternion target, double strength, double damping) { m_LSL_Functions.llRotLookAt(target, strength, damping); }

+        public void llRotLookAt(LSL_Types.Quaternion target, double strength, double damping) { m_LSL_Functions.llRotLookAt(target, strength, damping); }

         //

         // DO NOT MODIFY HERE: MODIFY IN LSL_BuiltIn_Commands.cs

         //

@@ -208,14 +208,14 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
         public void llStopAnimation(string anim) { m_LSL_Functions.llStopAnimation(anim); }

         public void llPointAt() { m_LSL_Functions.llPointAt(); }

         public void llStopPointAt() { m_LSL_Functions.llStopPointAt(); }

-        public void llTargetOmega(Axiom.Math.Vector3 axis, double spinrate, double gain) { m_LSL_Functions.llTargetOmega(axis, spinrate, gain); }

+        public void llTargetOmega(LSL_Types.Vector3 axis, double spinrate, double gain) { m_LSL_Functions.llTargetOmega(axis, spinrate, gain); }

         public int llGetStartParameter() { return m_LSL_Functions.llGetStartParameter(); }

-        public void llGodLikeRezObject(string inventory, Axiom.Math.Vector3 pos) { m_LSL_Functions.llGodLikeRezObject(inventory, pos); }

+        public void llGodLikeRezObject(string inventory, LSL_Types.Vector3 pos) { m_LSL_Functions.llGodLikeRezObject(inventory, pos); }

         public void llRequestPermissions(string agent, int perm) { m_LSL_Functions.llRequestPermissions(agent, perm); }

         public string llGetPermissionsKey() { return m_LSL_Functions.llGetPermissionsKey(); }

         public int llGetPermissions() { return m_LSL_Functions.llGetPermissions(); }

         public int llGetLinkNumber() { return m_LSL_Functions.llGetLinkNumber(); }

-        public void llSetLinkColor(int linknumber, Axiom.Math.Vector3 color, int face) { m_LSL_Functions.llSetLinkColor(linknumber, color, face); }

+        public void llSetLinkColor(int linknumber, LSL_Types.Vector3 color, int face) { m_LSL_Functions.llSetLinkColor(linknumber, color, face); }

         public void llCreateLink(string target, int parent) { m_LSL_Functions.llCreateLink(target, parent); }

         public void llBreakLink(int linknum) { m_LSL_Functions.llBreakLink(linknum); }

         public void llBreakAllLinks() { m_LSL_Functions.llBreakAllLinks(); }

@@ -230,8 +230,8 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
         public double llGetEnergy() { return m_LSL_Functions.llGetEnergy(); }

         public void llGiveInventory(string destination, string inventory) { m_LSL_Functions.llGiveInventory(destination, inventory); }

         public void llRemoveInventory(string item) { m_LSL_Functions.llRemoveInventory(item); }

-        public void llSetText(string text, Axiom.Math.Vector3 color, double alpha) { m_LSL_Functions.llSetText(text, color, alpha); }

-        public double llWater(Axiom.Math.Vector3 offset) { return m_LSL_Functions.llWater(offset); }

+        public void llSetText(string text, LSL_Types.Vector3 color, double alpha) { m_LSL_Functions.llSetText(text, color, alpha); }

+        public double llWater(LSL_Types.Vector3 offset) { return m_LSL_Functions.llWater(offset); }

         public void llPassTouches(int pass) { m_LSL_Functions.llPassTouches(pass); }

         public string llRequestAgentData(string id, int data) { return m_LSL_Functions.llRequestAgentData(id, data); }

         public string llRequestInventoryData(string name) { return m_LSL_Functions.llRequestInventoryData(name); }

@@ -243,28 +243,28 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
         public string llGetAnimation(string id) { return m_LSL_Functions.llGetAnimation(id); }

         public void llResetScript() { m_LSL_Functions.llResetScript(); }

         public void llMessageLinked(int linknum, int num, string str, string id) { m_LSL_Functions.llMessageLinked(linknum, num, str, id); }

-        public void llPushObject(string target, Axiom.Math.Vector3 impulse, Axiom.Math.Vector3 ang_impulse, int local) { m_LSL_Functions.llPushObject(target, impulse, ang_impulse, local); }

+        public void llPushObject(string target, LSL_Types.Vector3 impulse, LSL_Types.Vector3 ang_impulse, int local) { m_LSL_Functions.llPushObject(target, impulse, ang_impulse, local); }

         public void llPassCollisions(int pass) { m_LSL_Functions.llPassCollisions(pass); }

         public string llGetScriptName() { return m_LSL_Functions.llGetScriptName(); }

         public int llGetNumberOfSides() { return m_LSL_Functions.llGetNumberOfSides(); }

         //

         // DO NOT MODIFY HERE: MODIFY IN LSL_BuiltIn_Commands.cs

         //

-        public Axiom.Math.Quaternion llAxisAngle2Rot(Axiom.Math.Vector3 axis, double angle) { return m_LSL_Functions.llAxisAngle2Rot(axis, angle); }

-        public Axiom.Math.Vector3 llRot2Axis(Axiom.Math.Quaternion rot) { return m_LSL_Functions.llRot2Axis(rot); }

+        public LSL_Types.Quaternion llAxisAngle2Rot(LSL_Types.Vector3 axis, double angle) { return m_LSL_Functions.llAxisAngle2Rot(axis, angle); }

+        public LSL_Types.Vector3 llRot2Axis(LSL_Types.Quaternion rot) { return m_LSL_Functions.llRot2Axis(rot); }

         public void llRot2Angle() { m_LSL_Functions.llRot2Angle(); }

         public double llAcos(double val) { return m_LSL_Functions.llAcos(val); }

         public double llAsin(double val) { return m_LSL_Functions.llAsin(val); }

-        public double llAngleBetween(Axiom.Math.Quaternion a, Axiom.Math.Quaternion b) { return m_LSL_Functions.llAngleBetween(a, b); }

+        public double llAngleBetween(LSL_Types.Quaternion a, LSL_Types.Quaternion b) { return m_LSL_Functions.llAngleBetween(a, b); }

         public string llGetInventoryKey(string name) { return m_LSL_Functions.llGetInventoryKey(name); }

         public void llAllowInventoryDrop(int add) { m_LSL_Functions.llAllowInventoryDrop(add); }

-        public Axiom.Math.Vector3 llGetSunDirection() { return m_LSL_Functions.llGetSunDirection(); }

-        public Axiom.Math.Vector3 llGetTextureOffset(int face) { return m_LSL_Functions.llGetTextureOffset(face); }

-        public Axiom.Math.Vector3 llGetTextureScale(int side) { return m_LSL_Functions.llGetTextureScale(side); }

+        public LSL_Types.Vector3 llGetSunDirection() { return m_LSL_Functions.llGetSunDirection(); }

+        public LSL_Types.Vector3 llGetTextureOffset(int face) { return m_LSL_Functions.llGetTextureOffset(face); }

+        public LSL_Types.Vector3 llGetTextureScale(int side) { return m_LSL_Functions.llGetTextureScale(side); }

         public double llGetTextureRot(int side) { return m_LSL_Functions.llGetTextureRot(side); }

         public int llSubStringIndex(string source, string pattern) { return m_LSL_Functions.llSubStringIndex(source, pattern); }

         public string llGetOwnerKey(string id) { return m_LSL_Functions.llGetOwnerKey(id); }

-        public Axiom.Math.Vector3 llGetCenterOfMass() { return m_LSL_Functions.llGetCenterOfMass(); }

+        public LSL_Types.Vector3 llGetCenterOfMass() { return m_LSL_Functions.llGetCenterOfMass(); }

         public List<string> llListSort(List<string> src, int stride, int ascending) { return m_LSL_Functions.llListSort(src, stride, ascending); }

         public int llGetListLength(List<string> src) { return m_LSL_Functions.llGetListLength(src); }

         //

@@ -274,8 +274,8 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
         public double llList2double(List<string> src, int index) { return m_LSL_Functions.llList2double(src, index); }

         public string llList2String(List<string> src, int index) { return m_LSL_Functions.llList2String(src, index); }

         public string llList2Key(List<string> src, int index) { return m_LSL_Functions.llList2Key(src, index); }

-        public Axiom.Math.Vector3 llList2Vector(List<string> src, int index) { return m_LSL_Functions.llList2Vector(src, index); }

-        public Axiom.Math.Quaternion llList2Rot(List<string> src, int index) { return m_LSL_Functions.llList2Rot(src, index); }

+        public LSL_Types.Vector3 llList2Vector(List<string> src, int index) { return m_LSL_Functions.llList2Vector(src, index); }

+        public LSL_Types.Quaternion llList2Rot(List<string> src, int index) { return m_LSL_Functions.llList2Rot(src, index); }

         public List<string> llList2List(List<string> src, int start, int end) { return m_LSL_Functions.llList2List(src, start, end); }

         public List<string> llDeleteSubList(List<string> src, int start, int end) { return m_LSL_Functions.llDeleteSubList(src, start, end); }

         public int llGetListEntryType(List<string> src, int index) { return m_LSL_Functions.llGetListEntryType(src, index); }

@@ -283,13 +283,13 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
         public List<string> llCSV2List(string src) { return m_LSL_Functions.llCSV2List(src); }

         public List<string> llListRandomize(List<string> src, int stride) { return m_LSL_Functions.llListRandomize(src, stride); }

         public List<string> llList2ListStrided(List<string> src, int start, int end, int stride) { return m_LSL_Functions.llList2ListStrided(src, start, end, stride); }

-        public Axiom.Math.Vector3 llGetRegionCorner() { return m_LSL_Functions.llGetRegionCorner(); }

+        public LSL_Types.Vector3 llGetRegionCorner() { return m_LSL_Functions.llGetRegionCorner(); }

         public List<string> llListInsertList(List<string> dest, List<string> src, int start) { return m_LSL_Functions.llListInsertList(dest, src, start); }

         public int llListFindList(List<string> src, List<string> test) { return m_LSL_Functions.llListFindList(src, test); }

         public string llGetObjectName() { return m_LSL_Functions.llGetObjectName(); }

         public void llSetObjectName(string name) { m_LSL_Functions.llSetObjectName(name); }

         public string llGetDate() { return m_LSL_Functions.llGetDate(); }

-        public int llEdgeOfWorld(Axiom.Math.Vector3 pos, Axiom.Math.Vector3 dir) { return m_LSL_Functions.llEdgeOfWorld(pos, dir); }

+        public int llEdgeOfWorld(LSL_Types.Vector3 pos, LSL_Types.Vector3 dir) { return m_LSL_Functions.llEdgeOfWorld(pos, dir); }

         public int llGetAgentInfo(string id) { return m_LSL_Functions.llGetAgentInfo(id); }

         //

         // DO NOT MODIFY HERE: MODIFY IN LSL_BuiltIn_Commands.cs

@@ -299,18 +299,18 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
         public void llSetSoundRadius(double radius) { m_LSL_Functions.llSetSoundRadius(radius); }

         public string llKey2Name(string id) { return m_LSL_Functions.llKey2Name(id); }

         public void llSetTextureAnim(int mode, int face, int sizex, int sizey, double start, double length, double rate) { m_LSL_Functions.llSetTextureAnim(mode, face, sizex, sizey, start, length, rate); }

-        public void llTriggerSoundLimited(string sound, double volume, Axiom.Math.Vector3 top_north_east, Axiom.Math.Vector3 bottom_south_west) { m_LSL_Functions.llTriggerSoundLimited(sound, volume, top_north_east, bottom_south_west); }

+        public void llTriggerSoundLimited(string sound, double volume, LSL_Types.Vector3 top_north_east, LSL_Types.Vector3 bottom_south_west) { m_LSL_Functions.llTriggerSoundLimited(sound, volume, top_north_east, bottom_south_west); }

         public void llEjectFromLand(string pest) { m_LSL_Functions.llEjectFromLand(pest); }

         public void llParseString2List() { m_LSL_Functions.llParseString2List(); }

         public int llOverMyLand(string id) { return m_LSL_Functions.llOverMyLand(id); }

-        public string llGetLandOwnerAt(Axiom.Math.Vector3 pos) { return m_LSL_Functions.llGetLandOwnerAt(pos); }

+        public string llGetLandOwnerAt(LSL_Types.Vector3 pos) { return m_LSL_Functions.llGetLandOwnerAt(pos); }

         public string llGetNotecardLine(string name, int line) { return m_LSL_Functions.llGetNotecardLine(name, line); }

-        public Axiom.Math.Vector3 llGetAgentSize(string id) { return m_LSL_Functions.llGetAgentSize(id); }

+        public LSL_Types.Vector3 llGetAgentSize(string id) { return m_LSL_Functions.llGetAgentSize(id); }

         public int llSameGroup(string agent) { return m_LSL_Functions.llSameGroup(agent); }

         public void llUnSit(string id) { m_LSL_Functions.llUnSit(id); }

-        public Axiom.Math.Vector3 llGroundSlope(Axiom.Math.Vector3 offset) { return m_LSL_Functions.llGroundSlope(offset); }

-        public Axiom.Math.Vector3 llGroundNormal(Axiom.Math.Vector3 offset) { return m_LSL_Functions.llGroundNormal(offset); }

-        public Axiom.Math.Vector3 llGroundContour(Axiom.Math.Vector3 offset) { return m_LSL_Functions.llGroundContour(offset); }

+        public LSL_Types.Vector3 llGroundSlope(LSL_Types.Vector3 offset) { return m_LSL_Functions.llGroundSlope(offset); }

+        public LSL_Types.Vector3 llGroundNormal(LSL_Types.Vector3 offset) { return m_LSL_Functions.llGroundNormal(offset); }

+        public LSL_Types.Vector3 llGroundContour(LSL_Types.Vector3 offset) { return m_LSL_Functions.llGroundContour(offset); }

         public int llGetAttached() { return m_LSL_Functions.llGetAttached(); }

         public int llGetFreeMemory() { return m_LSL_Functions.llGetFreeMemory(); }

         public string llGetRegionName() { return m_LSL_Functions.llGetRegionName(); }

@@ -324,19 +324,19 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
         public void llGiveInventoryList() { m_LSL_Functions.llGiveInventoryList(); }

         public void llSetVehicleType(int type) { m_LSL_Functions.llSetVehicleType(type); }

         public void llSetVehicledoubleParam(int param, double value) { m_LSL_Functions.llSetVehicledoubleParam(param, value); }

-        public void llSetVehicleVectorParam(int param, Axiom.Math.Vector3 vec) { m_LSL_Functions.llSetVehicleVectorParam(param, vec); }

-        public void llSetVehicleRotationParam(int param, Axiom.Math.Quaternion rot) { m_LSL_Functions.llSetVehicleRotationParam(param, rot); }

+        public void llSetVehicleVectorParam(int param, LSL_Types.Vector3 vec) { m_LSL_Functions.llSetVehicleVectorParam(param, vec); }

+        public void llSetVehicleRotationParam(int param, LSL_Types.Quaternion rot) { m_LSL_Functions.llSetVehicleRotationParam(param, rot); }

         public void llSetVehicleFlags(int flags) { m_LSL_Functions.llSetVehicleFlags(flags); }

         public void llRemoveVehicleFlags(int flags) { m_LSL_Functions.llRemoveVehicleFlags(flags); }

-        public void llSitTarget(Axiom.Math.Vector3 offset, Axiom.Math.Quaternion rot) { m_LSL_Functions.llSitTarget(offset, rot); }

+        public void llSitTarget(LSL_Types.Vector3 offset, LSL_Types.Quaternion rot) { m_LSL_Functions.llSitTarget(offset, rot); }

         public string llAvatarOnSitTarget() { return m_LSL_Functions.llAvatarOnSitTarget(); }

         public void llAddToLandPassList(string avatar, double hours) { m_LSL_Functions.llAddToLandPassList(avatar, hours); }

         public void llSetTouchText(string text) { m_LSL_Functions.llSetTouchText(text); }

         public void llSetSitText(string text) { m_LSL_Functions.llSetSitText(text); }

-        public void llSetCameraEyeOffset(Axiom.Math.Vector3 offset) { m_LSL_Functions.llSetCameraEyeOffset(offset); }

-        public void llSetCameraAtOffset(Axiom.Math.Vector3 offset) { m_LSL_Functions.llSetCameraAtOffset(offset); }

+        public void llSetCameraEyeOffset(LSL_Types.Vector3 offset) { m_LSL_Functions.llSetCameraEyeOffset(offset); }

+        public void llSetCameraAtOffset(LSL_Types.Vector3 offset) { m_LSL_Functions.llSetCameraAtOffset(offset); }

         public void llDumpList2String() { m_LSL_Functions.llDumpList2String(); }

-        public void llScriptDanger(Axiom.Math.Vector3 pos) { m_LSL_Functions.llScriptDanger(pos); }

+        public void llScriptDanger(LSL_Types.Vector3 pos) { m_LSL_Functions.llScriptDanger(pos); }

         public void llDialog(string avatar, string message, List<string> buttons, int chat_channel) { m_LSL_Functions.llDialog(avatar, message, buttons, chat_channel); }

         public void llVolumeDetect(int detect) { m_LSL_Functions.llVolumeDetect(detect); }

         public void llResetOtherScript(string name) { m_LSL_Functions.llResetOtherScript(name); }

@@ -361,8 +361,8 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
         public double llLog(double val) { return m_LSL_Functions.llLog(val); }

         public List<string> llGetAnimationList(string id) { return m_LSL_Functions.llGetAnimationList(id); }

         public void llSetParcelMusicURL(string url) { m_LSL_Functions.llSetParcelMusicURL(url); }

-        public Axiom.Math.Vector3 llGetRootPosition() { return m_LSL_Functions.llGetRootPosition(); }

-        public Axiom.Math.Quaternion llGetRootRotation() { return m_LSL_Functions.llGetRootRotation(); }

+        public LSL_Types.Vector3 llGetRootPosition() { return m_LSL_Functions.llGetRootPosition(); }

+        public LSL_Types.Quaternion llGetRootRotation() { return m_LSL_Functions.llGetRootRotation(); }

         public string llGetObjectDesc() { return m_LSL_Functions.llGetObjectDesc(); }

         public void llSetObjectDesc(string desc) { m_LSL_Functions.llSetObjectDesc(desc); }

         public string llGetCreator() { return m_LSL_Functions.llGetCreator(); }

@@ -371,7 +371,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
         public int llGetNumberOfPrims() { return m_LSL_Functions.llGetNumberOfPrims(); }

         public string llGetNumberOfNotecardLines(string name) { return m_LSL_Functions.llGetNumberOfNotecardLines(name); }

         public List<string> llGetBoundingBox(string obj) { return m_LSL_Functions.llGetBoundingBox(obj); }

-        public Axiom.Math.Vector3 llGetGeometricCenter() { return m_LSL_Functions.llGetGeometricCenter(); }

+        public LSL_Types.Vector3 llGetGeometricCenter() { return m_LSL_Functions.llGetGeometricCenter(); }

         public void llGetPrimitiveParams() { m_LSL_Functions.llGetPrimitiveParams(); }

         //

         // DO NOT MODIFY HERE: MODIFY IN LSL_BuiltIn_Commands.cs

@@ -380,9 +380,9 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
         public int llBase64ToInteger(string str) { return m_LSL_Functions.llBase64ToInteger(str); }

         public double llGetGMTclock() { return m_LSL_Functions.llGetGMTclock(); }

         public string llGetSimulatorHostname() { return m_LSL_Functions.llGetSimulatorHostname(); }

-        public void llSetLocalRot(Axiom.Math.Quaternion rot) { m_LSL_Functions.llSetLocalRot(rot); }

+        public void llSetLocalRot(LSL_Types.Quaternion rot) { m_LSL_Functions.llSetLocalRot(rot); }

         public List<string> llParseStringKeepNulls(string src, List<string> seperators, List<string> spacers) { return m_LSL_Functions.llParseStringKeepNulls(src, seperators, spacers); }

-        public void llRezAtRoot(string inventory, Axiom.Math.Vector3 position, Axiom.Math.Vector3 velocity, Axiom.Math.Quaternion rot, int param) { m_LSL_Functions.llRezAtRoot(inventory, position, velocity, rot, param); }

+        public void llRezAtRoot(string inventory, LSL_Types.Vector3 position, LSL_Types.Vector3 velocity, LSL_Types.Quaternion rot, int param) { m_LSL_Functions.llRezAtRoot(inventory, position, velocity, rot, param); }

         public int llGetObjectPermMask(int mask) { return m_LSL_Functions.llGetObjectPermMask(mask); }

         public void llSetObjectPermMask(int mask, int value) { m_LSL_Functions.llSetObjectPermMask(mask, value); }

         public void llGetInventoryPermMask(string item, int mask) { m_LSL_Functions.llGetInventoryPermMask(item, mask); }

@@ -402,13 +402,13 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
         //

         public int llGetInventoryType(string name) { return m_LSL_Functions.llGetInventoryType(name); }

         public void llSetPayPrice(int price, List<string> quick_pay_buttons) { m_LSL_Functions.llSetPayPrice(price, quick_pay_buttons); }

-        public Axiom.Math.Vector3 llGetCameraPos() { return m_LSL_Functions.llGetCameraPos(); }

-        public Axiom.Math.Quaternion llGetCameraRot() { return m_LSL_Functions.llGetCameraRot(); }

+        public LSL_Types.Vector3 llGetCameraPos() { return m_LSL_Functions.llGetCameraPos(); }

+        public LSL_Types.Quaternion llGetCameraRot() { return m_LSL_Functions.llGetCameraRot(); }

         public void llSetPrimURL() { m_LSL_Functions.llSetPrimURL(); }

         public void llRefreshPrimURL() { m_LSL_Functions.llRefreshPrimURL(); }

         public string llEscapeURL(string url) { return m_LSL_Functions.llEscapeURL(url); }

         public string llUnescapeURL(string url) { return m_LSL_Functions.llUnescapeURL(url); }

-        public void llMapDestination(string simname, Axiom.Math.Vector3 pos, Axiom.Math.Vector3 look_at) { m_LSL_Functions.llMapDestination(simname, pos, look_at); }

+        public void llMapDestination(string simname, LSL_Types.Vector3 pos, LSL_Types.Vector3 look_at) { m_LSL_Functions.llMapDestination(simname, pos, look_at); }

         public void llAddToLandBanList(string avatar, double hours) { m_LSL_Functions.llAddToLandBanList(avatar, hours); }

         public void llRemoveFromLandPassList(string avatar) { m_LSL_Functions.llRemoveFromLandPassList(avatar); }

         public void llRemoveFromLandBanList(string avatar) { m_LSL_Functions.llRemoveFromLandBanList(avatar); }

@@ -416,20 +416,20 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
         public void llClearCameraParams() { m_LSL_Functions.llClearCameraParams(); }

         public double llListStatistics(int operation, List<string> src) { return m_LSL_Functions.llListStatistics(operation, src); }

         public int llGetUnixTime() { return m_LSL_Functions.llGetUnixTime(); }

-        public int llGetParcelFlags(Axiom.Math.Vector3 pos) { return m_LSL_Functions.llGetParcelFlags(pos); }

+        public int llGetParcelFlags(LSL_Types.Vector3 pos) { return m_LSL_Functions.llGetParcelFlags(pos); }

         public int llGetRegionFlags() { return m_LSL_Functions.llGetRegionFlags(); }

         public string llXorBase64StringsCorrect(string str1, string str2) { return m_LSL_Functions.llXorBase64StringsCorrect(str1, str2); }

         public void llHTTPRequest() { m_LSL_Functions.llHTTPRequest(); }

         public void llResetLandBanList() { m_LSL_Functions.llResetLandBanList(); }

         public void llResetLandPassList() { m_LSL_Functions.llResetLandPassList(); }

-        public int llGetParcelPrimCount(Axiom.Math.Vector3 pos, int category, int sim_wide) { return m_LSL_Functions.llGetParcelPrimCount(pos, category, sim_wide); }

-        public List<string> llGetParcelPrimOwners(Axiom.Math.Vector3 pos) { return m_LSL_Functions.llGetParcelPrimOwners(pos); }

+        public int llGetParcelPrimCount(LSL_Types.Vector3 pos, int category, int sim_wide) { return m_LSL_Functions.llGetParcelPrimCount(pos, category, sim_wide); }

+        public List<string> llGetParcelPrimOwners(LSL_Types.Vector3 pos) { return m_LSL_Functions.llGetParcelPrimOwners(pos); }

         public int llGetObjectPrimCount(string object_id) { return m_LSL_Functions.llGetObjectPrimCount(object_id); }

         //

         // DO NOT MODIFY HERE: MODIFY IN LSL_BuiltIn_Commands.cs

         //

-        public int llGetParcelMaxPrims(Axiom.Math.Vector3 pos, int sim_wide) { return m_LSL_Functions.llGetParcelMaxPrims(pos, sim_wide); }

-        public List<string> llGetParcelDetails(Axiom.Math.Vector3 pos, List<string> param) { return m_LSL_Functions.llGetParcelDetails(pos, param); }

+        public int llGetParcelMaxPrims(LSL_Types.Vector3 pos, int sim_wide) { return m_LSL_Functions.llGetParcelMaxPrims(pos, sim_wide); }

+        public List<string> llGetParcelDetails(LSL_Types.Vector3 pos, List<string> param) { return m_LSL_Functions.llGetParcelDetails(pos, param); }

 

 

 

@@ -738,8 +738,8 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
         public const double SQRT2 = 1.414213538f;

 

         // Can not be public const?

-        public Axiom.Math.Vector3 ZERO_VECTOR = new Axiom.Math.Vector3(0, 0, 0);

-        public Axiom.Math.Quaternion ZERO_ROTATION = new Axiom.Math.Quaternion(0, 0, 0, 0);

+        public LSL_Types.Vector3 ZERO_VECTOR = new LSL_Types.Vector3(0, 0, 0);

+        public LSL_Types.Quaternion ZERO_ROTATION = new LSL_Types.Quaternion(0, 0, 0, 0);

 

 

 

diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands.cs
index 6401163..15de03b 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands.cs
@@ -60,16 +60,16 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler
         public int llFloor(double f) { return (int)Math.Floor(f); }

         public int llCeil(double f) { return (int)Math.Ceiling(f); }

         public int llRound(double f) { return (int)Math.Round(f, 1); }

-        public double llVecMag(Axiom.Math.Vector3 v) { return 0; }

-        public Axiom.Math.Vector3 llVecNorm(Axiom.Math.Vector3 v) { return new Axiom.Math.Vector3(); }

-        public double llVecDist(Axiom.Math.Vector3 a, Axiom.Math.Vector3 b) { return 0; }

-        public Axiom.Math.Vector3 llRot2Euler(Axiom.Math.Quaternion r) { return new Axiom.Math.Vector3(); }

-        public Axiom.Math.Quaternion llEuler2Rot(Axiom.Math.Vector3 v) { return new Axiom.Math.Quaternion(); }

-        public Axiom.Math.Quaternion llAxes2Rot(Axiom.Math.Vector3 fwd, Axiom.Math.Vector3 left, Axiom.Math.Vector3 up) { return new Axiom.Math.Quaternion(); }

-        public Axiom.Math.Vector3 llRot2Fwd(Axiom.Math.Quaternion r) { return new Axiom.Math.Vector3(); }

-        public Axiom.Math.Vector3 llRot2Left(Axiom.Math.Quaternion r) { return new Axiom.Math.Vector3(); }

-        public Axiom.Math.Vector3 llRot2Up(Axiom.Math.Quaternion r) { return new Axiom.Math.Vector3(); }

-        public Axiom.Math.Quaternion llRotBetween(Axiom.Math.Vector3 start, Axiom.Math.Vector3 end) { return new Axiom.Math.Quaternion(); }

+        public double llVecMag(LSL_Types.Vector3 v) { return 0; }

+        public LSL_Types.Vector3 llVecNorm(LSL_Types.Vector3 v) { return new LSL_Types.Vector3(); }

+        public double llVecDist(LSL_Types.Vector3 a, LSL_Types.Vector3 b) { return 0; }

+        public LSL_Types.Vector3 llRot2Euler(LSL_Types.Quaternion r) { return new LSL_Types.Vector3(); }

+        public LSL_Types.Quaternion llEuler2Rot(LSL_Types.Vector3 v) { return new LSL_Types.Quaternion(); }

+        public LSL_Types.Quaternion llAxes2Rot(LSL_Types.Vector3 fwd, LSL_Types.Vector3 left, LSL_Types.Vector3 up) { return new LSL_Types.Quaternion(); }

+        public LSL_Types.Vector3 llRot2Fwd(LSL_Types.Quaternion r) { return new LSL_Types.Vector3(); }

+        public LSL_Types.Vector3 llRot2Left(LSL_Types.Quaternion r) { return new LSL_Types.Vector3(); }

+        public LSL_Types.Vector3 llRot2Up(LSL_Types.Quaternion r) { return new LSL_Types.Vector3(); }

+        public LSL_Types.Quaternion llRotBetween(LSL_Types.Vector3 start, LSL_Types.Vector3 end) { return new LSL_Types.Quaternion(); }

 

         public void llWhisper(int channelID, string text)

         {

@@ -112,57 +112,57 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler
         public string llDetectedKey(int number) { return ""; }

         public string llDetectedOwner(int number) { return ""; }

         public int llDetectedType(int number) { return 0; }

-        public Axiom.Math.Vector3 llDetectedPos(int number) { return new Axiom.Math.Vector3(); }

-        public Axiom.Math.Vector3 llDetectedVel(int number) { return new Axiom.Math.Vector3(); }

-        public Axiom.Math.Vector3 llDetectedGrab(int number) { return new Axiom.Math.Vector3(); }

-        public Axiom.Math.Quaternion llDetectedRot(int number) { return new Axiom.Math.Quaternion(); }

+        public LSL_Types.Vector3 llDetectedPos(int number) { return new LSL_Types.Vector3(); }

+        public LSL_Types.Vector3 llDetectedVel(int number) { return new LSL_Types.Vector3(); }

+        public LSL_Types.Vector3 llDetectedGrab(int number) { return new LSL_Types.Vector3(); }

+        public LSL_Types.Quaternion llDetectedRot(int number) { return new LSL_Types.Quaternion(); }

         public int llDetectedGroup(int number) { return 0; }

         public int llDetectedLinkNumber(int number) { return 0; }

         public void llDie() { return; }

-        public double llGround(Axiom.Math.Vector3 offset) { return 0; }

-        public double llCloud(Axiom.Math.Vector3 offset) { return 0; }

-        public Axiom.Math.Vector3 llWind(Axiom.Math.Vector3 offset) { return new Axiom.Math.Vector3(); }

+        public double llGround(LSL_Types.Vector3 offset) { return 0; }

+        public double llCloud(LSL_Types.Vector3 offset) { return 0; }

+        public LSL_Types.Vector3 llWind(LSL_Types.Vector3 offset) { return new LSL_Types.Vector3(); }

         public void llSetStatus(int status, int value) { return; }

         public int llGetStatus(int status) { return 0; }

-        public void llSetScale(Axiom.Math.Vector3 scale) { return; }

-        public Axiom.Math.Vector3 llGetScale() { return new Axiom.Math.Vector3(); }

-        public void llSetColor(Axiom.Math.Vector3 color, int face) { return; }

+        public void llSetScale(LSL_Types.Vector3 scale) { return; }

+        public LSL_Types.Vector3 llGetScale() { return new LSL_Types.Vector3(); }

+        public void llSetColor(LSL_Types.Vector3 color, int face) { return; }

         public double llGetAlpha(int face) { return 0; }

         public void llSetAlpha(double alpha, int face) { return; }

-        public Axiom.Math.Vector3 llGetColor(int face) { return new Axiom.Math.Vector3(); }

+        public LSL_Types.Vector3 llGetColor(int face) { return new LSL_Types.Vector3(); }

         public void llSetTexture(string texture, int face) { return; }

         public void llScaleTexture(double u, double v, int face) { return; }

         public void llOffsetTexture(double u, double v, int face) { return; }

         public void llRotateTexture(double rotation, int face) { return; }

         public string llGetTexture(int face) { return ""; }

-        public void llSetPos(Axiom.Math.Vector3 pos) { return; }

+        public void llSetPos(LSL_Types.Vector3 pos) { return; }

 

-        public Axiom.Math.Vector3 llGetPos()

+        public LSL_Types.Vector3 llGetPos()

         {

             throw new NotImplementedException("llGetPos");

             // return m_host.AbsolutePosition;

         }

 

-        public Axiom.Math.Vector3 llGetLocalPos() { return new Axiom.Math.Vector3(); }

-        public void llSetRot(Axiom.Math.Quaternion rot) { }

-        public Axiom.Math.Quaternion llGetRot() { return new Axiom.Math.Quaternion(); }

-        public Axiom.Math.Quaternion llGetLocalRot() { return new Axiom.Math.Quaternion(); }

-        public void llSetForce(Axiom.Math.Vector3 force, int local) { }

-        public Axiom.Math.Vector3 llGetForce() { return new Axiom.Math.Vector3(); }

-        public int llTarget(Axiom.Math.Vector3 position, double range) { return 0; }

+        public LSL_Types.Vector3 llGetLocalPos() { return new LSL_Types.Vector3(); }

+        public void llSetRot(LSL_Types.Quaternion rot) { }

+        public LSL_Types.Quaternion llGetRot() { return new LSL_Types.Quaternion(); }

+        public LSL_Types.Quaternion llGetLocalRot() { return new LSL_Types.Quaternion(); }

+        public void llSetForce(LSL_Types.Vector3 force, int local) { }

+        public LSL_Types.Vector3 llGetForce() { return new LSL_Types.Vector3(); }

+        public int llTarget(LSL_Types.Vector3 position, double range) { return 0; }

         public void llTargetRemove(int number) { }

-        public int llRotTarget(Axiom.Math.Quaternion rot, double error) { return 0; }

+        public int llRotTarget(LSL_Types.Quaternion rot, double error) { return 0; }

         public void llRotTargetRemove(int number) { }

-        public void llMoveToTarget(Axiom.Math.Vector3 target, double tau) { }

+        public void llMoveToTarget(LSL_Types.Vector3 target, double tau) { }

         public void llStopMoveToTarget() { }

-        public void llApplyImpulse(Axiom.Math.Vector3 force, int local) { }

-        public void llApplyRotationalImpulse(Axiom.Math.Vector3 force, int local) { }

-        public void llSetTorque(Axiom.Math.Vector3 torque, int local) { }

-        public Axiom.Math.Vector3 llGetTorque() { return new Axiom.Math.Vector3(); }

-        public void llSetForceAndTorque(Axiom.Math.Vector3 force, Axiom.Math.Vector3 torque, int local) { }

-        public Axiom.Math.Vector3 llGetVel() { return new Axiom.Math.Vector3(); }

-        public Axiom.Math.Vector3 llGetAccel() { return new Axiom.Math.Vector3(); }

-        public Axiom.Math.Vector3 llGetOmega() { return new Axiom.Math.Vector3(); }

+        public void llApplyImpulse(LSL_Types.Vector3 force, int local) { }

+        public void llApplyRotationalImpulse(LSL_Types.Vector3 force, int local) { }

+        public void llSetTorque(LSL_Types.Vector3 torque, int local) { }

+        public LSL_Types.Vector3 llGetTorque() { return new LSL_Types.Vector3(); }

+        public void llSetForceAndTorque(LSL_Types.Vector3 force, LSL_Types.Vector3 torque, int local) { }

+        public LSL_Types.Vector3 llGetVel() { return new LSL_Types.Vector3(); }

+        public LSL_Types.Vector3 llGetAccel() { return new LSL_Types.Vector3(); }

+        public LSL_Types.Vector3 llGetOmega() { return new LSL_Types.Vector3(); }

         public double llGetTimeOfDay() { return 0; }

         public double llGetWallclock() { return 0; }

         public double llGetTime() { return 0; }

@@ -187,8 +187,8 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler
         public void llMakeFountain() { }

         public void llMakeSmoke() { }

         public void llMakeFire() { }

-        public void llRezObject(string inventory, Axiom.Math.Vector3 pos, Axiom.Math.Quaternion rot, int param) { }

-        public void llLookAt(Axiom.Math.Vector3 target, double strength, double damping) { }

+        public void llRezObject(string inventory, LSL_Types.Vector3 pos, LSL_Types.Quaternion rot, int param) { }

+        public void llLookAt(LSL_Types.Vector3 target, double strength, double damping) { }

         public void llStopLookAt() { }

         public void llSetTimerEvent(double sec) { }

         public void llSleep(double sec) { System.Threading.Thread.Sleep((int)(sec * 1000)); }

@@ -210,7 +210,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler
         public void llStopHover() { }

         public void llMinEventDelay(double delay) { }

         public void llSoundPreload() { }

-        public void llRotLookAt(Axiom.Math.Quaternion target, double strength, double damping) { }

+        public void llRotLookAt(LSL_Types.Quaternion target, double strength, double damping) { }

 

         public int llStringLength(string str)

         {

@@ -228,14 +228,14 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler
         public void llStopAnimation(string anim) { }

         public void llPointAt() { }

         public void llStopPointAt() { }

-        public void llTargetOmega(Axiom.Math.Vector3 axis, double spinrate, double gain) { }

+        public void llTargetOmega(LSL_Types.Vector3 axis, double spinrate, double gain) { }

         public int llGetStartParameter() { return 0; }

-        public void llGodLikeRezObject(string inventory, Axiom.Math.Vector3 pos) { }

+        public void llGodLikeRezObject(string inventory, LSL_Types.Vector3 pos) { }

         public void llRequestPermissions(string agent, int perm) { }

         public string llGetPermissionsKey() { return ""; }

         public int llGetPermissions() { return 0; }

         public int llGetLinkNumber() { return 0; }

-        public void llSetLinkColor(int linknumber, Axiom.Math.Vector3 color, int face) { }

+        public void llSetLinkColor(int linknumber, LSL_Types.Vector3 color, int face) { }

         public void llCreateLink(string target, int parent) { }

         public void llBreakLink(int linknum) { }

         public void llBreakAllLinks() { }

@@ -248,12 +248,13 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler
         public void llGiveInventory(string destination, string inventory) { }

         public void llRemoveInventory(string item) { }

 

-        public void llSetText(string text, Axiom.Math.Vector3 color, double alpha)

+        public void llSetText(string text, LSL_Types.Vector3 color, double alpha)

         {

-            m_host.SetText(text, color, alpha);

+            // TEMP DISABLED UNTIL WE CAN AGREE UPON VECTOR/ROTATION FORMAT

+            //m_host.SetText(text, color, alpha);

         }

 

-        public double llWater(Axiom.Math.Vector3 offset) { return 0; }

+        public double llWater(LSL_Types.Vector3 offset) { return 0; }

         public void llPassTouches(int pass) { }

         public string llRequestAgentData(string id, int data) { return ""; }

         public string llRequestInventoryData(string name) { return ""; }

@@ -265,25 +266,25 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler
         public string llGetAnimation(string id) { return ""; }

         public void llResetScript() { }

         public void llMessageLinked(int linknum, int num, string str, string id) { }

-        public void llPushObject(string target, Axiom.Math.Vector3 impulse, Axiom.Math.Vector3 ang_impulse, int local) { }

+        public void llPushObject(string target, LSL_Types.Vector3 impulse, LSL_Types.Vector3 ang_impulse, int local) { }

         public void llPassCollisions(int pass) { }

         public string llGetScriptName() { return ""; }

         public int llGetNumberOfSides() { return 0; }

-        public Axiom.Math.Quaternion llAxisAngle2Rot(Axiom.Math.Vector3 axis, double angle) { return new Axiom.Math.Quaternion(); }

-        public Axiom.Math.Vector3 llRot2Axis(Axiom.Math.Quaternion rot) { return new Axiom.Math.Vector3(); }

+        public LSL_Types.Quaternion llAxisAngle2Rot(LSL_Types.Vector3 axis, double angle) { return new LSL_Types.Quaternion(); }

+        public LSL_Types.Vector3 llRot2Axis(LSL_Types.Quaternion rot) { return new LSL_Types.Vector3(); }

         public void llRot2Angle() { }

         public double llAcos(double val) { return (double)Math.Acos(val); }

         public double llAsin(double val) { return (double)Math.Asin(val); }

-        public double llAngleBetween(Axiom.Math.Quaternion a, Axiom.Math.Quaternion b) { return 0; }

+        public double llAngleBetween(LSL_Types.Quaternion a, LSL_Types.Quaternion b) { return 0; }

         public string llGetInventoryKey(string name) { return ""; }

         public void llAllowInventoryDrop(int add) { }

-        public Axiom.Math.Vector3 llGetSunDirection() { return new Axiom.Math.Vector3(); }

-        public Axiom.Math.Vector3 llGetTextureOffset(int face) { return new Axiom.Math.Vector3(); }

-        public Axiom.Math.Vector3 llGetTextureScale(int side) { return new Axiom.Math.Vector3(); }

+        public LSL_Types.Vector3 llGetSunDirection() { return new LSL_Types.Vector3(); }

+        public LSL_Types.Vector3 llGetTextureOffset(int face) { return new LSL_Types.Vector3(); }

+        public LSL_Types.Vector3 llGetTextureScale(int side) { return new LSL_Types.Vector3(); }

         public double llGetTextureRot(int side) { return 0; }

         public int llSubStringIndex(string source, string pattern) { return 0; }

         public string llGetOwnerKey(string id) { return ""; }

-        public Axiom.Math.Vector3 llGetCenterOfMass() { return new Axiom.Math.Vector3(); }

+        public LSL_Types.Vector3 llGetCenterOfMass() { return new LSL_Types.Vector3(); }

         public List<string> llListSort(List<string> src, int stride, int ascending)

         { return new List<string>(); }

         public int llGetListLength(List<string> src) { return 0; }

@@ -291,10 +292,10 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler
         public double llList2double(List<string> src, int index) { return 0; }

         public string llList2String(List<string> src, int index) { return ""; }

         public string llList2Key(List<string> src, int index) { return ""; }

-        public Axiom.Math.Vector3 llList2Vector(List<string> src, int index)

-        { return new Axiom.Math.Vector3(); }

-        public Axiom.Math.Quaternion llList2Rot(List<string> src, int index)

-        { return new Axiom.Math.Quaternion(); }

+        public LSL_Types.Vector3 llList2Vector(List<string> src, int index)

+        { return new LSL_Types.Vector3(); }

+        public LSL_Types.Quaternion llList2Rot(List<string> src, int index)

+        { return new LSL_Types.Quaternion(); }

         public List<string> llList2List(List<string> src, int start, int end)

         { return new List<string>(); }

         public List<string> llDeleteSubList(List<string> src, int start, int end)

@@ -307,33 +308,33 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler
         { return new List<string>(); }

         public List<string> llList2ListStrided(List<string> src, int start, int end, int stride)

         { return new List<string>(); }

-        public Axiom.Math.Vector3 llGetRegionCorner()

-        { return new Axiom.Math.Vector3(World.RegionInfo.RegionLocX * 256, World.RegionInfo.RegionLocY * 256, 0); }

+        public LSL_Types.Vector3 llGetRegionCorner()

+        { return new LSL_Types.Vector3(World.RegionInfo.RegionLocX * 256, World.RegionInfo.RegionLocY * 256, 0); }

         public List<string> llListInsertList(List<string> dest, List<string> src, int start)

         { return new List<string>(); }

         public int llListFindList(List<string> src, List<string> test) { return 0; }

         public string llGetObjectName() { return ""; }

         public void llSetObjectName(string name) { }

         public string llGetDate() { return ""; }

-        public int llEdgeOfWorld(Axiom.Math.Vector3 pos, Axiom.Math.Vector3 dir) { return 0; }

+        public int llEdgeOfWorld(LSL_Types.Vector3 pos, LSL_Types.Vector3 dir) { return 0; }

         public int llGetAgentInfo(string id) { return 0; }

         public void llAdjustSoundVolume(double volume) { }

         public void llSetSoundQueueing(int queue) { }

         public void llSetSoundRadius(double radius) { }

         public string llKey2Name(string id) { return ""; }

         public void llSetTextureAnim(int mode, int face, int sizex, int sizey, double start, double length, double rate) { }

-        public void llTriggerSoundLimited(string sound, double volume, Axiom.Math.Vector3 top_north_east, Axiom.Math.Vector3 bottom_south_west) { }

+        public void llTriggerSoundLimited(string sound, double volume, LSL_Types.Vector3 top_north_east, LSL_Types.Vector3 bottom_south_west) { }

         public void llEjectFromLand(string pest) { }

         public void llParseString2List() { }

         public int llOverMyLand(string id) { return 0; }

-        public string llGetLandOwnerAt(Axiom.Math.Vector3 pos) { return ""; }

+        public string llGetLandOwnerAt(LSL_Types.Vector3 pos) { return ""; }

         public string llGetNotecardLine(string name, int line) { return ""; }

-        public Axiom.Math.Vector3 llGetAgentSize(string id) { return new Axiom.Math.Vector3(); }

+        public LSL_Types.Vector3 llGetAgentSize(string id) { return new LSL_Types.Vector3(); }

         public int llSameGroup(string agent) { return 0; }

         public void llUnSit(string id) { }

-        public Axiom.Math.Vector3 llGroundSlope(Axiom.Math.Vector3 offset) { return new Axiom.Math.Vector3(); }

-        public Axiom.Math.Vector3 llGroundNormal(Axiom.Math.Vector3 offset) { return new Axiom.Math.Vector3(); }

-        public Axiom.Math.Vector3 llGroundContour(Axiom.Math.Vector3 offset) { return new Axiom.Math.Vector3(); }

+        public LSL_Types.Vector3 llGroundSlope(LSL_Types.Vector3 offset) { return new LSL_Types.Vector3(); }

+        public LSL_Types.Vector3 llGroundNormal(LSL_Types.Vector3 offset) { return new LSL_Types.Vector3(); }

+        public LSL_Types.Vector3 llGroundContour(LSL_Types.Vector3 offset) { return new LSL_Types.Vector3(); }

         public int llGetAttached() { return 0; }

         public int llGetFreeMemory() { return 0; }

         public string llGetRegionName() { return m_manager.RegionName; }

@@ -344,11 +345,11 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler
         public void llGiveInventoryList() { }

         public void llSetVehicleType(int type) { }

         public void llSetVehicledoubleParam(int param, double value) { }

-        public void llSetVehicleVectorParam(int param, Axiom.Math.Vector3 vec) { }

-        public void llSetVehicleRotationParam(int param, Axiom.Math.Quaternion rot) { }

+        public void llSetVehicleVectorParam(int param, LSL_Types.Vector3 vec) { }

+        public void llSetVehicleRotationParam(int param, LSL_Types.Quaternion rot) { }

         public void llSetVehicleFlags(int flags) { }

         public void llRemoveVehicleFlags(int flags) { }

-        public void llSitTarget(Axiom.Math.Vector3 offset, Axiom.Math.Quaternion rot) { }

+        public void llSitTarget(LSL_Types.Vector3 offset, LSL_Types.Quaternion rot) { }

         public string llAvatarOnSitTarget() { return ""; }

         public void llAddToLandPassList(string avatar, double hours) { }

         public void llSetTouchText(string text)

@@ -358,10 +359,10 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler
         public void llSetSitText(string text)

         {

         }

-        public void llSetCameraEyeOffset(Axiom.Math.Vector3 offset) { }

-        public void llSetCameraAtOffset(Axiom.Math.Vector3 offset) { }

+        public void llSetCameraEyeOffset(LSL_Types.Vector3 offset) { }

+        public void llSetCameraAtOffset(LSL_Types.Vector3 offset) { }

         public void llDumpList2String() { }

-        public void llScriptDanger(Axiom.Math.Vector3 pos) { }

+        public void llScriptDanger(LSL_Types.Vector3 pos) { }

         public void llDialog(string avatar, string message, List<string> buttons, int chat_channel) { }

         public void llVolumeDetect(int detect) { }

         public void llResetOtherScript(string name) { }

@@ -387,15 +388,15 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler
         public List<string> llGetAnimationList(string id) { return new List<string>(); }

         public void llSetParcelMusicURL(string url) { }

 

-        public Axiom.Math.Vector3 llGetRootPosition()

+        public LSL_Types.Vector3 llGetRootPosition()

         {

             throw new NotImplementedException("llGetRootPosition");

             //return m_root.AbsolutePosition;

         }

 

-        public Axiom.Math.Quaternion llGetRootRotation()

+        public LSL_Types.Quaternion llGetRootRotation()

         {

-            return new Axiom.Math.Quaternion();

+            return new LSL_Types.Quaternion();

         }

 

         public string llGetObjectDesc() { return ""; }

@@ -406,16 +407,16 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler
         public int llGetNumberOfPrims() { return 0; }

         public string llGetNumberOfNotecardLines(string name) { return ""; }

         public List<string> llGetBoundingBox(string obj) { return new List<string>(); }

-        public Axiom.Math.Vector3 llGetGeometricCenter() { return new Axiom.Math.Vector3(); }

+        public LSL_Types.Vector3 llGetGeometricCenter() { return new LSL_Types.Vector3(); }

         public void llGetPrimitiveParams() { }

         public string llIntegerToBase64(int number) { return ""; }

         public int llBase64ToInteger(string str) { return 0; }

         public double llGetGMTclock() { return 0; }

         public string llGetSimulatorHostname() { return ""; }

-        public void llSetLocalRot(Axiom.Math.Quaternion rot) { }

+        public void llSetLocalRot(LSL_Types.Quaternion rot) { }

         public List<string> llParseStringKeepNulls(string src, List<string> seperators, List<string> spacers)

         { return new List<string>(); }

-        public void llRezAtRoot(string inventory, Axiom.Math.Vector3 position, Axiom.Math.Vector3 velocity, Axiom.Math.Quaternion rot, int param) { }

+        public void llRezAtRoot(string inventory, LSL_Types.Vector3 position, LSL_Types.Vector3 velocity, LSL_Types.Quaternion rot, int param) { }

         public int llGetObjectPermMask(int mask) { return 0; }

         public void llSetObjectPermMask(int mask, int value) { }

         public void llGetInventoryPermMask(string item, int mask) { }

@@ -440,13 +441,13 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler
 

         public int llGetInventoryType(string name) { return 0; }

         public void llSetPayPrice(int price, List<string> quick_pay_buttons) { }

-        public Axiom.Math.Vector3 llGetCameraPos() { return new Axiom.Math.Vector3(); }

-        public Axiom.Math.Quaternion llGetCameraRot() { return new Axiom.Math.Quaternion(); }

+        public LSL_Types.Vector3 llGetCameraPos() { return new LSL_Types.Vector3(); }

+        public LSL_Types.Quaternion llGetCameraRot() { return new LSL_Types.Quaternion(); }

         public void llSetPrimURL() { }

         public void llRefreshPrimURL() { }

         public string llEscapeURL(string url) { return ""; }

         public string llUnescapeURL(string url) { return ""; }

-        public void llMapDestination(string simname, Axiom.Math.Vector3 pos, Axiom.Math.Vector3 look_at) { }

+        public void llMapDestination(string simname, LSL_Types.Vector3 pos, LSL_Types.Vector3 look_at) { }

         public void llAddToLandBanList(string avatar, double hours) { }

         public void llRemoveFromLandPassList(string avatar) { }

         public void llRemoveFromLandBanList(string avatar) { }

@@ -457,17 +458,17 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler
         {

             return OpenSim.Framework.Utilities.Util.UnixTimeSinceEpoch();

         }

-        public int llGetParcelFlags(Axiom.Math.Vector3 pos) { return 0; }

+        public int llGetParcelFlags(LSL_Types.Vector3 pos) { return 0; }

         public int llGetRegionFlags() { return 0; }

         public string llXorBase64StringsCorrect(string str1, string str2) { return ""; }

         public void llHTTPRequest() { }

         public void llResetLandBanList() { }

         public void llResetLandPassList() { }

-        public int llGetParcelPrimCount(Axiom.Math.Vector3 pos, int category, int sim_wide) { return 0; }

-        public List<string> llGetParcelPrimOwners(Axiom.Math.Vector3 pos) { return new List<string>(); }

+        public int llGetParcelPrimCount(LSL_Types.Vector3 pos, int category, int sim_wide) { return 0; }

+        public List<string> llGetParcelPrimOwners(LSL_Types.Vector3 pos) { return new List<string>(); }

         public int llGetObjectPrimCount(string object_id) { return 0; }

-        public int llGetParcelMaxPrims(Axiom.Math.Vector3 pos, int sim_wide) { return 0; }

-        public List<string> llGetParcelDetails(Axiom.Math.Vector3 pos, List<string> param) { return new List<string>(); }

+        public int llGetParcelMaxPrims(LSL_Types.Vector3 pos, int sim_wide) { return 0; }

+        public List<string> llGetParcelDetails(LSL_Types.Vector3 pos, List<string> param) { return new List<string>(); }

 

 

     }

diff --git a/prebuild.xml b/prebuild.xml
index 7f4a45e..c358142 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -954,7 +954,6 @@
       <Reference name="System" localCopy="false"/>
       <Reference name="System.Data" localCopy="false"/>
       <Reference name="System.Xml" localCopy="false"/>
-      <Reference name="Axiom.MathLib.dll" localCopy="false"/>
       <Files>
         <Match pattern="*.cs" recurse="true"/>
       </Files>
@@ -981,7 +980,6 @@
       <Reference name="System.Xml" localCopy="false"/>
       <Reference name="System.Runtime.Remoting" localCopy="false"/>
       <Reference name="OpenSim.Region.Environment" />
-      <Reference name="Axiom.MathLib.dll" localCopy="false"/>
       <Reference name="libsecondlife.dll"/>
       <Reference name="RAIL.dll"/>
       <Reference name="OpenSim.Framework"/>