aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2015-06-091-25/+49
|\
| * Address Mantis 7592 (http://opensimulator.org/mantis/view.php?id=7592) byRobert Adams2015-06-061-25/+49
| | | | | | | | | | | | | | | | disabling terrain patch sending by view distance for legacy sized regions. The problem seems to be that people expect adjacent legacy sized regions to just display like they always have. Limiting displayed terrain is complicated by the camera position not being updated in child regions.
* | Avoid registering console commands in every single instance of ↵Diva Canto2015-06-091-16/+22
|/ | | | GridUserService running on the same process. Only one registers them now.
* Typo FixH-H-H2015-06-051-1/+1
| | | | Signed-off-by: Diva Canto <diva@metaverseink.com>
* Upgraded the Simian inventory connector with an item cache, too, so that it ↵Diva Canto2015-06-051-1/+17
| | | | doesn't get awfully out of sync with the improvements I'm making to the robust service connectors, which are being fully leveraged by the simulator. This Simian connector needs more love...
* More on mantis #7567. Two things:Diva Canto2015-06-052-2/+12
| | | | | - Increase the inventory cache timeout to 20 secs, so that the items will still be there when they are needed by the sim for rezzing - Before rezzing attachs, make a call to GetMultipleItems so to fetch them all at the same time
* The only purpose of this commit is to remove an erroneous comment. It turns ↵Diva Canto2015-06-051-4/+2
| | | | out that rezzing the attachments is necessary in modern viewers too. Proof: commenting the lines below the comment results in no attachments seen in the avatar.
* Mantis #7603 -- bad folders in inventory could produce null pointer ↵Diva Canto2015-06-041-1/+1
| | | | exception. Thanks for the line numbers in the exception trace.
* Mantis #7536. This may alleviate the side effects of broken SceneObjects ↵Diva Canto2015-06-041-15/+20
| | | | XML. It doesn't (can't) fix the cause.
* Mantis #7600. The warning message was not a symptom of a problem, it was ↵Diva Canto2015-06-041-9/+11
| | | | just that the HG client was trying to fetch folders that aren't in the Suitcase, so that fails. This should make the warning message go away in that situation. (fetching those folders will still fail, because they aren't available over HG)
* Trivial: fix copy-paste typo in stringDiva Canto2015-06-041-1/+1
|
* More assertions in inventory client tests to check for assorted combinations ↵Diva Canto2015-06-041-1/+26
| | | | of cached/non-cached/existing/non-existing items
* Added tests that verify the absence of the bug fixed in the previous commits ↵Diva Canto2015-06-041-1/+29
| | | | (cache issues).
* Making the inventory cache static, so that there's less timers.Diva Canto2015-06-041-1/+1
|
* Mantis #7567. Once again, avoiding prefetching linked items within linked ↵Diva Canto2015-06-042-15/+9
| | | | folders. Also fixing the inventory connector GetMultipleItems, so that if everything is in the cache, it returns successfully rather than unsuccessfully.
* Mantis #7567: added an 8-sec expiring item cache to the inventory network ↵Diva Canto2015-06-036-29/+57
| | | | | | | | connector. This fixed the problem on my local test grid and generally made things faster. This cache has been needed for a while... there are many parts in the code where the sim gets an item multiple times in a short amount of time (rezzing attachs and objects, for example). Other minor changes: - added the scene as a parameter to the constructor od FetchInvDescHandler, so that I could see in which scene the handler was being called - brought linked items in linked folders back to being prefetched
* I suspect the viewer doesn't need the target of linked items inside linked ↵Diva Canto2015-06-021-14/+14
| | | | folders to go in the reply of the original request. At least my tests indicate that. Pushing this out, so that others who use linked folders a lot more can verify.
* New unit tests for FetchInventory2 cap.Diva Canto2015-06-021-0/+170
|
* Mantis #7567. One of the reported log messages showed this:Diva Canto2015-06-021-3/+26
| | | | | 09:38:40 - [LOGHTTP]: Slow handling of 15572 POST /CAPS/b12c7e98-8261-4953-b7d1-1c414c9893fc FetchInventory2 8acfbca3-13b5-434f-898c-5f4bbe8a76ff from 92.237.199.112:60083 took 62391ms FetchInventory itself wasn't taking advantage of the new inventory API. This commit fixes that.
* Mantis #7594: putting things as they were before regarding duplicate ↵Diva Canto2015-06-012-4/+42
| | | | removal. Also added test to check that duplicates are being removed. The test passes. I have no idea how duplicates would not be removed, as reported in the mantis.
* Mantis #7594. Fixing the broken code I just introduced.Diva Canto2015-06-011-1/+4
|
* More on mantis #7594, this a=time addressing the reported exception, which ↵Diva Canto2015-06-011-0/+3
| | | | seems to be a separate issue from the duplicate folders.
* Mantis #7594. This should be functionally equivalent to what it was, but ↵Diva Canto2015-06-011-2/+2
| | | | just in case mono has a bug in List<T>.Find, here is the Linq equivalent of distinct-ness.
* Correct constant RCERR_CAST_TIME_EXCEEDED.Magnuz Binder2015-06-011-1/+1
| | | | Signed-off-by: Michael Cerquoni <nebadon2025@gmail.com>
* Add a new os function "osGetGender()"dahlia2015-05-293-0/+51
|
* llListRandomize() wasn't very randomCinder2015-05-272-6/+58
| | | | Signed-off-by: Diva Canto <diva@metaverseink.com>
* 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-2510-1013/+1508
|\
| * Fix mesh cache race condition in llCastRay V3.Magnuz Binder2015-05-231-2/+4
| | | | | | | | Signed-off-by: Michael Cerquoni <nebadon2025@gmail.com>
| * Use own mesh cache in llCastRay V3 after throttling.Magnuz Binder2015-05-221-39/+104
| | | | | | | | Signed-off-by: Michael Cerquoni <nebadon2025@gmail.com>
| * Throttle llCastRay V3.Magnuz Binder2015-05-221-2/+90
| | | | | | | | Signed-off-by: Michael Cerquoni <nebadon2025@gmail.com>
| * Merge branch 'master' into mosesMelanie Thielker2015-05-202-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-19125-1777/+5364
| |\ \ | | |/
| | * 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>
| | * Patch llCastRay fully simplified to V3.Magnuz Binder2015-05-121-212/+217
| | |
| | * 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 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
| | * | 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
| | * | 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
generated by cgit v1.1 at 2024-10-12 17:26:43 +0000