| 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 | 3 | -14/+93 |
| |\ |
|
| * | | 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 'master' into bigmerge | Melanie | 2011-10-26 | 6 | -13/+89 |
|\ \ \
| | |/
| |/| |
|
| * | | Added optional owner classes to existing OSSL agent Permissions | Michelle Argus | 2011-10-26 | 1 | -6/+61 |
| * | | 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 | 34 | -68/+77 |
|\ \
| |/ |
|
| * | 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 |
| * | Make OpenSim.Framework.Servers.HttpServer rely on OpenSim.Framework instead o... | Justin Clark-Casey (justincc) | 2011-10-25 | 26 | -4/+26 |
* | | Merge commit '9ec672c70b28b8c1d6d81bab7744fcf7bf9b83c7' into bigmerge | Melanie | 2011-10-25 | 2 | -4/+22 |
|\ \
| |/ |
|
| * | Fix bugs in EventQueueGetModule.ClientClosed() and BaseHttpServer.RemovePollS... | Justin Clark-Casey (justincc) | 2011-10-24 | 2 | -4/+22 |
* | | 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 'e28e2d24c714c3fba1cba60097986a1c1c28c6c0' into bigmerge | Melanie | 2011-10-25 | 3 | -2/+75 |
|\ \
| |/ |
|
| * | Add new EventQueueTests with basic test to check that adding a client registe... | Justin Clark-Casey (justincc) | 2011-10-24 | 3 | -2/+75 |
* | | Merge commit '4c9400e6460a73baa2d687afe73a62c6efca9f37' into bigmerge | Melanie | 2011-10-25 | 1 | -1/+10 |
|\ \
| |/ |
|
| * | Add optional getauthinfo and setauthinfo authentication service calls. | Justin Clark-Casey (justincc) | 2011-10-24 | 1 | -1/+10 |
* | | 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 |
|\ \
| |/ |
|
| * | Add case to Lightshare/Windlight | BlueWall | 2011-10-22 | 1 | -0/+3 |
* | | Merge commit 'ffdf59a57c936189e3b161b79b4a76a3a9b260bb' into bigmerge | Melanie | 2011-10-25 | 2 | -16/+48 |
|\ \
| |/ |
|
| * | Get UUIDGatherer to scan notecards in the graph for asset uuids. | Justin Clark-Casey (justincc) | 2011-10-22 | 2 | -16/+48 |
* | | Merge commit '9b3bbedeea5c6ea2421b36e5f0e23ab798870ba0' into bigmerge | Melanie | 2011-10-25 | 2 | -5/+5 |
|\ \
| |/ |
|
| * | refactor: rename some AssetHelpers.CreateAsset() methods to CreateNotecardAss... | Justin Clark-Casey (justincc) | 2011-10-22 | 2 | -5/+5 |
* | | Merge commit '4241ee5dfab99d4e247624a2f368a8a931d2e54c' into bigmerge | Melanie | 2011-10-25 | 1 | -5/+3 |
|\ \
| |/ |
|
| * | very minor removal of old commented out line of code in OdeScene | Justin Clark-Casey (justincc) | 2011-10-21 | 1 | -5/+3 |
* | | Merge commit '30fe66d3ab534422407415817b570a66096c543b' into bigmerge | Melanie | 2011-10-25 | 1 | -3/+0 |
|\ \
| |/ |
|
| * | remove unnecessary null check on _collisionEventPrim | Justin Clark-Casey (justincc) | 2011-10-20 | 1 | -3/+0 |
* | | Merge commit '9c430208769ab7fd7877093e278e8fcae02ecef3' into bigmerge | Melanie | 2011-10-25 | 3 | -25/+32 |
|\ \
| |/ |
|
| * | Get OdeScene to use passed in time step rather than hard-coded 0.089 | Justin Clark-Casey (justincc) | 2011-10-20 | 3 | -25/+32 |
* | | Merge commit '6837e44d0707e501795df2d690c6005f5ba1d591' into bigmerge | Melanie | 2011-10-25 | 1 | -12/+4 |
|\ \
| |/ |
|
| * | Pass PhysicsScene.Simulate() only the MinFrameTime rather than the useless Ma... | Justin Clark-Casey (justincc) | 2011-10-20 | 1 | -12/+4 |
* | | Merge commit 'b63ec987b0a1692da4c5e84facf0ea149d4cfe90' into bigmerge | Melanie | 2011-10-25 | 2 | -13/+5 |
|\ \
| |/ |
|
| * | For now, stop passing timeStep into methods where it's not actually used. | Justin Clark-Casey (justincc) | 2011-10-20 | 2 | -13/+5 |