Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Update ubitMesh primMesher with new Dahlia version on core ( reckick git | UbitUmarov | 2012-07-19 | 1 | -1/+0 |
| | | | | back) | ||||
* | kick git | UbitUmarov | 2012-07-19 | 1 | -0/+1 |
| | |||||
* | Fix llSameGroup to work according to specs | Melanie | 2012-07-18 | 1 | -10/+36 |
| | |||||
* | Merge branch 'master' into careminster | Melanie | 2012-07-16 | 2 | -20/+0 |
|\ | |||||
| * | Revert "Fix script "Running" behavior" | Melanie | 2012-07-16 | 2 | -20/+0 |
| | | | | | | | | | | | | A better solution using the already present flags must be found. This reverts commit 6d3ee8bb39d47ed7b32e8905fa0b2fc31c5a9f80. | ||||
* | | Merge branch 'avination' into careminster | Melanie | 2012-07-16 | 1 | -48/+35 |
|\ \ | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs OpenSim/Region/Framework/Scenes/Scene.cs | ||||
| * | | Allow setting linked avatar positions from within a prim not the one sat on | Melanie | 2012-07-16 | 1 | -11/+18 |
| | | | |||||
| * | | Reinstate older set rotation code for avatars since it works in all cases | Melanie | 2012-07-15 | 1 | -22/+1 |
| | | | |||||
| * | | Replace sit position and rotation code with older, working version | Melanie | 2012-07-15 | 1 | -26/+28 |
| | | | |||||
| * | | Revert "Fix a sit rotation issue" | Melanie | 2012-07-15 | 1 | -1/+1 |
| | | | | | | | | | | | | This reverts commit 47f7cc9457bfc5c909290ac189b34dd3eceebe7f. | ||||
| * | | Fix a sit rotation issue | Melanie | 2012-07-15 | 1 | -1/+1 |
| | | | |||||
| * | | Revert " lltargetomega efective spinrate now multiplied by gain ( need check )" | Melanie | 2012-07-13 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | | | | | | Undo figuring gain into spinrate in llTargetOmega. In SL, gain has null effect on nonphysical spinning objects. This reverts commit df55de5b3d88e241f35217d5c08d02b921991513. | ||||
* | | | Merge branch 'master' into careminster | Melanie | 2012-07-16 | 1 | -1/+14 |
|\ \ \ | | |/ | |/| | |||||
| * | | sending more user-friendly messages to the script error window rather than ↵ | SignpostMarv | 2012-07-16 | 1 | -1/+14 |
| | | | | | | | | | | | | | | | | | | the thrown exceptions. Signed-off-by: Melanie <melanie@t-data.com> | ||||
* | | | Merge branch 'master' into careminster | Melanie | 2012-07-16 | 1 | -57/+78 |
|\ \ \ | |/ / | | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | ||||
| * | | acting on feedback from justincc | SignpostMarv | 2012-07-14 | 1 | -6/+7 |
| | | | |||||
| * | | acting on feedback from justincc | SignpostMarv | 2012-07-14 | 1 | -39/+42 |
| | | | |||||
| * | | added in some extra variables, it sometimes thinks it is on the same parcel :( | SignpostMarv | 2012-07-14 | 1 | -5/+7 |
| | | | | | | | | | | | | Signed-off-by: SignpostMarv <github@signpostmarv.name> | ||||
| * | | adding workaround for silent failure if position is outside the bounds of a ↵ | SignpostMarv | 2012-07-14 | 1 | -13/+41 |
| | | | | | | | | | | | | | | | | | | region, implementing parcel prim count check. Signed-off-by: SignpostMarv <github@signpostmarv.name> | ||||
| * | | Implementation of llSetRegionPos(). Does not implement failure on object ↵ | SignpostMarv | 2012-07-14 | 3 | -4/+45 |
| | | | | | | | | | | | | | | | | | | entry/prim limit/access restrictions. Signed-off-by: SignpostMarv <github@signpostmarv.name> | ||||
* | | | Merge branch 'master' into careminster | Melanie | 2012-07-13 | 2 | -7/+3 |
|\ \ \ | |/ / | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs | ||||
| * | | Rather than instantiating a UTF8 encoding everywhere when we want to supress ↵ | Justin Clark-Casey (justincc) | 2012-07-13 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | the BOM, use a single Util.UTF8NoBomEncoding. This class is thread-safe (as evidenced by the provision of the system-wide Encoding.UTF8 which does not suppress BOM on output). | ||||
| * | | Remove IClientAPI.GetClientEP() in favour of existing identical ↵ | Justin Clark-Casey (justincc) | 2012-07-12 | 1 | -6/+2 |
| | | | | | | | | | | | | IClientAPI.RemoteEndpoint. | ||||
* | | | Merge branch 'master' into careminster | Melanie | 2012-07-12 | 6 | -32/+29 |
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs | ||||
| * | | Where possible, use the system Encoding.ASCII and Encoding.UTF8 rather than ↵ | Justin Clark-Casey (justincc) | 2012-07-11 | 4 | -24/+14 |
| | | | | | | | | | | | | | | | | | | | | | constructing fresh copies. The encodings are thread-safe and already used in such a manner in other places. This isn't done where Byte Order Mark output is suppressed, since Encoding.UTF8 is constructed to output the BOM. | ||||
| * | | Add regression TestDetachScriptedAttachmentToInventory() | Justin Clark-Casey (justincc) | 2012-07-11 | 2 | -8/+15 |
| | | | | | | | | | | | | This currently only does a relatively crude check for a ScriptState node in the serialized xml | ||||
* | | | Merge branch 'avination' into careminster | Melanie | 2012-07-11 | 1 | -8/+25 |
|\ \ \ | | |/ | |/| | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs | ||||
| * | | remove expensive and leaked ( in Xengine at least) SayShout timer and | UbitUmarov | 2012-07-11 | 1 | -5/+23 |
| | | | | | | | | | | | | | | | replace it by a simpler function that should do the same (?) (don't like much those 10 + 1 bursts) | ||||
| * | | lltargetomega efective spinrate now multiplied by gain ( need check ) | UbitUmarov | 2012-07-10 | 1 | -0/+1 |
| | | | |||||
| * | | more work on llSetAngularVelocity() | UbitUmarov | 2012-07-10 | 1 | -3/+1 |
| | | | |||||
* | | | Merge branch 'master' into careminster | Melanie | 2012-07-11 | 6 | -16/+148 |
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Watchdog.cs OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs | ||||
| * | | Disable logging in regression test in OSSL_ApiAttachmentTests | Justin Clark-Casey (justincc) | 2012-07-10 | 1 | -1/+1 |
| | | | |||||
| * | | This script allows an object to be attached directly from prim inventory to ↵ | Justin Clark-Casey (justincc) | 2012-07-09 | 4 | -5/+96 |
| | | | | | | | | | | | | | | | | | | | | | another avatar in the scene. Very useful in serious game/environment scenarios where its only allowed for trusted creators. Threat level Severe | ||||
| * | | minor: remove some recent mono compiler warnings | Justin Clark-Casey (justincc) | 2012-07-07 | 1 | -1/+1 |
| | | | |||||
| * | | Remove redundant SetScene() function in Scene.AddSceneObject() | Justin Clark-Casey (justincc) | 2012-07-07 | 2 | -10/+10 |
| | | | | | | | | | | | | | | | This is always done later on in SceneGraph.AddSceneObject() if the call hasn't failed due to sanity checks. There's no other purpose for this method to exist and it's dangerous/pointless to call in other conditions. | ||||
| * | | Mantis 6063 osNpcTouch. | Talun | 2012-07-06 | 3 | -0/+41 |
| | | | | | | | | | | | | Allow NPCS to touch obects. | ||||
* | | | 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. |