| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | * | | | add avatar colision sounds. Changed test sound UUID | UbitUmarov | 2012-05-17 | 2 | -62/+120 | |
| | | | | | ||||||
| | * | | | default colisionVolume is 0, use it only for user specified sound | UbitUmarov | 2012-05-17 | 1 | -3/+6 | |
| | | | | | ||||||
| | * | | | default collision sounds. Incomplete, untested, needs revision | UbitUmarov | 2012-05-17 | 2 | -1/+205 | |
| | | | | | ||||||
| | * | | | collision sounds: simplify send code a bit and limit sending rate to 5 per ↵ | UbitUmarov | 2012-05-16 | 1 | -1/+36 | |
| | | | | | | | | | | | | | | | | | sec per part ??? | |||||
| | * | | | Added a invalidCollisionSoundUUID so that scripts can stop all collision ↵ | UbitUmarov | 2012-05-16 | 1 | -4/+13 | |
| | | | | | | | | | | | | | | | | | sounds with llCollisionSound("",...). UUID.Zero means defaults should be used. In case part has several scripts with confliting llCollisionSound result depende on exec order. Specially on reset the efect of "" depends on reset order, it should override the others. This is intermediate improve(?) since collisions sounds seem to need a deaper revision. | |||||
| * | | | | Merge branch 'master' into careminster | Melanie | 2012-05-17 | 2 | -29/+171 | |
| |\ \ \ \ | | |_|/ | |/| | | ||||||
| | * | | | Merge branch 'master' of /home/opensim/lib/osgrid/opensim | BlueWall | 2012-05-17 | 1 | -29/+28 | |
| | |\ \ \ | | |_|/ | |/| | | ||||||
| | | * | | Force the default Telehub router if no matches are found in the config. | BlueWall | 2012-05-17 | 1 | -29/+28 | |
| | | | | | ||||||
| | * | | | minor: improve method doc for ↵ | Justin Clark-Casey (justincc) | 2012-05-17 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | TestSameSimulatorSeparatedRegionsCreateAgentFails() | |||||
| | * | | | Add regression TestSameSimulatorSeparatedRegionsCreateAgentFails() | Justin Clark-Casey (justincc) | 2012-05-17 | 1 | -0/+67 | |
| | |/ / | ||||||
| | * | | Comment out TestSameSimulatorSeparatedRegionsQueryAccessFails() regression ↵ | Justin Clark-Casey (justincc) | 2012-05-17 | 1 | -2/+2 | |
| | | | | | | | | | | | | | test logging accidentally left in | |||||
| | * | | Add regression TestSameSimulatorSeparatedRegionsQueryAccessFails() | Justin Clark-Casey (justincc) | 2012-05-17 | 1 | -0/+76 | |
| | | | | ||||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-05-16 | 3 | -114/+16 | |
| |\ \ \ | |/ / | ||||||
| | * | | Route OAR SOG loading through the common ↵ | Justin Clark-Casey (justincc) | 2012-05-16 | 2 | -113/+4 | |
| | | | | | | | | | | | | | | | | | | | SceneObjectSerializer.FromXml2Format() rather than the functionally identical but buggy Xml2ToSOG(). Remove buggy Xml2ToSOG(). | |||||
| | * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2012-05-15 | 3 | -512/+191 | |
| | |\ \ | ||||||
| | * | | | Fix issue where loading OARs could sometimes result in link numbers being ↵ | Justin Clark-Casey (justincc) | 2012-05-15 | 1 | -1/+12 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | reordered. This was because the parts in scene objects were sometimes not serialized in link order. This is perfectly fine since the parts still have the right link numbers, but an extra fix to adjust for this had not been done in the SerialiserModule methods that OAR loading used. Add regression test for same. Addresses http://opensimulator.org/mantis/view.php?id=5948, http://opensimulator.org/mantis/view.php?id=5749 | |||||
| * | | | | Merge branch 'avination' into careminster | Melanie | 2012-05-15 | 1 | -50/+124 | |
| |\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||||
| | * | | | use part VolumeDetectActive and not rootPart.VolumeDetectActive to be ↵ | UbitUmarov | 2012-05-15 | 1 | -2/+5 | |
| | | | | | | | | | | | | | | | | | coerent with other places in case of future changes. Should be equivalent if all is well. | |||||
| | * | | | sop colisions don't play sounds on volume detectors | UbitUmarov | 2012-05-15 | 1 | -1/+1 | |
| | | | | | ||||||
| | * | | | sop: - added UpdatePhysicsSubscribedEvents() to update physics ator ↵ | UbitUmarov | 2012-05-15 | 1 | -48/+118 | |
| | | | | | | | | | | | | | | | | | collision events subcription where needed. Made it consider also VolumeDtc and phantom cases. - added extra calls to it on physics ator proprieties changes. - Fixed land collisions reports. - Handle the case of physics sending a last zero colisions reports to trigger collision_end. - Made the physics collisions report rate be 20 per second. (needs review/testing) | |||||
| | * | | | Port the mel/dahlia fix | Melanie | 2012-05-15 | 1 | -0/+3 | |
| | | | | | ||||||
| | * | | | don't send colision events to volume detectors | UbitUmarov | 2012-05-15 | 1 | -1/+2 | |
| | | | | | ||||||
| | * | | | Fix an omission | Melanie | 2012-05-15 | 1 | -1/+1 | |
| | | | | | ||||||
| * | | | | Merge branch 'master' into careminster | Melanie | 2012-05-15 | 1 | -1/+4 | |
| |\ \ \ \ | | |_|/ | |/| | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||||
| | * | | | Guard against null root part on SQLite. This really needs to be fixed so SQLite | Melanie | 2012-05-15 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | loads roots before children like MySQL does. | |||||
| | * | | | Try to fix sqlite breakage | Melanie | 2012-05-15 | 1 | -0/+3 | |
| | | | | | ||||||
| | * | | | Port Avination's collision fixes to core. | Melanie | 2012-05-15 | 3 | -512/+188 | |
| | | |/ | |/| | ||||||
| * | | | Merge branch 'avination' into careminster | Melanie | 2012-05-14 | 4 | -514/+184 | |
| |\ \ \ | | |/ | |/| | ||||||
| | * | | Completely revamp collision handling. Now works as it is supposed to. | Melanie | 2012-05-14 | 3 | -512/+178 | |
| | | | | ||||||
| | * | | Check parcel entry permissions when moving objects | Melanie | 2012-05-14 | 1 | -1/+2 | |
| | | | | ||||||
| | * | | Allow non-gods to deed no-mod objects | Melanie | 2012-05-14 | 1 | -1/+4 | |
| | | | | ||||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-05-14 | 2 | -38/+147 | |
| |\ \ \ | | |/ | |/| | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||||
| | * | | minor: comment out individual attachment transfer log messages for now | Justin Clark-Casey (justincc) | 2012-05-14 | 1 | -4/+4 | |
| | | | | ||||||
| | * | | Add configurable SpawnPointRouting | BlueWall | 2012-05-13 | 2 | -38/+146 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Will use one of three selected methods to route avatar landing points when using Telehubs. The setting is in [Startup] using SpawnPointRouting = closest/random/sequence closest: The default setting. Routes avatar to the nearest SpawnPoint to the location. random: Picks random SpawnPoints to land the avatar. sequence: Follows a sequence to place the avatar on the next available SpawnPoint location Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs | |||||
| * | | | Merge branch 'avination' into careminster | Melanie | 2012-05-13 | 3 | -4/+33 | |
| |\ \ \ | | |/ | |/| | ||||||
| | * | | display a sleep time of zero if forced spare time to zero, when sim fps is ↵ | UbitUmarov | 2012-05-12 | 1 | -2/+7 | |
| | | | | | | | | | | | | | lower than desired, for better display coerence. | |||||
| | * | | ªTEST MESS* reduce animation packets send. Added onchangeanim event with ↵ | UbitUmarov | 2012-05-12 | 2 | -2/+26 | |
| | | | | | | | | | | | | | parameters to define if to add or remove, and if to send anims pack on that evocation, etc | |||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-05-13 | 2 | -7/+33 | |
| |\ \ \ | | |/ | |/| | ||||||
| | * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Dan Lake | 2012-05-10 | 2 | -7/+13 | |
| | |\ \ | ||||||
| | * | | | Add even for terrain tainting and synchronize terrain module with physics ↵ | Dan Lake | 2012-05-10 | 2 | -7/+33 | |
| | | | | | | | | | | | | | | | | | scene before physics simulation step rather than after | |||||
| * | | | | Merge branch 'master' into careminster | Melanie | 2012-05-10 | 1 | -0/+4 | |
| |\ \ \ \ | | |/ / | |/| | | ||||||
| | * | | | Improve logging on the prim inventory script asset request path for future use. | Justin Clark-Casey (justincc) | 2012-05-09 | 1 | -0/+4 | |
| | | | | | | | | | | | | | | | | | This adds name and description of the request handler to http request logging when DebugLevel >= 1 | |||||
| * | | | | Merge branch 'master' into careminster | Melanie | 2012-05-09 | 4 | -14/+56 | |
| |\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneGraph.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | |||||
| | * | | | Remove physics actor related race conditions in SetVehicleFlags() and ↵ | Justin Clark-Casey (justincc) | 2012-05-09 | 1 | -7/+9 | |
| | |/ / | | | | | | | | | | | | | | | | SetPhysicsAxisRotation() sop.PhysActor can currently become null at any time. | |||||
| | * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Dan Lake | 2012-05-08 | 1 | -0/+2 | |
| | |\ \ | ||||||
| | | * | | Mantis 1456 same region teleport of a sitting avatar. | Talun | 2012-05-09 | 1 | -0/+2 | |
| | | | | | | | | | | | | | | | | | | | | | Region to region was fixed some time ago in EntityTransferModule. This applies the same fix for same region teleports. | |||||
| | * | | | Trigger event when scene presences are updated | Dan Lake | 2012-05-08 | 2 | -0/+34 | |
| | |/ / | ||||||
| | * | | Perform SceneGraph.DuplicateObject() under existing m_updateLock already ↵ | Justin Clark-Casey (justincc) | 2012-05-08 | 1 | -75/+89 | |
| | | | | | | | | | | | | | | | | | | | | | | used for link and delinking, in order to avoid race conditions. DuplicateObject() relies on source object having correct link numbers for the duration of the dupe. Both link and delink can change link numbers such that they are not consistent for short periods of time. | |||||
| * | | | Merge branch 'avination' into careminster | Melanie | 2012-05-08 | 1 | -0/+27 | |
| |\ \ \ | | |/ | |/| | ||||||
| | * | | Fix moving no-mod objects. Fixes a regression introduced with the undo fix | Melanie | 2012-05-07 | 1 | -0/+27 | |
| | | | | ||||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |