aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2015-05-261-1/+1
|\
| * fix file perms and change AllowLightshareFunctions to AllowLightShareFunctionsMichael Cerquoni2015-05-251-1/+1
| |
* | Attachments Module. Fix detach event not being fired until the next time the ↵AliciaRaven2015-05-261-0/+5
|/ | | | | | | | object is attached. Not an ideal fix but this allows scripts such as AOs to remove animations when detached etc. The pause added does not affect other avatars or the scene in general and only pauses the avatar performing the detach for an extra 2 milliseconds. Signed-off-by: Diva Canto <diva@metaverseink.com>
* Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2015-05-2520-15051/+25562
|\
| * Fix mesh cache race condition in llCastRay V3.Magnuz Binder2015-05-231-2/+4
| | | | | | | | Signed-off-by: Michael Cerquoni <nebadon2025@gmail.com>
| * fix permmission issue on OpenSimDefaults.iniMichael Cerquoni2015-05-221-0/+0
| |
| * Use own mesh cache in llCastRay V3 after throttling.Magnuz Binder2015-05-222-41/+110
| | | | | | | | Signed-off-by: Michael Cerquoni <nebadon2025@gmail.com>
| * Throttle llCastRay V3.Magnuz Binder2015-05-222-2/+106
| | | | | | | | Signed-off-by: Michael Cerquoni <nebadon2025@gmail.com>
| * Merge branch 'master' into mosesMelanie Thielker2015-05-203-2/+41
| |\ | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| | * New values returned by llGetEnvTalun2015-05-202-2/+40
| | | | | | | | | | | | | | | | | | | | | | | | Implements recent changes to llGetEnv region_cpu_ratio hardcoded to 1 region_product_sku hardcoded to OpenSim Signed-off-by: Michael Cerquoni <nebadon2025@gmail.com>
| * | Removing duplicate definitionMichael Heilmann2015-05-191-2/+0
| | |
| * | Merging Opensim upstream before generating patchMichael Heilmann2015-05-19136-15885/+30048
| |\ \ | | |/
| | * resolve possible nullref when sending appearance packet. Thanks to zadark ↵dahlia2015-05-131-0/+1
| | | | | | | | | | | | for pointing this out.
| | * Adding back command to clear region's user cacheBlueWall2015-05-131-7/+22
| | |
| | * Enable grab feature (Ctrl+Drag) for non-physical link-sets and add code to ↵AliciaRaven2015-05-131-6/+24
| | | | | | | | | | | | | | | | | | | | | | | | handle spin (Ctrl+Shift+Drag) This patch fixes permission issues with dragging scripted objects. As on LL grid, scripted prims can not be dragged. Also after dragging, the group was not marked as updated. This meant that after the region was restarted the group would revert to its original position. This version fixes issues where scripts in child prims were not detected and also blocks grab for attachments. Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
| | * update libomv to 6b8afb2b61d3dahlia2015-05-127-14020/+24000
| | |
| | * Patch llCastRay fully simplified to V3.Magnuz Binder2015-05-122-227/+248
| | |
| | * Disable the "show threadpool calls active" console command for now.Justin Clark-Casey (justincc)2015-05-121-5/+5
| | | | | | | | | | | | | | | | | | | | | Whilst this can be very useful to identify threads held too long by incoming packet processing, it can also be very misleading as the count updates are not atomic (race conditions lead to growth in numbers over time). This could be solved by making the counts volatile but I don't currently have time to assess the performance impact, though it's almost certainly negligible. If anybody else wants to do that and re-enable this command then please feel free.
| * | Merge pull request #7 from gamucf/moses.metricsPhase2Michael Heilmann2015-05-197-753/+1014
| |\ \ | | | | | | | | Moses.metrics phase2
| | * \ Merge branch 'master' of https://github.com/M-O-S-E-S/opensim into ↵Glenn Martin2015-05-191-0/+2
| | |\ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | moses.metricsPhase2 Fixed conflicts. Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * | | Merge pull request #5 from gamucf/moses.metricsPhase1Michael Heilmann2015-05-062-9/+12
| |\ \ \ | | | | | | | | | | Moses.metrics phase1
| | * \ \ Merge remote-tracking branch 'upstream/master' into moses.metricsPhase1Glenn Martin2015-05-010-0/+0
| | |\ \ \ | | |/ / / | |/| | |
| | * | | Changed the 10 value to be a constant value inside of the Scene called ↵Steven Zielinski2015-04-292-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | m_DefaultNumberFramesStored. Test Plan: Tested on windows with the json stats reporter. Reviewers: rlouden, kboswell, clattin, ssirigam, martin Reviewed By: rlouden, kboswell, clattin, ssirigam, martin Differential Revision: http://cr.irl.ucf.edu/D273
| | * | | Changed the 10 value to be a constant value inside of the Scene called ↵Steven Zielinski2015-04-282-9/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | m_DefaultNumberFramesStored. Test Plan: Tested on windows with the json stats reporter. Reviewers: rlouden, ssirigam, martin, kboswell, clattin Differential Revision: http://cr.irl.ucf.edu/D273
| | | * | Merge branch 'moses.metricsPhase2' of git.irl.ucf.edu:/irl/git/opensim into ↵Glenn Martin2015-05-181-1/+5
| | | |\ \ | | | | | | | | | | | | | | | | | | moses.metricsPhase2
| | | | * | Fixed a bug that would cause the sim extra stats reporter to fail in ↵Steven Zielinski2015-05-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | reporting stats. The bug was caused by the current process threads which can return null references. Test Plan: Tested on windows using opensim standalone and the json stats. Reviewers: rlouden, ssirigam, clattin, martin, kboswell Reviewed By: rlouden, ssirigam, clattin, martin, kboswell Differential Revision: http://cr.irl.ucf.edu/D277
| | | | * | Fixed vocabulary in a comment to match the code.Steven Zielinski2015-05-041-1/+1
| | | | | |
| | | | * | Fixed a bug that would cause the sim extra stats reporter to fail in ↵Steven Zielinski2015-05-011-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | reporting stats. The bug was caused by the current process threads which can return null references. Test Plan: Tested on windows using opensim standalone and the json stats. Reviewers: rlouden, kboswell, clattin, martin, ssirigam Differential Revision: http://cr.irl.ucf.edu/D277
| | | * | | Merge remote-tracking branch 'upstream/master' into moses.metricsPhase2Glenn Martin2015-05-011-0/+9
| | | |\ \ \ | | |_|/ / / | |/| | / / | | | |/ / | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
| * | | | Merge pull request #1 from gamucf/moses.metricsPhase1Michael Heilmann2015-04-223-19/+232
| |\ \ \ \ | | |/ / / | | | | | Moses.metrics Phase1
| | * | | Added in all metrics for Phase 1 except for Time Dilation.Steven Zielinski2015-04-212-9/+218
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test Plan: Tested on local opensim and firestorm. Not tested with JSON stats reporter. Reviewers: rlouden Reviewed By: rlouden Differential Revision: http://cr.irl.ucf.edu/D269
| | | * | Updated phase 2 to have the changes originally done in phase 1 for the ↵Steven Zielinski2015-04-302-5554/+5557
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | defaultNumberFramesStored. Test Plan: Tested using opensim standalone on windows with json stats. Reviewers: rlouden Reviewed By: rlouden Differential Revision: http://cr.irl.ucf.edu/D275
| | | * | Readded file to repository. Acciedently removed.Robert Louden2015-04-211-0/+0
| | | | |
| | | * | Phase 2 additons with Frame Dilation metric.Robert Louden2015-04-211-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test Plan: Compiles and runs successfully. Reviewers: szielinski Reviewed By: szielinski Differential Revision: http://cr.irl.ucf.edu/D268
| | | * | Phase 2 additons with Frame Dilation metric.Robert Louden2015-04-213-5708/+5733
| | | | |
| | | * | Moved over metrics from previous OpenSim 0.8.0.3 repository (this new ↵Glenn Martin2015-04-216-19/+449
| | |/ / | | | | | | | | | | | | repository is now the master branch from OpenSim).
* | | | Minor change of statement order in unit testDiva Canto2015-05-251-3/+4
| |_|/ |/| |
* | | One more test in UserAccountsClient.Diva Canto2015-05-121-1/+5
| | |
* | | Again, forgot to update Prebuild.xml regarding the deleted test client ↵Diva Canto2015-05-111-27/+0
| | | | | | | | | | | | project. Done now.
* | | Added tests for UserAccountService in Robust. In the process fixed a couple ↵Diva Canto2015-05-116-189/+124
| | | | | | | | | | | | of bugs in the network connectors. For some reason the robust-bound code had a CreateUser method, while the client-bound code had no such method. I assume someone is extending the client-side code with their own connectors. I added the missing method, but didn't add it to the service interface.
* | | Forgot to delete an unused project from Prebuild. Done now.Diva Canto2015-05-111-27/+0
| | |
* | | Trivial change just to trigger jenkins to build againDiva Canto2015-05-111-0/+1
| | |
* | | Added inventory tests to Robust.Tests.Diva Canto2015-05-115-8/+166
| | |
* | | Knocked off a few compiler warnings regarding unused variables.Diva Canto2015-05-108-8/+1
| | |
* | | Added simple test for IM in Robust too.Diva Canto2015-05-103-68/+30
| | | | | | | | | | | | Changed Inventory data to use the mock one in Common Tests. (but still not inventory tests)
* | | Added this form that comes handy for testing the grid service in Robust.Diva Canto2015-05-101-0/+11
| | |
* | | Deleted OpenSim.Tests.Client.GridClient and PresenceClient, as they have ↵Diva Canto2015-05-105-418/+0
| | | | | | | | | | | | been subsumed by the new testing framework.
* | | Added the beginning of a new test framework for robust connectors and ↵Diva Canto2015-05-107-2/+862
| | | | | | | | | | | | services. For now, just Grid and Presence. This framework starts a robust server (as a thread) listening on a port in localhost, then the tests are client code.
* | | Improved comments on fetch inventory testsDiva Canto2015-05-101-1/+12
| | |
* | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2015-05-101-8/+17
|\ \ \