aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Merge branch 'master' into careminsterMelanie2012-06-262-6/+27
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
| * | Fix script "Running" behaviorBlueWall2012-06-232-0/+20
| | | | | | | | | | | | Unchecking "Running" box in script editor now persists. This fixes http://opensimulator.org/mantis/view.php?id=6057
| * | Add item id, name, prim name and id to log message when state exists but ↵Justin Clark-Casey (justincc)2012-06-211-5/+5
| | | | | | | | | | | | | | | | | | loading fails. Drop logging about memory limit exceeded to warn from error
| * | Retrigger build - last jenkins run was glitchedJustin Clark-Casey (justincc)2012-06-211-1/+2
| | |
| * | Add state file location to errors logged when there's some issue with ↵Justin Clark-Casey (justincc)2012-06-211-4/+4
| | | | | | | | | | | | retrieving state (e.g. exceeds memory limit)
* | | Merge branch 'avination' into careminsterMelanie2012-06-151-92/+579
|\ \ \ | | |/ | |/| | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * | Reapply the one change that was in the revert that was actually function, notMelanie2012-06-151-1/+1
| | | | | | | | | | | | form
| * | Revert changes...UbitUmarov2012-06-151-55/+34
| | | | | | | | | | | | This reverts commit c8227e1bb70817351de283fb647ec39f090fc9f1.
| * | SL doesn't let scripts rotate root part of physical linksets also fix ↵UbitUmarov2012-06-151-16/+27
| | | | | | | | | | | | sitting avatars rotations broken in previus commit, forcing send of updates.
| * | only rotation of root part change parts positions, so only call ↵UbitUmarov2012-06-151-21/+31
| | | | | | | | | | | | ResetChildPrimPhysicsPositions() if root part. Plus 'cosmetics'
| * | Merge branch 'avination' into ubitworkUbitUmarov2012-06-131-3/+11
| |\ \
| | * | Add detecting non-physical phantoms back into raycastMelanie2012-06-131-3/+11
| | | |
| * | | Changed t adding the avatar dependent sit offset and not subtracting, so ↵UbitUmarov2012-06-131-25/+42
| | | | | | | | | | | | | | | | not to break inworld contents. SL ported scripts will show a sit error around 0.1m. Added respective compensation in LSL api to maintain coerence. Fixed several bugs still on SET/GET[link]PrimitiveParams[fast] and llGetObjectDetails()
| * | | convert a LSL rotation of <0,0,0,0> to <0,0,0,1> and not <0,0,1,0> in ↵UbitUmarov2012-06-131-1/+1
| | | | | | | | | | | | | | | | SitTarget. Something seems to be doing that before this gets called, but just in case...
| * | | Fixed llGetObjectDetails(), OBJECT_ROT for sitting avatars case, plus ↵UbitUmarov2012-06-131-9/+23
| | | | | | | | | | | | | | | | 'cosmetics' and added some parts costs information.
| * | | *TEST this will affect inworld sittargets by +-0.1m, so may be very BAD *. ↵UbitUmarov2012-06-131-9/+17
| | | | | | | | | | | | | | | | Changed the sign of the sitoffset dependent on avatar size in SP.cs. Removed that offset correction from SET/GET..primitiveParams in LSL api. If the sign needs to be the previus one, then all references to avatar positions on LSL api need to be fixed with that correction, not only SET/GETprimitiveParams.
| * | | try to replicate SL bug of PRIM_ROTATION also for avas, est a fix to other ↵UbitUmarov2012-06-121-3/+10
| | | | | | | | | | | | | | | | cases
| * | | fix the try.. finally in SetPrimitiveParams i did mess and add one for the ↵UbitUmarov2012-06-121-188/+156
| | | | | | | | | | | | | | | | avatars case, so to optimize a bit 'warp' scripts.
| * | | more changes to Get and Get primitiveparams: Let Get remove avatarheight ↵UbitUmarov2012-06-121-26/+94
| | | | | | | | | | | | | | | | adjust,add Get PRIM_LINK_TARGET handling, changed avatar Set positions code...
| * | | Moved auxiliar funtions of last commit from sop to lsl api since they are ↵UbitUmarov2012-06-121-5/+22
| | | | | | | | | | | | | | | | only used on one place each
| * | | *UNTESTED* extended llGet*PrimitiveParam() to support avatars. Some auxiliar ↵UbitUmarov2012-06-121-3/+238
| | | | | | | | | | | | | | | | code in SOP.cs
| * | | Merge branch 'avination' into ubitworkUbitUmarov2012-06-113-5/+73
| |\ \ \ | | |/ /
| * | | *UNTESTED* fix PRIM_LINK_TARGET. Make it work on avatars, set any pending ↵UbitUmarov2012-06-081-7/+37
| | | | | | | | | | | | | | | | position change on others; don't assume m_host is in same grp that part (possible always is)...
| * | | *UNTESTED* let SetPrimParams for avatars parse even unsupported parameters ↵UbitUmarov2012-06-081-2/+84
| | | | | | | | | | | | | | | | so that if a supported one is in the middle of then it still works.
| * | | *UNTESTED* added PRIM_POS_LOCAL and PRIM_ROT_LOCAL in SetPrimParams for ↵UbitUmarov2012-06-081-6/+46
| | | | | | | | | | | | | | | | avatars. Stopped setting position twice in normal SetPrimParams
* | | | Merge branch 'master' into careminsterMelanie2012-06-142-3/+8
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * | | In the osGetGrid functions, if the [GridInfo] section does not exist then ↵Justin Clark-Casey (justincc)2012-06-131-1/+6
| | | | | | | | | | | | | | | | return "Configuration Error", as already happens if there is no GridInfoURI
| * | | Committing the Avination implementation of llCastRay. This is a complete rewriteMelanie2012-06-131-100/+345
| | | | | | | | | | | | | | | | wich does it's thing independently of physics. Enjoy!
| * | | Revert "Bind ~ and ! operators in LSL tighter in order to resolve issues in ↵Justin Clark-Casey (justincc)2012-06-111-3956/+3978
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | LSL where these aren't evaluated propertly." This reverts commit a8a9d13dc07bc9e23ebf439cbea5ece6ae002315. Accidentally committed, this patch might not be the correct approach.
| * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-06-113-0/+106
| |\ \ \
| | * | | Commitig the Avination implementation of llTeleportAgent andMelanie2012-06-113-0/+106
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | llTeleportAgentGlobalCoords. These do NOT use PERMISSION_TELEPORT like their SL counterparts because that permission is not yet understood by TPVs based on v1.x.
| * | | | Bind ~ and ! operators in LSL tighter in order to resolve issues in LSL ↵Justin Clark-Casey (justincc)2012-06-091-3978/+3956
| |/ / / | | | | | | | | | | | | | | | | | | | | where these aren't evaluated propertly. Addresses http://opensimulator.org/mantis/view.php?id=3268
* | | | Merge branch 'avination' into careminsterMelanie2012-06-113-5/+73
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Interfaces/ISimulationDataService.cs OpenSim/Services/Connectors/Simulation/SimulationDataService.cs OpenSim/Tests/Common/Mock/MockRegionDataPlugin.cs
| * | | Make llTeleportAgent conform to Magnum SL Server and add ↵Melanie2012-06-083-5/+73
| | |/ | |/| | | | | | | llTeleportAgentGlobalCoords()
* | | Merge branch 'avination' into careminsterMelanie2012-06-071-0/+2
|\ \ \ | |/ /
| * | Typo correctionMelanie2012-06-071-1/+1
| | |
| * | Set collision sound type so custom sound types are recognizedMelanie2012-06-071-0/+2
| | |
| * | Prevent a null ref when getting the velocity of an avatar during login orMelanie2012-06-071-2/+3
| | | | | | | | | | | | logout.
* | | Remove a null ref when an avatar's attachment gets the avatar velocityMelanie2012-06-061-4/+3
| | | | | | | | | | | | | | | | | | while the avatar is logging in or out. Also remove some unlocking calls without matching locking call. Merge artefact cleanup, again.
* | | Merge branch 'avination' into careminsterMelanie2012-06-061-3/+4
|\ \ \ | |/ / | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * | revert last bad commit but fix recoil directionUbitUmarov2012-06-051-4/+4
| | |
| * | Stop llRezAtRoot() from applying velocity setting impulse in ↵UbitUmarov2012-06-051-2/+3
| | | | | | | | | | | | World.RezObject, doing it only in itself, so its applyed after resuming scripts etc. It was giving twice the requested velocity.
| * | Fix llAttachToAvatar and "Attach" viewer option to preserve saved attach ↵Melanie2012-06-041-1/+1
| | | | | | | | | | | | positions.
* | | Merge branch 'master' into careminsterMelanie2012-06-061-1/+0
|\ \ \ | | |/ | |/| | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
| * | Remove unused ScenePresence list structure in llGetAgentList()Justin Clark-Casey (justincc)2012-06-051-1/+0
| | |
* | | Merge branch 'avination' into careminsterMelanie2012-06-021-7/+33
|\ \ \ | | |/ | |/| | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * | Fix LSL animation state reporting and animation state transitions on crossingMelanie2012-06-011-7/+33
| | |
* | | Merge branch 'avination' into careminsterMelanie2012-05-311-0/+4
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * | Prevent multiple requests to go physical from reaching the physics pluginMelanie2012-05-301-0/+4
| | |
* | | Merge branch 'master' into careminsterMelanie2012-05-272-78/+83
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Data/MySQL/Resources/RegionStore.migrations OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs