aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-05-287-211/+144
|\
| * Merge branch 'avination' into ubitworkUbitUmarov2012-05-282-180/+103
| |\ | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/CollisionSounds.cs
| | * Place the return back into collision sounds.Melanie2012-05-281-0/+4
| | |
| | * If a region is not found on a simulator, make the health query returnMelanie2012-05-281-4/+13
| | | | | | | | | | | | | | | | | | 0 to indicate it's still starting rather than an error. There are other methods that can discover the presence of a region and slow starting regions may cause the watchdog to kill them while they start,
| | * Merge branch 'ubitwork' into avinationMelanie2012-05-284-38/+110
| | |\
| | * | Modify SceneManeger to use a DoubleDictionary and work without locks.Melanie2012-05-281-176/+90
| | | | | | | | | | | | | | | | | | | | Changes to the scenes dictionary are exceedingly rare and using atomic operations makes the chance of collisions nearly nil in any case.
| * | | disable collision sounds for nowUbitUmarov2012-05-281-2/+8
| | | |
| * | | revert making sculpts phanton if sculpt meshing option is offUbitUmarov2012-05-281-2/+0
| | |/ | |/|
| * | Let OOB information usable outside ubitodeUbitUmarov2012-05-273-29/+33
| | |
| * | also don't collide sculps or meshs if meshing is OFFUbitUmarov2012-05-211-0/+2
| | |
| * | Merge branch 'avination' into ubitworkUbitUmarov2012-05-212-2/+2
| |\ \ | | |/
| | * Merge branch 'ubitwork' into avinationMelanie2012-05-217-328/+562
| | |\
| | * | Fix setting positions of attachments. The recent security fix regardingMelanie2012-05-191-1/+1
| | | | | | | | | | | | | | | | prim entry messed it up.
| | * | Merge branch 'ubitwork' into avinationMelanie2012-05-171-28/+9
| | |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/CollisionSounds.cs
| | * | | Temprorarily disable collision sounds until we have some sound bitesMelanie2012-05-171-1/+5
| | | | |
* | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-05-214-42/+111
|\ \ \ \ \ | |/ / / /
| * | | | try to let avas climb higher steps. Will only work in some cases, may have ↵UbitUmarov2012-05-212-9/+75
| | |_|/ | |/| | | | | | | | | | bad effects, so needs some more testing
| * | | missing update script events callUbitUmarov2012-05-201-1/+12
| | | |
| * | | minor changesUbitUmarov2012-05-203-32/+24
| | | |
* | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-05-191-1/+1
|\ \ \ \ | |/ / /
| * | | fix m_sitAvatarHeight to be half size.z, reduced default to a more ↵UbitUmarov2012-05-191-1/+1
| | | | | | | | | | | | | | | | resonable value ( 1m);
* | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-05-194-126/+148
|\ \ \ \ | |/ / /
| * | | reduce useless waste of cpu. Make character collision events be done ↵UbitUmarov2012-05-194-126/+148
| | | | | | | | | | | | | | | | similiar to parts. Let same thread do it all ( like in parts ) ( to change this some structs copies must be added)
* | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-05-192-53/+100
|\ \ \ \ | |/ / /
| * | | a bit faster collision sound type verification plus a few fixes/changesUbitUmarov2012-05-192-53/+100
| | | |
* | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-05-191-30/+98
|\ \ \ \ | |/ / /
| * | | temp work: sounds simetric acording to materials, still 'window close' test ↵UbitUmarov2012-05-191-30/+98
| | | | | | | | | | | | | | | | sound. Included in coment full assimetric ( since seems we have files for it now ) case with some uuids
* | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-05-192-46/+89
|\ \ \ \ | |/ / /
| * | | modulate collision sound intensity with collision relative velocity for ↵UbitUmarov2012-05-192-46/+89
| | | | | | | | | | | | | | | | parts also
* | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-05-193-82/+121
|\ \ \ \ | |/ / /
| * | | modulate collision sounds intensity with relative collision speedUbitUmarov2012-05-192-81/+120
| | | |
| * | | fix character IsPhysicalUbitUmarov2012-05-191-1/+1
| | | |
* | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-05-194-29/+26
|\ \ \ \ | |/ / /
| * | | add colliders relative velocity projected in collision direction to ↵UbitUmarov2012-05-193-1/+13
| | |/ | |/| | | | | | | collisions report information.
| * | removed redundant colision sounds. Temporary muted sounds ( returns at top ↵UbitUmarov2012-05-171-28/+13
| |/ | | | | | | of funtions ).
* | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-05-171-2/+8
|\ \ | |/
| * 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).
* | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-05-172-23/+22
|\ \ | |/
| * 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
* | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-05-172-2/+2
|\ \ | |/
| * increase avatars collisions report to 10 per sec, Stopped sound on avatar to ↵UbitUmarov2012-05-172-2/+2
| | | | | | | | volumedetect collision
* | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-05-172-62/+120
|\ \ | |/
| * add avatar colision sounds. Changed test sound UUIDUbitUmarov2012-05-172-62/+120
| |
* | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-05-171-3/+6
|\ \ | |/
| * default colisionVolume is 0, use it only for user specified soundUbitUmarov2012-05-171-3/+6
| |
* | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-05-174-6/+262
|\ \ | |/
| * 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 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-05-151-2/+5
|\ \ | |/