Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | refactor: In llCollisionSound() use existing GetInventoryItem() method ↵ | Justin Clark-Casey (justincc) | 2012-07-04 | 1 | -11/+5 | |
| | | | | | | | | | | | | | | | | | | | | rather than have it iterate through TaskInventory itself. | |||||
| * | | | | refactor: In llRemoveInventory() use existing GetInventoryItem() method ↵ | Justin Clark-Casey (justincc) | 2012-07-04 | 1 | -14/+9 | |
| | | | | | | | | | | | | | | | | | | | | rather than have it iterate through TaskInventory itself. | |||||
| * | | | | refactor: make llGiveInventory() use existing GetInventoryItem() method ↵ | Justin Clark-Casey (justincc) | 2012-07-04 | 1 | -24/+11 | |
| | | | | | | | | | | | | | | | | | | | | rather than iterate through TaskInventory itself. | |||||
* | | | | | Merge branch 'master' into careminster | Melanie | 2012-06-29 | 1 | -9/+6 | |
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/Framework/Scenes/Scene.cs | |||||
| * | | | | Change AttachmentsModule.DetachSingleAttachmentToInv() to accept a SOG ↵ | Justin Clark-Casey (justincc) | 2012-06-28 | 1 | -9/+6 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | directly instead of an item ID to then shuffle through attachments, saving CPU busywork. Almost all callers already had the sog to hand. Still checking that it's really an attachment, but now by inspecting SOG.AttachedAvatar | |||||
* | | | | | Merge branch 'avination' into careminster | Melanie | 2012-06-29 | 3 | -3/+6 | |
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/HttpServer/PollServiceWorkerThread.cs | |||||
| * | | | | Return NPC instead of AGENT in the detect parameters for touch, collision and | Melanie | 2012-06-28 | 1 | -0/+2 | |
| | |_|/ | |/| | | | | | | | | | | sensor. | |||||
| * | | | Disable physics raycast until it can be seen to. Fix distance calculation | Melanie | 2012-06-26 | 1 | -2/+3 | |
| | | | | | | | | | | | | | | | | for some results. | |||||
| * | | | Correct a wrong error constant | Melanie | 2012-06-26 | 1 | -1/+1 | |
| | |/ | |/| | ||||||
* | | | Revert "Mantis 5977 Corrections to llRegionSayTo" | Melanie | 2012-06-28 | 1 | -6/+4 | |
| | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 679da63da617d031e5e7ae3f2d2a29db1a23ace3. Conflicts: OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs | |||||
* | | | Merge branch 'master' into careminster | Melanie | 2012-06-28 | 1 | -5/+5 | |
|\ \ \ | | |/ | |/| | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs | |||||
| * | | Add stub for llCastRay | BlueWall | 2012-06-26 | 1 | -0/+5 | |
| | | | ||||||
* | | | Merge branch 'master' into careminster | Melanie | 2012-06-26 | 2 | -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" behavior | BlueWall | 2012-06-23 | 2 | -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-21 | 1 | -5/+5 | |
| | | | | | | | | | | | | | | | | | | loading fails. Drop logging about memory limit exceeded to warn from error | |||||
| * | | Retrigger build - last jenkins run was glitched | Justin Clark-Casey (justincc) | 2012-06-21 | 1 | -1/+2 | |
| | | | ||||||
| * | | Add state file location to errors logged when there's some issue with ↵ | Justin Clark-Casey (justincc) | 2012-06-21 | 1 | -4/+4 | |
| | | | | | | | | | | | | retrieving state (e.g. exceeds memory limit) | |||||
* | | | Merge branch 'avination' into careminster | Melanie | 2012-06-15 | 1 | -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, not | Melanie | 2012-06-15 | 1 | -1/+1 | |
| | | | | | | | | | | | | form | |||||
| * | | Revert changes... | UbitUmarov | 2012-06-15 | 1 | -55/+34 | |
| | | | | | | | | | | | | This reverts commit c8227e1bb70817351de283fb647ec39f090fc9f1. | |||||
| * | | SL doesn't let scripts rotate root part of physical linksets also fix ↵ | UbitUmarov | 2012-06-15 | 1 | -16/+27 | |
| | | | | | | | | | | | | sitting avatars rotations broken in previus commit, forcing send of updates. | |||||
| * | | only rotation of root part change parts positions, so only call ↵ | UbitUmarov | 2012-06-15 | 1 | -21/+31 | |
| | | | | | | | | | | | | ResetChildPrimPhysicsPositions() if root part. Plus 'cosmetics' | |||||
| * | | Merge branch 'avination' into ubitwork | UbitUmarov | 2012-06-13 | 1 | -3/+11 | |
| |\ \ | ||||||
| | * | | Add detecting non-physical phantoms back into raycast | Melanie | 2012-06-13 | 1 | -3/+11 | |
| | | | | ||||||
| * | | | Changed t adding the avatar dependent sit offset and not subtracting, so ↵ | UbitUmarov | 2012-06-13 | 1 | -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 ↵ | UbitUmarov | 2012-06-13 | 1 | -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 ↵ | UbitUmarov | 2012-06-13 | 1 | -9/+23 | |
| | | | | | | | | | | | | | | | | 'cosmetics' and added some parts costs information. | |||||
| * | | | *TEST this will affect inworld sittargets by +-0.1m, so may be very BAD *. ↵ | UbitUmarov | 2012-06-13 | 1 | -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 ↵ | UbitUmarov | 2012-06-12 | 1 | -3/+10 | |
| | | | | | | | | | | | | | | | | cases | |||||
| * | | | fix the try.. finally in SetPrimitiveParams i did mess and add one for the ↵ | UbitUmarov | 2012-06-12 | 1 | -188/+156 | |
| | | | | | | | | | | | | | | | | avatars case, so to optimize a bit 'warp' scripts. | |||||
| * | | | more changes to Get and Get primitiveparams: Let Get remove avatarheight ↵ | UbitUmarov | 2012-06-12 | 1 | -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 ↵ | UbitUmarov | 2012-06-12 | 1 | -5/+22 | |
| | | | | | | | | | | | | | | | | only used on one place each | |||||
| * | | | *UNTESTED* extended llGet*PrimitiveParam() to support avatars. Some auxiliar ↵ | UbitUmarov | 2012-06-12 | 1 | -3/+238 | |
| | | | | | | | | | | | | | | | | code in SOP.cs | |||||
| * | | | Merge branch 'avination' into ubitwork | UbitUmarov | 2012-06-11 | 3 | -5/+73 | |
| |\ \ \ | | |/ / | ||||||
| * | | | *UNTESTED* fix PRIM_LINK_TARGET. Make it work on avatars, set any pending ↵ | UbitUmarov | 2012-06-08 | 1 | -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 ↵ | UbitUmarov | 2012-06-08 | 1 | -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 ↵ | UbitUmarov | 2012-06-08 | 1 | -6/+46 | |
| | | | | | | | | | | | | | | | | avatars. Stopped setting position twice in normal SetPrimParams | |||||
* | | | | Merge branch 'master' into careminster | Melanie | 2012-06-14 | 2 | -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-13 | 1 | -1/+6 | |
| | | | | | | | | | | | | | | | | return "Configuration Error", as already happens if there is no GridInfoURI | |||||
| * | | | Committing the Avination implementation of llCastRay. This is a complete rewrite | Melanie | 2012-06-13 | 1 | -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-11 | 1 | -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/opensim | Justin Clark-Casey (justincc) | 2012-06-11 | 3 | -0/+106 | |
| |\ \ \ | ||||||
| | * | | | Commitig the Avination implementation of llTeleportAgent and | Melanie | 2012-06-11 | 3 | -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-09 | 1 | -3978/+3956 | |
| |/ / / | | | | | | | | | | | | | | | | | | | | | where these aren't evaluated propertly. Addresses http://opensimulator.org/mantis/view.php?id=3268 | |||||
* | | | | Merge branch 'avination' into careminster | Melanie | 2012-06-11 | 3 | -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 ↵ | Melanie | 2012-06-08 | 3 | -5/+73 | |
| | |/ | |/| | | | | | | | llTeleportAgentGlobalCoords() | |||||
* | | | Merge branch 'avination' into careminster | Melanie | 2012-06-07 | 1 | -0/+2 | |
|\ \ \ | |/ / | ||||||
| * | | Typo correction | Melanie | 2012-06-07 | 1 | -1/+1 | |
| | | | ||||||
| * | | Set collision sound type so custom sound types are recognized | Melanie | 2012-06-07 | 1 | -0/+2 | |
| | | | ||||||
| * | | Prevent a null ref when getting the velocity of an avatar during login or | Melanie | 2012-06-07 | 1 | -2/+3 | |
| | | | | | | | | | | | | logout. |