aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-05-151-1/+4
|\
| * Guard against null root part on SQLite. This really needs to be fixed so SQLiteMelanie2012-05-151-1/+1
| * 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
|\ \ \ | | |/ | |/|
| * | 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 se...Justin Clark-Casey (justincc)2012-05-141-0/+10
| * | 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 (i....Justin Clark-Casey (justincc)2012-05-141-11/+37
| * | 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
| | |\ \
| | | * | Modifications for SMTP in OpenSimulator. Email size limit was fixed (was out ...Chris Koeritz2012-05-132-26/+26
| | * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimBlueWall2012-05-131-1/+1
| | |\ \ \ | | | |/ / | | |/| |
| | * | | Add configurable SpawnPointRoutingBlueWall2012-05-132-38/+146
| * | | | Add more region information to some teleport related loggingJustin Clark-Casey (justincc)2012-05-141-7/+8
| | |/ / | |/| |
* | | | Merge branch 'avination' into careminsterMelanie2012-05-1311-29/+129
|\ \ \ \ | | |_|/ | |/| |
| * | | ubitODE fix force in case of mlinear motor offset presentUbitUmarov2012-05-131-4/+5
| * | | display a sleep time of zero if forced spare time to zero, when sim fps is l...UbitUmarov2012-05-121-2/+7
| * | | ªTEST MESS* reduce animation packets send. Added onchangeanim event with par...UbitUmarov2012-05-127-3/+53
| * | | Merge branch 'avination' into ubitworkUbitUmarov2012-05-124-0/+96
| |\ \ \
| * | | | ubitODE let vehicles responde faster to changes of some parameters like motor...UbitUmarov2012-05-121-12/+13
| * | | | ubitODE reduced again a bit the max allowed correction velocity on colisions...UbitUmarov2012-05-121-1/+1
| * | | | ubitODE: trial workaround for avatar colisionsUbitUmarov2012-05-121-6/+49
| * | | | revert terminal vel reduction. It helped but not efectiveUbitUmarov2012-05-111-2/+2
* | | | | Merge branch 'avination' into careminsterMelanie2012-05-133-106/+163
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Mantis 6015 new LSL function llGetAgentList.Talun2012-05-114-0/+96
| |/ / /
| * | | reduce avatars terminal velocity to less than 30m/s or colisions with basic b...UbitUmarov2012-05-102-6/+9
| * | | ubitode: changes to vehicles servosUbitUmarov2012-05-101-100/+154
* | | | Merge branch 'master' into careminsterMelanie2012-05-139-32/+444
|\ \ \ \ | | |/ / | |/| |
| * | | Fix mono compiler warning.Justin Clark-Casey (justincc)2012-05-121-1/+1
| | |/ | |/|
| * | Revert "Save the Telehub and its Spawn Points in the OAR"Justin Clark-Casey (justincc)2012-05-126-100/+5
| * | Save the Telehub and its Spawn Points in the OAROren Hurvitz2012-05-106-5/+100
| * | Print out more information on connecting botsJustin Clark-Casey (justincc)2012-05-112-9/+19
| * | Increase minimum period between bot actions to 3 seconds, so that teleport do...Justin Clark-Casey (justincc)2012-05-111-2/+2
| * | Stagger multiple bot logins by 5 seconds to make this part of the test more '...Justin Clark-Casey (justincc)2012-05-111-0/+13
| * | Do bot startup on another thread so console is responsive during this processJustin Clark-Casey (justincc)2012-05-112-1/+5
| * | Do each bot shutdown on its own threads to prevent one slow shutdown holding ...Justin Clark-Casey (justincc)2012-05-111-8/+13
| * | Change bot.IsConnected to be ConnectionState with Disconnected, Connecting, C...Justin Clark-Casey (justincc)2012-05-112-5/+22
| * | If a bot is not connected, show region name "(none)" instead of throwing an e...Justin Clark-Casey (justincc)2012-05-111-1/+3
| * | Add ConsoleTable framework class for future uniform formatting of console out...Justin Clark-Casey (justincc)2012-05-102-8/+165
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-05-103-7/+34
| |\ \
| | * \ Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDan Lake2012-05-1028-27/+136
| | |\ \
| | * | | Add even for terrain tainting and synchronize terrain module with physics sce...Dan Lake2012-05-103-7/+34
| * | | | Add "attachments" show console command that will show the server's record of ...Justin Clark-Casey (justincc)2012-05-101-0/+177
| | |/ / | |/| |
* | | | Merge branch 'master' into careminsterMelanie2012-05-103-9/+13
|\ \ \ \ | |/ / /
| * | | Saving estate state is really slow (relatively) and it getsMic Bowman2012-05-103-9/+13