aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-02-1824-70/+556
|\
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimBlueWall2012-02-182-1/+4
| |\
| | * Report an error if the required native Windows ODE library can't be found.Justin Clark-Casey (justincc)2012-02-181-1/+4
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-02-182-1/+10
| | |\
| | * | Actually add the Windows 64-bit ode.dll file.Justin Clark-Casey (justincc)2012-02-181-0/+0
| * | | Route logins according to Estate, Telehub and TeleportFlagsBlueWall2012-02-181-2/+4
| * | | Propagate our teleport flags on loginsBlueWall2012-02-183-3/+12
| | |/ | |/|
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimBlueWall2012-02-176-7/+66
| |\ \ | | |/
| | * Fix a bug where changing shape parameters of a child prim in a linkset would ...Justin Clark-Casey (justincc)2012-02-181-2/+2
| | * On Windows automatically load the correct native ODE library depending on whe...Justin Clark-Casey (justincc)2012-02-185-5/+64
| * | Parcel sales support to SQLiteBlueWall2012-02-172-1/+10
| |/
| * Fillin missing SQLite support for TelehubsBlueWall2012-02-172-0/+118
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDan Lake2012-02-1719-75/+400
| |\
| | * Add new and updated script eventsRobert Adams2012-02-172-3/+67
| | * Merge branch 'master' of /home/opensim/src/opensimBlueWall2012-02-171-0/+21
| | |\
| | | * Fix missing telehub handling on loginBlueWall2012-02-171-0/+21
| | * | Make osNpcStopAnimation() call AvatarStopAnimation() rather than AvatarPlayAn...Justin Clark-Casey (justincc)2012-02-171-1/+1
| | * | Merge branch 'master' of /home/opensim/src/opensimBlueWall2012-02-161-2/+4
| | |\ \ | | | |/
| | | * Remove some debugging output form the loggerBlueWall2012-02-161-2/+4
| | * | 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-163-2/+8
| | * | 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-162-12/+155
| | |/
| | * Correct a bug introduced in 1f402fdf (Feb 7 2012) where the delete friends gr...Justin Clark-Casey (justincc)2012-02-162-4/+4
| | * Add known identity informatio nto log message if an exception is thrown durin...Justin Clark-Casey (justincc)2012-02-161-36/+53
| | * Comment out "experimental" log message printed out whenever a physics mesh wa...Justin Clark-Casey (justincc)2012-02-161-2/+2
| * | Added the TriggerAvatarAppearanceChanged to EventManager. It's triggered by A...Dan Lake2012-02-172-0/+28
* | | Merge branch 'master' into careminsterMelanie2012-02-168-14/+87
|\ \ \ | | |/ | |/|
| * | Fix some logic mistakes where firstly osNpcCreate() without options was creat...Justin Clark-Casey (justincc)2012-02-163-5/+20
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-02-154-23/+101
| |\ \ | | |/
| * | In ObjectTortureTests, run garbage collector on Teardown and run scene loop u...Justin Clark-Casey (justincc)2012-02-155-10/+68
* | | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ...Melanie2012-02-158-164/+252
|\ \ \
| * | | Implement region crossing of sitting avatars. Edit mode and llSetPos workMelanie2012-02-146-157/+232
| * | | Prevent object loss and positioning outside the region with failed object simMelanie2012-02-144-9/+22
* | | | Merge branch 'master' into careminsterMelanie2012-02-1517-361/+906
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | Refactor appearance saving for NPC to use AvatarFactoryModule interface.Dan Lake2012-02-143-15/+38
| * | Fix a race condition in the simian groups connector. When requests wereMic Bowman2012-02-131-8/+63
| |/
| * Fix: get embedded objects from Notecard fails with activated FreeSwitchVoiceM...PixelTomsen2012-02-141-3/+3
| * Fix: Lightshare Module(Windlight)-Region settings are not applicable for data...PixelTomsen2012-02-144-307/+692
| * Fix: MSSQLDB Grid - unable to register region http://opensimulator.org/mantis...PixelTomsen2012-02-141-1/+8
| * Revert "Add GridStore migration for MSSQL."Justin Clark-Casey (justincc)2012-02-141-8/+0
| * Add GridStore migration for MSSQL.Justin Clark-Casey (justincc)2012-02-141-0/+8
| * Add some more data to the new user connection logging for debug purposes.Justin Clark-Casey (justincc)2012-02-141-3/+3
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-02-141-1/+6
| |\
| | * short circuit the expensive parts of the permission checking codeMic Bowman2012-02-131-1/+6
| * | Update [XEngine] AppDomainLoading advice in OpenSim.ini.exampleJustin Clark-Casey (justincc)2012-02-141-4/+9
| |/
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-02-1311-23/+143
| |\
| | * correct the default avatar_terminal_velocity value that I accidentally left i...Justin Clark-Casey (justincc)2012-02-111-1/+1
| | * Clamp ODE character velocity. Make ODE falling character 54m/s by default.Justin Clark-Casey (justincc)2012-02-113-1/+58
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-02-111-0/+34
| | |\