aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'avination' into careminsterMelanie2012-05-176-10/+332
|\
| * udp transfer: make number packets estimation coerent with number actually ↵UbitUmarov2012-05-171-2/+8
| | | | | | | | sent. Use the safer lower max packet size defined in os source (600) and not OMV one (1100).
| * trigger collision sounds on active agent position for better spatial effect ↵UbitUmarov2012-05-172-23/+22
| | | | | | | | without using the detailed collision position. (current error will be half max physical prim size). Moved some checks from sop to collisionSound code
| * increase avatars collisions report to 10 per sec, Stopped sound on avatar to ↵UbitUmarov2012-05-172-2/+2
| | | | | | | | volumedetect collision
| * add avatar colision sounds. Changed test sound UUIDUbitUmarov2012-05-172-62/+120
| |
| * default colisionVolume is 0, use it only for user specified soundUbitUmarov2012-05-171-3/+6
| |
| * default collision sounds. Incomplete, untested, needs revisionUbitUmarov2012-05-172-1/+205
| |
| * collision sounds: simplify send code a bit and limit sending rate to 5 per ↵UbitUmarov2012-05-161-1/+36
| | | | | | | | sec per part ???
| * Added a invalidCollisionSoundUUID so that scripts can stop all collision ↵UbitUmarov2012-05-163-6/+23
| | | | | | | | 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 careminsterMelanie2012-05-175-42/+196
|\ \
| * \ Merge branch 'master' of /home/opensim/lib/osgrid/opensimBlueWall2012-05-171-29/+28
| |\ \
| | * | Force the default Telehub router if no matches are found in the config.BlueWall2012-05-171-29/+28
| | | |
| * | | minor: improve method doc for ↵Justin Clark-Casey (justincc)2012-05-171-1/+1
| | | | | | | | | | | | | | | | TestSameSimulatorSeparatedRegionsCreateAgentFails()
| * | | Add regression TestSameSimulatorSeparatedRegionsCreateAgentFails()Justin Clark-Casey (justincc)2012-05-171-0/+67
| |/ /
| * | Comment out TestSameSimulatorSeparatedRegionsQueryAccessFails() regression ↵Justin Clark-Casey (justincc)2012-05-172-2/+8
| | | | | | | | | | | | test logging accidentally left in
| * | minor: Remove redundant EstateOwner != UUID.Zero check in IsAdministrator ↵Justin Clark-Casey (justincc)2012-05-171-8/+6
| | | | | | | | | | | | | | | | | | because checking EstateOwner == user Due to an earlier check we already know that user != UUID.Zero so if EstateOwner == UUID.Zero, EstateOwner == user can never be true
| * | Add regression TestSameSimulatorSeparatedRegionsQueryAccessFails()Justin Clark-Casey (justincc)2012-05-172-1/+77
| | |
| * | Remove redundant "Teleport failed:" from reason when QueryAccess fails for ↵Justin Clark-Casey (justincc)2012-05-171-4/+12
| | | | | | | | | | | | | | | | | | the destination simulator. This part of the string is already provided by the viewer. Also adds more reason logging for diagnostics when teleports are refused/fail.
* | | Merge branch 'master' into careminsterMelanie2012-05-167-219/+282
|\ \ \ | |/ /
| * | Route OAR SOG loading through the common ↵Justin Clark-Casey (justincc)2012-05-163-115/+5
| | | | | | | | | | | | | | | | | | SceneObjectSerializer.FromXml2Format() rather than the functionally identical but buggy Xml2ToSOG(). Remove buggy Xml2ToSOG().
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-05-155-523/+202
| |\ \
| * | | Fix issue where loading OARs could sometimes result in link numbers being ↵Justin Clark-Casey (justincc)2012-05-154-6/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | Allow use of regular expressions in "show object name", "show part name" and ↵Justin Clark-Casey (justincc)2012-05-151-101/+208
| | | | | | | | | | | | | | | | | | | | | | | | "delete object name" console commands if --regex switch is used. Deleteing objects by name, creator uuid or owner uuid now requires confirmation to avoid accidental deletion.
* | | | Merge branch 'avination' into careminsterMelanie2012-05-155-64/+204
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * | | use part VolumeDetectActive and not rootPart.VolumeDetectActive to be ↵UbitUmarov2012-05-151-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 detectorsUbitUmarov2012-05-151-1/+1
| | | |
| * | | sop: - added UpdatePhysicsSubscribedEvents() to update physics ator ↵UbitUmarov2012-05-151-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)
| * | | ubitODE: if stopped having collisions do report zero colisions once, so ↵UbitUmarov2012-05-152-9/+43
| | | | | | | | | | | | | | | | collision_end event can be triggered. Changed reports rate to the requested rate and not full ode rate.
| * | | ubitODE: fix not reporting land collisions on same cases.UbitUmarov2012-05-151-2/+25
| | | |
| * | | Port the mel/dahlia fixMelanie2012-05-152-1/+11
| | | |
| * | | don't send colision events to volume detectorsUbitUmarov2012-05-151-1/+2
| | | |
| * | | Merge branch 'ubitwork' into avinationMelanie2012-05-151-4/+14
| |\ \ \
| | * \ \ Merge branch 'avination' into ubitworkUbitUmarov2012-05-156-525/+195
| | |\ \ \
| | * | | | make llGetCameraPos and llGetCameraRot apply to avatar that granted ↵UbitUmarov2012-05-141-4/+14
| | | | | | | | | | | | | | | | | | | | | | | | permission and not owner
| * | | | | Fix an omissionMelanie2012-05-151-1/+1
| | |/ / / | |/| | |
* | | | | Merge branch 'master' into careminsterMelanie2012-05-151-1/+4
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
| * | | | Guard against null root part on SQLite. This really needs to be fixed so SQLiteMelanie2012-05-151-1/+1
| | | | | | | | | | | | | | | | | | | | loads roots before children like MySQL does.
| * | | | Try to fix sqlite breakageMelanie2012-05-151-0/+3
| | | | |
| * | | | Port Avination's collision fixes to core.Melanie2012-05-155-523/+199
| | |_|/ | |/| |
* | | | Merge branch 'avination' into careminsterMelanie2012-05-146-525/+195
|\ \ \ \ | | |/ / | |/| |
| * | | Completely revamp collision handling. Now works as it is supposed to.Melanie2012-05-145-523/+189
| | | |
| * | | Check parcel entry permissions when moving objectsMelanie2012-05-141-1/+2
| | | |
| * | | Allow non-gods to deed no-mod objectsMelanie2012-05-141-1/+4
| | |/ | |/|
* | | Merge branch 'master' into careminsterMelanie2012-05-1412-87/+328
|\ \ \ | | |/ | |/| | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * | Save the Telehub and its Spawn Points in the OAROren Hurvitz2012-05-146-5/+100
| | |
| * | minor: add explanative comment to 'missing baked texture' logging commonly ↵Justin Clark-Casey (justincc)2012-05-141-0/+10
| | | | | | | | | | | | seen on inter-simulator teleports where avatar baked textures are not available from the asset service.
| * | minor: comment out individual attachment transfer log messages for nowJustin Clark-Casey (justincc)2012-05-141-4/+4
| | |
| * | Set the agent in transit teleport flag at the first available opportunity ↵Justin Clark-Casey (justincc)2012-05-141-11/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (i.e. when IsInTransit() was being checked) to close down a race condition. On EntityTransferModule.DoTeleport() there was an IsInTransit() check to prevent multiple simultaneous teleport attempts. However, the SetInTransit() was only performed later on, which left a window in which multiple threads could pass the IsInTransit() check. This has been seen in the field and the results aren't pretty. This commit effectively combines the IsInTransit() and SetInTransit() checks so there is no such window. More failure cases are made to to call ResetInTransit() to adjust to this move.
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-05-144-64/+172
| |\ \
| | * \ Merge branch 'master' of /home/opensim/src/OpenSimBlueWall2012-05-132-26/+26
| | |\ \
generated by cgit v1.1 at 2024-12-24 04:15:08 +0000