aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2009-12-123-267/+153
|\
| * Getting rid of SimpleRegionInfo and SerializableRegionInfo per MelKunnis2009-12-123-498/+151
* | Merge branch 'master' into careminsterMelanie2009-12-1217-1341/+93
|\ \ | |/
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2009-12-125-6/+93
| |\
| | * A few more guards along the path to user server.Diva Canto2009-12-111-3/+6
| | * A couple of more sanity guards, but this won't fix things when user profile f...Diva Canto2009-12-111-1/+1
| | * Added an image uuid to objects marked "Show in search". Only works for boxes.Diva Canto2009-12-111-0/+70
| | * Fix to make [bad] tests happy.Diva Canto2009-12-111-4/+4
| | * Attempt at fixing mantis #4411.Diva Canto2009-12-112-2/+16
| * | Getting rid of a bunch of old classes, that are likely left over from the ROB...Kunnis2009-12-1212-1335/+0
| |/
* | Merge branch 'master' into careminsterMelanie2009-12-111-1/+1
|\ \ | |/
| * Refix the fixMelanie2009-12-111-1/+1
| * Kill a NRE caused by an error message trying to print unavailable datagrid2009-12-111-2/+2
| * * Diagnosing a connection issue.Adam Frisby2009-12-111-1/+1
* | Refix the fixMelanie2009-12-111-1/+1
* | Kill a NRE caused by an error message trying to print unavailable datagrid2009-12-101-2/+2
* | Fix version numberMelanie2009-12-101-4/+3
* | Merge branch 'tests' of kitto@tor.k-grid.com:/home/kitto/opensim into caremin...Melanie2009-12-105-129/+172
|\ \
| * | Correct AbsolutePosition calculationKittoFlora2009-12-081-1/+2
| * | Fix linked physical daughter prim position update.KittoFlora2009-12-062-5/+14
| * | Secnond revision of Sit and Stand for unscripted prims; Comment outKittoFlora2009-12-054-122/+156
* | | Merge branch 'careminster' of kitto@tor.k-grid.com:/home/kitto/opensim into c...Melanie2009-12-099-387/+600
|\ \ \
| * | | Move osFunctions into a new Careminster script interfaceCasperW2009-12-099-387/+600
* | | | Merge branch 'careminster' of kitto@tor.k-grid.com:/home/kitto/opensim into c...Melanie2009-12-0924-18/+1047
|\ \ \ \ | |/ / /
| * | | Last bits and bobs to clean up the Meta7WindlightModuleCasperW2009-12-092-1/+252
| * | | Windlight configuration option in ini, and migrationunknown2009-12-092-0/+76
| * | | Enable scripting interface for windlightunknown2009-12-0911-1/+423
| * | | Merge branch 'careminster' into windlightunknown2009-12-0739-330/+627
| |\ \ \
| * | | | Initial windlight codebase commitunknown2009-12-0716-17/+297
* | | | | Merge branch 'master' into careminsterMelanie2009-12-090-0/+0
|\ \ \ \ \ | |_|/ / / |/| | | / | | |_|/ | |/| |
| * | | Same for the remote auth connectorMelanie2009-12-071-1/+1
* | | | Same for the remote auth connectorMelanie2009-12-071-1/+1
* | | | Merge branch 'master' into careminsterMelanie2009-12-077-24/+8
|\ \ \ \ | |/ / /
| * | | Stop AuthorizationService from throwing an error if it's not configured.Melanie2009-12-071-1/+1
| * | | Getting rid of the dead field RootInventoryFolderId on UserProfileData, It's ...Kunnis2009-12-066-23/+7
* | | | Merge branch 'careminster' of ssh://TOR/home/kitto/opensim/ into careminsterCasperW2009-12-060-0/+0
|\ \ \ \
| * | | | Revert "Make ObjectSelect packet processing not use FireAndForget"Melanie2009-12-061-6/+1
| * | | | Make ObjectSelect packet processing not use FireAndForgetMelanie2009-12-061-1/+6
* | | | | Fix to existing ReaderWriterLockSlim implementationsCasperW2009-12-064-7/+26
|/ / / /
* | | | Change EntityManager to use RWlocksMelanie2009-12-061-12/+67
* | | | Fix build break from conflicted mergeMelanie2009-12-061-1/+1
* | | | Merge branch 'master' into careminsterMelanie2009-12-063-11/+31
|\ \ \ \ | |/ / /
| * | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2009-12-063-8/+30
| |\ \ \
| | * | | * Adds Normal to the fields returned by the Physics RaycasterTeravus Ovares (Dan Olivares)2009-12-053-8/+30
| * | | | Experimental: Remove explicit property sendsMelanie2009-12-061-11/+11
| * | | | Skip single prims in unlink selectionsMelanie2009-12-061-8/+11
| * | | | Change locking to not mix explicit Monitor.* calls with lock()Melanie2009-12-061-2/+12
| * | | | Remove extra forced updates. They're not needed for each prim. Really.Melanie2009-12-061-8/+8
| * | | | Lock updates out while linking and unlinkingMelanie2009-12-061-121/+134
| * | | | Eliminate multiple updates on link/unlinkMelanie2009-12-063-4/+14