| Commit message (Expand) | Author | Age | Files | Lines |
... | |
| * | | | Merge branch 'master' into bigmerge | Melanie | 2011-10-27 | 27 | -218/+209 |
| |\ \ \
| | | |/
| | |/| |
|
| | * | | Removed use of 'is' operator and casting to find the root ScenePresence in Me... | Dan Lake | 2011-10-27 | 4 | -82/+53 |
| | * | | Continuation of previous checkin. Found more places where ForEachScenePresenc... | Dan Lake | 2011-10-27 | 4 | -57/+39 |
| | * | | Added new ForEachRootScenePresence to Scene since almost every delegate passe... | Dan Lake | 2011-10-27 | 14 | -88/+79 |
| | |/ |
|
| | * | For now, comment out error message on new script engine console commands. | Justin Clark-Casey (justincc) | 2011-10-27 | 1 | -1/+4 |
| | * | Comment out inventory folder bulk update code on InventoryAccepted message in... | Justin Clark-Casey (justincc) | 2011-10-27 | 1 | -12/+18 |
| | * | Don't blow our brains out if LLClientView.BulkInventoryUpdate() is wrongly pa... | Justin Clark-Casey (justincc) | 2011-10-27 | 1 | -1/+3 |
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2011-10-27 | 6 | -15/+124 |
| | |\ |
|
| | * | | Fix a bug I introduced yesterday in ODE physics where prim scripts would only... | Justin Clark-Casey (justincc) | 2011-10-27 | 3 | -1/+26 |
* | | | | Merge branch 'bigmerge' of ssh://3dhosting.de/var/git/careminster into bigmerge | Melanie | 2011-10-26 | 64 | -226/+596 |
|\ \ \ \
| |/ / / |
|
| * | | | Merge branch 'master' into bigmerge | Melanie | 2011-10-26 | 10 | -22/+120 |
| |\ \ \
| | | |/
| | |/| |
|
| | * | | Merge branch 'master' of /home/opensim/var/repo/opensim | BlueWall | 2011-10-26 | 1 | -1/+17 |
| | |\ \ |
|
| | | * \ | Merge branch 'master' of /home/opensim/src/OpenSim | BlueWall | 2011-10-26 | 2 | -4/+18 |
| | | |\ \ |
|
| | | * | | | Add some things to .gitignore to make the status cleaner | BlueWall | 2011-10-26 | 1 | -1/+17 |
| | * | | | | Added optional owner classes to existing OSSL agent Permissions | Michelle Argus | 2011-10-26 | 3 | -6/+75 |
| | | |/ /
| | |/| | |
|
| | * | | | Implementation of PRIM_OMEGA, but only for setting | SignpostMarv Martin | 2011-10-26 | 2 | -4/+18 |
| | |/ / |
|
| | * | | Implementing PRIM_LINK_TARGET, but only for setting params | SignpostMarv Martin | 2011-10-26 | 2 | -4/+14 |
| | |/ |
|
| * | | Merge branch 'master' into bigmerge | Melanie | 2011-10-26 | 55 | -210/+482 |
| |\ \
| | |/ |
|
| | * | Restart the event queue worker threads that I accidentally disabled earlier t... | Justin Clark-Casey (justincc) | 2011-10-25 | 2 | -9/+11 |
| | * | In Watchdog, add ability to specific timeout for a thread. | Justin Clark-Casey (justincc) | 2011-10-25 | 1 | -16/+56 |
| | * | Add m_threads dictionary locking to Watchdog.GetThreads() | Justin Clark-Casey (justincc) | 2011-10-25 | 1 | -1/+2 |
| | * | Clear OdeCharacter CollisionEventUpdate when we subscribe or unsubscribe from... | Justin Clark-Casey (justincc) | 2011-10-25 | 1 | -0/+2 |
| | * | Remove unused fields from CollisionEventUpdate | Justin Clark-Casey (justincc) | 2011-10-25 | 5 | -28/+10 |
| | * | Get rid of the pointless null checks on collision listeners. Add warning abo... | Justin Clark-Casey (justincc) | 2011-10-25 | 3 | -7/+6 |
| | * | When sending object collision updates, don't null out and recreate the Collis... | Justin Clark-Casey (justincc) | 2011-10-25 | 2 | -13/+8 |
| | * | For ScenePresence collision events, instead of creating a new CollisionEvents... | Justin Clark-Casey (justincc) | 2011-10-25 | 3 | -9/+17 |
| | * | Fix bug where collision event listeners were not removed once the listener ha... | Justin Clark-Casey (justincc) | 2011-10-25 | 1 | -4/+5 |
| | * | minor: rename a parameter in OdeScene.Simulate() from actor -> prim since it'... | Justin Clark-Casey (justincc) | 2011-10-25 | 1 | -4/+4 |
| | * | Add new LindenCaps test dll to panda run as well as "nant test" | Justin Clark-Casey (justincc) | 2011-10-25 | 1 | -0/+5 |
| | * | minor: add "threads show" as synonym for "show threads" for consistency | Justin Clark-Casey (justincc) | 2011-10-25 | 1 | -0/+5 |
| | * | Add "threads abort <thread-id>" simulator console command that allows us to a... | Justin Clark-Casey (justincc) | 2011-10-25 | 2 | -2/+48 |
| | * | Make OpenSim.Framework.Servers.HttpServer rely on OpenSim.Framework instead o... | Justin Clark-Casey (justincc) | 2011-10-25 | 44 | -130/+308 |
* | | | Fix a missing locking call | Melanie | 2011-10-25 | 1 | -0/+1 |
|/ / |
|
* | | Merge commit 'e14cb45b9bc4c78300cb804833cb66c1c2e62187' into bigmerge | Melanie | 2011-10-25 | 1 | -12/+2 |
|\ \
| |/ |
|
| * | Drop some unnecessary ContainsKey() checking before Remove() in BaseHttpServer() | Justin Clark-Casey (justincc) | 2011-10-24 | 1 | -12/+2 |
* | | Merge commit '9ec672c70b28b8c1d6d81bab7744fcf7bf9b83c7' into bigmerge | Melanie | 2011-10-25 | 4 | -9/+31 |
|\ \
| |/ |
|
| * | Fix bugs in EventQueueGetModule.ClientClosed() and BaseHttpServer.RemovePollS... | Justin Clark-Casey (justincc) | 2011-10-24 | 4 | -9/+31 |
* | | Merge commit '79d5bc9beb445ca07cff9ecbd91d89b2a57e14da' into bigmerge | Melanie | 2011-10-25 | 1 | -8/+14 |
|\ \
| |/ |
|
| * | separate out future common setup code from EventQueueTests.AddForClient() | Justin Clark-Casey (justincc) | 2011-10-24 | 1 | -8/+14 |
* | | Merge commit '48295793b0d07579d9e31744ae6969df647f663c' into bigmerge | Melanie | 2011-10-25 | 1 | -2/+0 |
|\ \
| |/ |
|
| * | re-enable running linden udp tests in local.include, though no tests are curr... | Justin Clark-Casey (justincc) | 2011-10-24 | 1 | -2/+0 |
* | | Merge commit 'e28e2d24c714c3fba1cba60097986a1c1c28c6c0' into bigmerge | Melanie | 2011-10-25 | 6 | -2/+149 |
|\ \
| |/ |
|
| * | Add new EventQueueTests with basic test to check that adding a client registe... | Justin Clark-Casey (justincc) | 2011-10-24 | 6 | -2/+149 |
* | | Merge commit '4c9400e6460a73baa2d687afe73a62c6efca9f37' into bigmerge | Melanie | 2011-10-25 | 9 | -5/+192 |
|\ \
| |/ |
|
| * | Add optional getauthinfo and setauthinfo authentication service calls. | Justin Clark-Casey (justincc) | 2011-10-24 | 9 | -5/+193 |
* | | Merge commit 'b868328d519cfb3db597f684fd1f947912fc2222' into bigmerge | Melanie | 2011-10-25 | 1 | -4/+4 |
|\ \
| |/ |
|
| * | Comment out the uuid gatherer lines that I accidentally left in. | Justin Clark-Casey (justincc) | 2011-10-23 | 1 | -4/+4 |
* | | Merge commit 'c2272a755fc6d3b07bc9b87bd9b83f4ae063ce9f' into bigmerge | Melanie | 2011-10-25 | 1 | -0/+1 |
|\ \
| |/ |
|
| * | Fix missing Busy-Mode Response | Pixel Tomsen | 2011-10-22 | 1 | -0/+1 |
* | | Merge commit '3fc47275cff5f74e370a24f63f42a6bee023ee17' into bigmerge | Melanie | 2011-10-25 | 1 | -0/+3 |
|\ \
| |/ |
|