aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-02-233-14/+11
|\
| * Add a position parameter to region crossing of objects. This avoids theMelanie2012-02-233-11/+10
* | Merge branch 'master' into careminsterMelanie2012-02-211-19/+3
|\ \ | |/
| * Fix problem with dragging child part inventory item to user inventory.Justin Clark-Casey (justincc)2012-02-211-19/+3
* | Merge branch 'master' into careminsterMelanie2012-02-201-1/+3
|\ \ | |/
| * One more tweak related to the previous 2 commits.Diva Canto2012-02-191-1/+3
* | Merge branch 'master' of ssh://3dhosting.de/var/git/careminsterMelanie2012-02-191-5/+8
|\ \
| * \ Merge branch 'master' into careminsterMelanie2012-02-191-5/+8
| |\ \ | | |/
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-02-191-1/+2
| | |\
| | * | A few more tweaks on position updates and create child agents. Mono hates con...Diva Canto2012-02-191-4/+8
* | | | Merge branch 'ubitwork'Melanie2012-02-191-1/+1
|\ \ \ \
| * | | | try to make crossings work better. chode no longer prevents crossings i hopeUbitUmarov2012-02-151-15/+18
| * | | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitworkUbitUmarov2012-02-154-119/+90
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitworkUbitUmarov2012-02-101-1/+16
| |\ \ \ \ \
| * | | | | | initial introdution of physics actor building control.UbitUmarov2012-02-081-1/+1
* | | | | | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminsterMelanie2012-02-196-4/+185
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | Merge branch 'master' into careminsterMelanie2012-02-193-3/+42
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| | * | | | | Fix:Fly setting for Parcel dosen't work http://opensimulator.org/mantis/view....PixelTomsen2012-02-191-1/+2
| | | |_|_|/ | | |/| | |
| | * | | | This should smooth movement in heteregeneous networks by a lot: cache the reg...Diva Canto2012-02-182-2/+40
| * | | | | Merge branch 'master' into careminsterMelanie2012-02-183-1/+143
| |\ \ \ \ \ | | |/ / / / | | | | | / | | |_|_|/ | |/| | |
| | * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDan Lake2012-02-172-1/+139
| | |\ \ \
| | | * | | minor formatting changes from last commit (4486n7d)Justin Clark-Casey (justincc)2012-02-161-4/+3
| | | * | | Fix: Object owned by the group does not return to the last owner http://opens...PixelTomsen2012-02-161-0/+6
| | | * | | Turn off logging on test in last commit (2b84295).Justin Clark-Casey (justincc)2012-02-161-1/+1
| | | * | | If shape properties fail SOP parsing (e.g. due to commas instead of decimal p...Justin Clark-Casey (justincc)2012-02-161-0/+133
| | * | | | Added the TriggerAvatarAppearanceChanged to EventManager. It's triggered by A...Dan Lake2012-02-171-0/+4
| | |/ / /
* | | | | try to make crossings work better. chode no longer prevents crossings i hopeUbitUmarov2012-02-151-15/+18
|/ / / /
* | | | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ...Melanie2012-02-151-107/+43
|\ \ \ \
| * | | | Implement region crossing of sitting avatars. Edit mode and llSetPos workMelanie2012-02-141-102/+38
| * | | | Prevent object loss and positioning outside the region with failed object simMelanie2012-02-141-5/+5
* | | | | Merge branch 'master' into careminsterMelanie2012-02-152-10/+37
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | Refactor appearance saving for NPC to use AvatarFactoryModule interface.Dan Lake2012-02-141-9/+31
| * | | short circuit the expensive parts of the permission checking codeMic Bowman2012-02-131-1/+6
* | | | Merge branch 'master' into careminsterMelanie2012-02-101-2/+10
|\ \ \ \ | |/ / / | | | / | |_|/ |/| |
| * | Fix bug where somebody taking a copy of an object they didn't own that was re...Justin Clark-Casey (justincc)2012-02-101-2/+10
* | | Merge branch 'master' into careminsterMelanie2012-02-101-1/+16
|\ \ \ | |/ / | | / | |/ |/|
| * When an asset is uploaded (e.g. a mesh) set individual copy/move/transfer per...Justin Clark-Casey (justincc)2012-02-101-4/+15
* | Merge branch 'master' into careminsterMelanie2012-02-052-3/+4
|\ \ | |/
| * Revert my two quick fixes for the lag issue and put in the real fix, whichMelanie2012-02-051-1/+2
| * Revert "Remove checks on ban list expiry on every move. To be re-added on par...Melanie2012-02-051-4/+4
| * Revert "Check ban list for a particular parcel only when an avatar moves into...Melanie2012-02-052-17/+4
| * Check ban list for a particular parcel only when an avatar moves into it.Melanie2012-02-052-4/+17
| * Remove checks on ban list expiry on every move. To be re-added on parcelMelanie2012-02-051-4/+4
| * Quiet the map module loggingBlueWall2012-02-041-2/+2
* | Merge branch 'master' into careminsterMelanie2012-02-044-8/+10
|\ \ | |/
| * Merge branch 'master' of ssh://snoopy@opensimulator.org/var/git/opensimSnoopy Pfeffer2012-02-041-0/+2
| |\
| | * Merge branch 'master' of /home/opensim/src/opensimBlueWall2012-02-031-0/+2
| | |\
| | | * Fix: Covenant changed time not set http://opensimulator.org/mantis/view.php?i...PixelTomsen2012-02-031-0/+2
| * | | Changed save oar and save iar parameter -p|--profile to -h|--home, including ...Snoopy Pfeffer2012-02-033-8/+8
| |/ /
| * | Corrected console help texts for "save iar"Snoopy Pfeffer2012-02-031-2/+2
| |/