Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'avination' into careminster | Melanie | 2012-07-06 | 3 | -46/+191 |
|\ | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | ||||
| * | added llSetVelocity. will refuse to work on vehicles and on attachments ( ↵ | UbitUmarov | 2012-07-06 | 3 | -1/+29 |
| | | | | | | | | this last may need fix) added also some code for llSetAngularVelocity but not working still | ||||
| * | Add an EventType enum and Type field to the poll service event args. This allows | Melanie | 2012-07-05 | 1 | -1/+1 |
| | | | | | | | | | | the manager to tell what type of event it is. All events except for lsl http in go to the "slow queue" which is run once per second as before. | ||||
| * | Implement the buggy version of llXorBase64Strings() for compatibility's sake | Melanie | 2012-07-02 | 1 | -3/+84 |
| | | |||||
| * | Bring casing of llSHA1String in line with SL | Melanie | 2012-07-01 | 1 | -1/+1 |
| | | |||||
| * | don't recoil attachments doing llRezObject() | UbitUmarov | 2012-06-29 | 1 | -2/+8 |
| | | |||||
| * | Merge branch 'avination' into ubitwork | UbitUmarov | 2012-06-29 | 1 | -0/+2 |
| |\ | |||||
| * | | reactivate physics raycasts on llCastRay() until it's clear what is its ↵ | UbitUmarov | 2012-06-28 | 1 | -1/+1 |
| | | | | | | | | | | | | problem if any... | ||||
| * | | Merge branch 'avination' into ubitwork | UbitUmarov | 2012-06-28 | 2 | -3/+4 |
| |\ \ | |||||
| * | | | don't send a lot of avatar data when we are just changing position or ↵ | UbitUmarov | 2012-06-17 | 1 | -4/+8 |
| | | | | | | | | | | | | | | | | rotation ( SendTerseUpdateToAllClients() in place of SendAvatarDataToAllAgents() ) | ||||
| * | | | split ugly expression in a if making it simpler to read | UbitUmarov | 2012-06-17 | 1 | -3/+5 |
| | | | | |||||
| * | | | Don't let scripts rotate root part of physical linksets like SL, Update ↵ | UbitUmarov | 2012-06-17 | 1 | -35/+66 |
| | | | | | | | | | | | | | | | | client rotation of avatars 'linked' to child parts. (put back some 'cosmetics' from previus commit). Still let lsl api use physics engine ideia of part Physical state on this where it should be SOP ideia, so is that is clear that sync with engine is SOP responsability. | ||||
* | | | | Merge branch 'master' into careminster | Melanie | 2012-07-05 | 8 | -274/+416 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | ||||
| * | | | | regrade osFormatString, osMatchString and osReplaceString to VeryLow. | Justin Clark-Casey (justincc) | 2012-07-05 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | I can't see that these present any real hazard to sim functioning. | ||||
| * | | | | Add OSSL function osForceAttachToAvatarFromInventory() | Justin Clark-Casey (justincc) | 2012-07-05 | 7 | -6/+253 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This works like osForceAttachToAvatar() but allows an object to be directly specified from the script object's inventory rather than forcing it to be rezzed in the scene first. Still only attaches objects to the owner of the script. This allows one to bypass the complicated co-ordination of first rezzing objects in the scene before attaching them. Threat level high. | ||||
| * | | | | Use GetInventoryItem() in llRezAtRoot rather than iterating through a cloned ↵ | Justin Clark-Casey (justincc) | 2012-07-04 | 1 | -40/+36 |
| | | | | | | | | | | | | | | | | | | | | dictionary | ||||
| * | | | | refactor: In llGetNotecardLine() use existing GetInventoryItem() rather than ↵ | Justin Clark-Casey (justincc) | 2012-07-04 | 1 | -10/+4 |
| | | | | | | | | | | | | | | | | | | | | inspecting a clone of the TaskInventory dictionary that was not cloned thread-safe | ||||
| * | | | | refactor: In llGetNumberOfNotecardLines() use existing GetInventoryItem() ↵ | Justin Clark-Casey (justincc) | 2012-07-04 | 1 | -10/+4 |
| | | | | | | | | | | | | | | | | | | | | rather than inspecting a clone of the TaskInventory dictionary that was not cloned thread-safe | ||||
| * | | | | refactor: use existing GetInventoryItem() in GetScriptByName(), itself ↵ | Justin Clark-Casey (justincc) | 2012-07-04 | 1 | -13/+9 |
| | | | | | | | | | | | | | | | | | | | | renamed from ScriptByName() | ||||
| * | | | | refactor: In llGetInventoryType() use existing GetInventoryItem() | Justin Clark-Casey (justincc) | 2012-07-04 | 1 | -11/+5 |
| | | | | | |||||
| * | | | | refactor: In llGetInventoryCreator() use existing GetInventoryItem() | Justin Clark-Casey (justincc) | 2012-07-04 | 1 | -12/+8 |
| | | | | | |||||
| * | | | | refactor: In llGetInventoryPermMask() use existing GetInventoryItem() | Justin Clark-Casey (justincc) | 2012-07-04 | 1 | -24/+21 |
| | | | | | |||||
| * | | | | refactor: in llGetInventoryPermMask use existing GetInventoryItem() | Justin Clark-Casey (justincc) | 2012-07-04 | 1 | -23/+19 |
| | | | | | |||||
| * | | | | refactor: In llRemoteLoadScriptPin() use existing GetInventoryItem() | Justin Clark-Casey (justincc) | 2012-07-04 | 1 | -20/+5 |
| | | | | | |||||
| * | | | | refactor: replace use of LSL_Api.GetTaskInventoryItem() with existing ↵ | Justin Clark-Casey (justincc) | 2012-07-04 | 1 | -22/+11 |
| | | | | | | | | | | | | | | | | | | | | GetInventoryItem() | ||||
| * | | | | refactor: In llGetInventoryKey() use existing GetInventoryItem() | Justin Clark-Casey (justincc) | 2012-07-04 | 1 | -15/+9 |
| | | | | | |||||
| * | | | | In llMessageLinked() use GetInventoryItems() rather than cloning ↵ | Justin Clark-Casey (justincc) | 2012-07-04 | 1 | -4/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | TaskInventory directory GetInventoryItems() returns a new list and so is equivalent, and creates this list under lock whereas Clone() is not thread-safe | ||||
| * | | | | In llRequestInventoryData() use GetInventoryItems() rather than cloning ↵ | Justin Clark-Casey (justincc) | 2012-07-04 | 1 | -3/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | TaskInventory directory GetInventoryItems() returns a new list and so is equivalent, and creates this list under lock whereas Clone() is not thread-safe | ||||
| * | | | | 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' |