aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Expand)AuthorAgeFilesLines
* * Adds PhysicsCombiner ModuleTeravus Ovares (Dan Olivares)2009-08-201-0/+355
* Merge branch 'master' of ssh://MyConnection/var/git/opensimTeravus Ovares (Dan Olivares)2009-08-2058-5925/+242
|\
| * Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensimDiva Canto2009-08-202-32/+80
| |\
| | * * Implements a bunch of stuff in NPCModuleAdam Frisby2009-08-212-32/+80
| * | Fixed a missing field in SendBulkInventoryFolderUpdate.Diva Canto2009-08-201-1/+3
| |/
| * Remove the AssetInventory server from core. It has fallen behind bothMelanie2009-08-2023-5707/+0
| * Remove a load-order dependency in inventory transfer that was bitingMelanie2009-08-201-7/+6
| * Add some output (at DEBUG level) to the message transfer module to aidMelanie2009-08-201-0/+4
| * * Only update TextureEntry in AvatarAppearance if the incoming XML-RPC has a ...John Hurliman2009-08-201-1/+8
| * One more place fixed for setting the inventory folder owner. Thanks jhurliman.Diva Canto2009-08-201-1/+1
| * Commented T021_TestCrossToNewRegion because (1) it can fail on panda, and (2)...Diva Canto2009-08-191-1/+8
| * Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensimDiva Canto2009-08-1924-164/+115
| |\
| | * Fixing a spot I missed in assets. Switching Grid to the new naming schema wit...Kunnis2009-08-1911-69/+42
| | * * Switching IAssetData to follow the new naming schema, removing the separate...Kunnis2009-08-1913-95/+73
| | * Fixes GetRootFolder for normal standalone, which was being incorrectly redire...Diva Canto2009-08-192-5/+5
| * | Fixes GetItem and GetFolder for SQLite. Turns out some methods were no-op in ...Diva Canto2009-08-194-10/+10
| |/
| * Makes the inventory connectors fully compatible with the old Grid.InventorySe...Diva Canto2009-08-191-29/+35
* | * Deal with git thinking that file was changed even though it wasn't and it's...Teravus Ovares (Dan Olivares)2009-08-201-24/+24
* | * Switch border cross tests over to the new Border class.Teravus Ovares (Dan Olivares)2009-08-204-14/+116
* | Merge branch 'master' of ssh://MyConnection/var/git/opensimTeravus Ovares (Dan Olivares)2009-08-1935-166/+649
|\ \ | |/
| * Added MoveItems, which is most useful upon viewer-delete inventory operation....Diva Canto2009-08-1916-38/+162
| * Async purge so that the client thread doesn't wait.Diva Canto2009-08-192-7/+27
| * Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensimDiva Canto2009-08-199-26/+230
| |\
| | * Graft the REST console onto the message server as well. What a dirty hack!Melanie2009-08-192-21/+74
| | * Graft the REST console onto the grid server. Same procedure as withMelanie2009-08-194-4/+52
| | * Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensimMelanie2009-08-193-17/+56
| | |\
| | | * osGetLinkPrimitiveParams fixJeff Lee2009-08-181-1/+25
| | * | Add rest console support to the user server. Will ask new questions atMelanie2009-08-193-1/+80
| * | | A better purge of trash folder.Diva Canto2009-08-1920-53/+106
| * | | GetFolderItems implemented. It's not being called, but it might.Diva Canto2009-08-185-3/+48
| * | | jhurliman's patch in http://opensimulator.org/mantis/view.php?id=4024Diva Canto2009-08-189-30/+52
| | |/ | |/|
| * | Added new OpenSim.ini setting: "client_throttle_max_bps" which overrides user...dahlia2009-08-182-16/+31
| |/
* | Add Border (a virtual border management class)Teravus Ovares (Dan Olivares)2009-08-194-4/+455
* | *remove conflictsTeravus Ovares (Dan Olivares)2009-08-18103-2055/+3432
|\ \ | |/
| * Fixes mantis #4020 (http://opensimulator.org/mantis/view.php?id=4020)Diva Canto2009-08-181-14/+12
| * Commented 2 tests in ScenePresenceTests, one because things were being done i...Diva Canto2009-08-171-6/+13
| * Added one conditional missing on login, for creating inventory if it doesn't ...Diva Canto2009-08-171-1/+13
| * Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensimDiva Canto2009-08-174-100/+31
| |\
| | * Did I say that i don't like git? Remove some stuff that shouldn't haveMelanie2009-08-174-100/+31
| * | Commented out one IAR test, because it's failing and needs attention from jus...Diva Canto2009-08-171-5/+7
| |/
| * Added some padding to the remote inventory connector so that it tries to oper...Diva Canto2009-08-171-4/+70
| * Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensimDiva Canto2009-08-178-26/+86
| |\
| | * no-op to poke pandaJustin Clark-Casey (justincc)2009-08-171-4/+4
| | * Apply http://opensimulator.org/mantis/view.php?id=4016Justin Clark-Casey (justincc)2009-08-171-0/+13
| | * Apply http://opensimulator.org/mantis/view.php?id=3538Justin Clark-Casey (justincc)2009-08-172-4/+18
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimAdam Frisby2009-08-181-0/+2
| | |\
| | | * * More Test tweaking to get down to the root cause of the test wierdnessTeravus Ovares (Dan Olivares)2009-08-171-0/+2
| | * | Added additional configuration options for MRM Security. See OpenSim.ini.exam...Adam Frisby2009-08-181-8/+22
| | |/
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimAdam Frisby2009-08-1835-362/+1531
| | |\
| | * | * Implementing a bunch of Unimplemented MRM stubs.Adam Frisby2009-08-182-10/+27