aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-05-312-14/+52
|\
| * Add an optional mechanism for physics modules to collect and return arbitrary...Justin Clark-Casey (justincc)2012-05-311-5/+43
| * Fix collision filtering. The filter should be checked on the receiving part!Melanie2012-05-291-9/+9
* | Re-add script collisions that were lost in a mergeMelanie2012-05-291-0/+2
* | Merge branch 'avination'Melanie2012-05-292-178/+98
|\ \
| * \ Merge branch 'avination' into ubitworkUbitUmarov2012-05-281-176/+90
| |\ \
| | * | Place the return back into collision sounds.Melanie2012-05-281-0/+4
| | * | Modify SceneManeger to use a DoubleDictionary and work without locks.Melanie2012-05-281-176/+90
| * | | disable collision sounds for nowUbitUmarov2012-05-281-2/+8
| |/ /
* | | Merge branch 'avination' into careminsterMelanie2012-05-274-191/+386
|\ \ \ | |/ /
| * | Merge branch 'ubitwork' into avinationMelanie2012-05-213-174/+384
| |\ \
| | * | missing update script events callUbitUmarov2012-05-201-1/+12
| | * | fix m_sitAvatarHeight to be half size.z, reduced default to a more resonable...UbitUmarov2012-05-191-1/+1
| | * | reduce useless waste of cpu. Make character collision events be done similia...UbitUmarov2012-05-191-1/+3
| | * | a bit faster collision sound type verification plus a few fixes/changesUbitUmarov2012-05-192-53/+100
| | * | temp work: sounds simetric acording to materials, still 'window close' test ...UbitUmarov2012-05-191-30/+98
| | * | modulate collision sound intensity with collision relative velocity for parts...UbitUmarov2012-05-192-46/+89
| | * | modulate collision sounds intensity with relative collision speedUbitUmarov2012-05-192-81/+120
| * | | Fix setting positions of attachments. The recent security fix regardingMelanie2012-05-191-1/+1
| * | | Merge branch 'ubitwork' into avinationMelanie2012-05-171-28/+9
| |\ \ \ | | |/ /
| | * | removed redundant colision sounds. Temporary muted sounds ( returns at top o...UbitUmarov2012-05-171-28/+13
| * | | Temprorarily disable collision sounds until we have some sound bitesMelanie2012-05-171-1/+5
| |/ /
* | | Merge branch 'master' into careminsterMelanie2012-05-276-58/+125
|\ \ \ | | |/ | |/|
| * | If restating a region, clean up the physics scene after the main scene has be...Justin Clark-Casey (justincc)2012-05-261-4/+4
| * | refactor: replace LSL_Api.InventoryKey(string) largely with SceneObjectPartIn...Justin Clark-Casey (justincc)2012-05-261-8/+14
| * | Remove a call stack debugging line accidentally left in from a few days ago a...Justin Clark-Casey (justincc)2012-05-251-2/+0
| * | Stop it being possible for an agent to teleport back to its source region bef...Justin Clark-Casey (justincc)2012-05-251-3/+3
| * | If an agent is still registered as 'in transit' by the source region, don't a...Justin Clark-Casey (justincc)2012-05-242-36/+73
| * | Add "show scene" command which lists stats for the currently selected console...Justin Clark-Casey (justincc)2012-05-231-1/+6
| * | Fix bug where an avatar that had an object they owned attached through llAtta...Justin Clark-Casey (justincc)2012-05-233-3/+26
| * | minor: extend commented out LinkInventoryItem log message for future useJustin Clark-Casey (justincc)2012-05-211-5/+5
* | | Merge branch 'master' into careminsterMelanie2012-05-193-25/+54
|\ \ \ | |/ /
| * | Further refinement on propertiesBlueWall2012-05-181-7/+4
| * | Cleanup + change properties to set fields with private set : Thanks Justin fo...BlueWall2012-05-182-3/+4
| * | Provide Telehub setting to allow use of landmarksBlueWall2012-05-182-1/+9
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-05-171-29/+28
| |\ \
| * | | Check agent limit against root agent count rather than both root and child ag...Justin Clark-Casey (justincc)2012-05-173-22/+43
* | | | Merge branch 'avination' into careminsterMelanie2012-05-173-6/+314
|\ \ \ \ | | |_|/ | |/| |
| * | | trigger collision sounds on active agent position for better spatial effect ...UbitUmarov2012-05-172-23/+22
| * | | increase avatars collisions report to 10 per sec, Stopped sound on avatar to ...UbitUmarov2012-05-172-2/+2
| * | | 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 s...UbitUmarov2012-05-161-1/+36
| * | | Added a invalidCollisionSoundUUID so that scripts can stop all collision sou...UbitUmarov2012-05-161-4/+13
* | | | Merge branch 'master' into careminsterMelanie2012-05-172-29/+171
|\ \ \ \ | | |_|/ | |/| |
| * | | 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 TestSameSimulatorSeparatedRegionsCreateAgentFai...Justin Clark-Casey (justincc)2012-05-171-1/+1
| * | | Add regression TestSameSimulatorSeparatedRegionsCreateAgentFails()Justin Clark-Casey (justincc)2012-05-171-0/+67
| |/ /