aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into bigmergeMelanie2011-10-2610-22/+120
|\
| * Merge branch 'master' of /home/opensim/var/repo/opensimBlueWall2011-10-261-1/+17
| |\
| | * Merge branch 'master' of /home/opensim/src/OpenSimBlueWall2011-10-262-4/+18
| | |\
| | * | Add some things to .gitignore to make the status cleanerBlueWall2011-10-261-1/+17
| * | | Added optional owner classes to existing OSSL agent PermissionsMichelle Argus2011-10-263-6/+75
| | |/ | |/|
| * | Implementation of PRIM_OMEGA, but only for settingSignpostMarv Martin2011-10-262-4/+18
| |/
| * Implementing PRIM_LINK_TARGET, but only for setting paramsSignpostMarv Martin2011-10-262-4/+14
* | Merge branch 'master' into bigmergeMelanie2011-10-2655-210/+482
|\ \ | |/
| * Restart the event queue worker threads that I accidentally disabled earlier t...Justin Clark-Casey (justincc)2011-10-252-9/+11
| * In Watchdog, add ability to specific timeout for a thread.Justin Clark-Casey (justincc)2011-10-251-16/+56
| * Add m_threads dictionary locking to Watchdog.GetThreads()Justin Clark-Casey (justincc)2011-10-251-1/+2
| * Clear OdeCharacter CollisionEventUpdate when we subscribe or unsubscribe from...Justin Clark-Casey (justincc)2011-10-251-0/+2
| * Remove unused fields from CollisionEventUpdateJustin Clark-Casey (justincc)2011-10-255-28/+10
| * Get rid of the pointless null checks on collision listeners. Add warning abo...Justin Clark-Casey (justincc)2011-10-253-7/+6
| * When sending object collision updates, don't null out and recreate the Collis...Justin Clark-Casey (justincc)2011-10-252-13/+8
| * For ScenePresence collision events, instead of creating a new CollisionEvents...Justin Clark-Casey (justincc)2011-10-253-9/+17
| * Fix bug where collision event listeners were not removed once the listener ha...Justin Clark-Casey (justincc)2011-10-251-4/+5
| * minor: rename a parameter in OdeScene.Simulate() from actor -> prim since it'...Justin Clark-Casey (justincc)2011-10-251-4/+4
| * Add new LindenCaps test dll to panda run as well as "nant test"Justin Clark-Casey (justincc)2011-10-251-0/+5
| * minor: add "threads show" as synonym for "show threads" for consistencyJustin Clark-Casey (justincc)2011-10-251-0/+5
| * Add "threads abort <thread-id>" simulator console command that allows us to a...Justin Clark-Casey (justincc)2011-10-252-2/+48
| * Make OpenSim.Framework.Servers.HttpServer rely on OpenSim.Framework instead o...Justin Clark-Casey (justincc)2011-10-2544-130/+308
* | Merge commit 'e14cb45b9bc4c78300cb804833cb66c1c2e62187' into bigmergeMelanie2011-10-251-12/+2
|\ \ | |/
| * Drop some unnecessary ContainsKey() checking before Remove() in BaseHttpServer()Justin Clark-Casey (justincc)2011-10-241-12/+2
* | Merge commit '9ec672c70b28b8c1d6d81bab7744fcf7bf9b83c7' into bigmergeMelanie2011-10-254-9/+31
|\ \ | |/
| * Fix bugs in EventQueueGetModule.ClientClosed() and BaseHttpServer.RemovePollS...Justin Clark-Casey (justincc)2011-10-244-9/+31
* | Merge commit '79d5bc9beb445ca07cff9ecbd91d89b2a57e14da' into bigmergeMelanie2011-10-251-8/+14
|\ \ | |/
| * separate out future common setup code from EventQueueTests.AddForClient()Justin Clark-Casey (justincc)2011-10-241-8/+14
* | Merge commit '48295793b0d07579d9e31744ae6969df647f663c' into bigmergeMelanie2011-10-251-2/+0
|\ \ | |/
| * re-enable running linden udp tests in local.include, though no tests are curr...Justin Clark-Casey (justincc)2011-10-241-2/+0
* | Merge commit 'e28e2d24c714c3fba1cba60097986a1c1c28c6c0' into bigmergeMelanie2011-10-256-2/+149
|\ \ | |/
| * Add new EventQueueTests with basic test to check that adding a client registe...Justin Clark-Casey (justincc)2011-10-246-2/+149
* | Merge commit '4c9400e6460a73baa2d687afe73a62c6efca9f37' into bigmergeMelanie2011-10-259-5/+192
|\ \ | |/
| * Add optional getauthinfo and setauthinfo authentication service calls.Justin Clark-Casey (justincc)2011-10-249-5/+193
* | Merge commit 'b868328d519cfb3db597f684fd1f947912fc2222' into bigmergeMelanie2011-10-251-4/+4
|\ \ | |/
| * Comment out the uuid gatherer lines that I accidentally left in.Justin Clark-Casey (justincc)2011-10-231-4/+4
* | Merge commit 'c2272a755fc6d3b07bc9b87bd9b83f4ae063ce9f' into bigmergeMelanie2011-10-251-0/+1
|\ \ | |/
| * Fix missing Busy-Mode ResponsePixel Tomsen2011-10-221-0/+1
* | Merge commit '3fc47275cff5f74e370a24f63f42a6bee023ee17' into bigmergeMelanie2011-10-251-0/+3
|\ \ | |/
| * Add case to Lightshare/WindlightBlueWall2011-10-221-0/+3
* | Merge commit '655aee44c4236d7023b9274645bf033b87b17131' into bigmergeMelanie2011-10-251-23/+21
|\ \ | |/
| * Rename some of the example commented out server names to mygridserver.com lik...Justin Clark-Casey (justincc)2011-10-221-23/+21
* | Merge commit '229ca09b7956f51fc2618dc35dff87cf04bf0fc9' into bigmergeMelanie2011-10-252-17/+19
|\ \ | |/
| * Make config comments about choosing assetcache modules clearer.Justin Clark-Casey (justincc)2011-10-222-17/+19
* | Merge commit 'ffdf59a57c936189e3b161b79b4a76a3a9b260bb' into bigmergeMelanie2011-10-255-24/+68
|\ \ | |/
| * Get UUIDGatherer to scan notecards in the graph for asset uuids.Justin Clark-Casey (justincc)2011-10-225-24/+68
* | Merge commit '30320505fa54640baf4ecaff8bb743f62ef01f86' into bigmergeMelanie2011-10-252-12/+19
|\ \ | |/
| * redirect UserInventoryHelpers to use a different CreateNotecardAsset() so we ...Justin Clark-Casey (justincc)2011-10-222-12/+19
* | Merge commit 'bc2da4eaadb0dbf8502d95fc2e40b1fdcc86e218' into bigmergeMelanie2011-10-251-1/+1
|\ \ | |/
| * correct misleading method doc on CreateNotecardAsset()Justin Clark-Casey (justincc)2011-10-221-1/+1
generated by cgit v1.1 at 2024-12-16 23:14:48 +0000