22ee1c30e3
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2015-05-25 15:19:27 -07:00
35d58fe9d4
Minor change of statement order in unit test
2015-05-25 15:19:00 -07:00
abb3bb60a6
Fix mesh cache race condition in llCastRay V3.
...
Signed-off-by: Michael Cerquoni <nebadon2025@gmail.com>
2015-05-23 08:14:28 -04:00
defc9c1d86
fix permmission issue on OpenSimDefaults.ini
2015-05-22 01:22:17 -04:00
fdc383a843
Use own mesh cache in llCastRay V3 after throttling.
...
Signed-off-by: Michael Cerquoni <nebadon2025@gmail.com>
2015-05-22 01:21:50 -04:00
7d26815d0e
Throttle llCastRay V3.
...
Signed-off-by: Michael Cerquoni <nebadon2025@gmail.com>
2015-05-22 01:21:18 -04:00
edcba95ab5
Merge branch 'master' into moses
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
2015-05-20 23:40:52 +02:00
d9afe354ac
New values returned by llGetEnv
...
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>
2015-05-20 14:36:54 -04:00
946a6622fe
Removing duplicate definition
2015-05-19 15:52:13 -04:00
140ea04b9d
Merging Opensim upstream before generating patch
2015-05-19 15:18:45 -04:00
714c082ca8
Merge pull request #7 from gamucf/moses.metricsPhase2
...
Moses.metrics phase2
2015-05-19 14:40:49 -04:00
91a55c0794
Merge branch 'master' of https://github.com/M-O-S-E-S/opensim into moses.metricsPhase2
...
Fixed conflicts.
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
2015-05-19 14:07:44 -04:00
3efcef7d7e
Merge branch 'moses.metricsPhase2' of git.irl.ucf.edu:/irl/git/opensim into moses.metricsPhase2
2015-05-18 16:36:06 -04:00
6a48c87cd2
resolve possible nullref when sending appearance packet. Thanks to zadark for pointing this out.
2015-05-13 15:59:58 -07:00
3c2886cd75
Adding back command to clear region's user cache
2015-05-13 14:31:28 -05:00
cb586d1158
Enable grab feature (Ctrl+Drag) for non-physical link-sets and add code to 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>
2015-05-13 12:16:14 -05:00
7566d22a18
update libomv to 6b8afb2b61d3
2015-05-12 22:54:53 -07:00
d348f87161
Patch llCastRay fully simplified to V3.
2015-05-12 15:40:42 -07:00
d52f58a733
Disable the "show threadpool calls active" console command for now.
...
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.
2015-05-12 19:54:25 +01:00
aefed57158
One more test in UserAccountsClient.
2015-05-12 08:55:32 -07:00
9366165b34
Again, forgot to update Prebuild.xml regarding the deleted test client project. Done now.
2015-05-11 20:04:01 -07:00
923a57a91f
Added tests for UserAccountService in Robust. In the process fixed a couple 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.
2015-05-11 19:55:23 -07:00
d0292b0731
Forgot to delete an unused project from Prebuild. Done now.
2015-05-11 09:12:55 -07:00
c20a5dd75a
Trivial change just to trigger jenkins to build again
2015-05-11 09:05:09 -07:00
3df472f10d
Added inventory tests to Robust.Tests.
2015-05-11 08:52:12 -07:00
3c596e47c6
Knocked off a few compiler warnings regarding unused variables.
2015-05-10 21:54:24 -07:00
eb9b16d284
Added simple test for IM in Robust too.
...
Changed Inventory data to use the mock one in Common Tests. (but still not inventory tests)
2015-05-10 21:49:24 -07:00
4b94fb8443
Added this form that comes handy for testing the grid service in Robust.
2015-05-10 21:16:12 -07:00
811b026ed5
Deleted OpenSim.Tests.Client.GridClient and PresenceClient, as they have been subsumed by the new testing framework.
2015-05-10 21:15:22 -07:00
c2cf22ea4f
Added the beginning of a new test framework for robust connectors and 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.
2015-05-10 21:04:46 -07:00
05737a1010
Improved comments on fetch inventory tests
2015-05-10 08:59:33 -07:00
cd12ecd44e
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2015-05-10 08:48:04 -07:00
321601482b
Changed prebuild to find the new unit tests for FetchInventory
2015-05-10 08:47:38 -07:00
f992ed0f40
Added unit tests for FetchInventoryDescendents http://wiki.secondlife.com/wiki/Linden_Lab_Official:Inventory_API#Fetch_Inventory_Descendents
...
Also, consolidated the location of the files that handle inventory capabilities.
2015-05-10 08:44:21 -07:00
f20728fc86
Constrain 'terrain modify' to selected Region
...
Signed-off-by: Michael Cerquoni <nebadon2025@gmail.com>
2015-05-09 15:25:33 -04:00
adf0f49a69
Fix mantis #7054 : AO in Firestorm and Kokua stopped loading after new inventory code in place. Cause: # of descendants was wrong.
2015-05-09 08:58:59 -07:00
0bf1209f90
Another major overhaul of inventory downloading, this time pertaining to inventory links. Added yet another function to IInventoryService to get multiple items at once, so that fetching collections of linked items is done once per folder instead of once per item.
2015-05-08 20:53:28 -07:00
e5cf6a29fb
Restore handling of bad folders. I'm not entirely sure this is part of the protocol -- I don't see it here: http://wiki.secondlife.com/wiki/Linden_Lab_Official:Inventory_API#Fetch_inventory_descendents
...
But who knows!
2015-05-08 17:02:02 -07:00
3110b1661f
Apparently Firestorm sometimes sends duplicate folder ids on the same request (see http://opensimulator.org/mantis/view.php?id=7054#c28297 ). This was throwing the new inventory download code off.
...
Firestorm also sends requests for folder UUID.Zero, which doesn't exist, but doesn't cause any problems either -- it just fails. I'm leaving the warning message for now, just to keep an eye on which folders can't be found, but may remove it in the future.
2015-05-08 08:37:31 -07:00
3548e39f9a
I shouldn't write code this early in the morning... Fixing a 'duh' on previous commit.
2015-05-08 07:36:30 -07:00
a68aab14fa
Additional debug message to help diagnose a warning message and exception related to previous commit.
...
See http://opensimulator.org/mantis/view.php?id=7054#c28282
2015-05-08 06:57:06 -07:00
c74cef0f42
Major change in the way inventory is downloaded: added a method throughout IIventoryService that fetches sets of folders at once. Also added folder id in the InventoryCollection data structure, so that we don't need to go to inventory server again just for that. This reduces the chatter between sims and inventory server by... a lot. On my tests, this reduces initial inventory download down to 30% of what it currently is.
2015-05-07 19:24:08 -07:00
ca4569eeb4
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2015-05-07 12:38:40 -07:00
cc1fc400d8
pCampbot: added behavior that mimic initial inventory download. It's not exactly what the viewer does, but it's close enough, and the elapsed time can be measured.
2015-05-07 12:37:49 -07:00
dc4c9b1bb0
Minor whitespace removal
2015-05-07 14:09:29 -04:00
a9dd3028b9
Add 'terrain modify noise' and code cleanup
...
Signed-off-by: Michael Cerquoni <nebadon2025@gmail.com>
2015-05-07 14:07:50 -04:00
4bf62e11b6
'terrain modify' command for area-of-effect operations
...
Signed-off-by: Michael Cerquoni <nebadon2025@gmail.com>
2015-05-06 13:55:22 -04:00
ff40cc43fa
Merge pull request #5 from gamucf/moses.metricsPhase1
...
Moses.metrics phase1
2015-05-06 11:33:02 -04:00
8676b017b2
Attempt at fixing mantis #7054 . The two inventory threads are stepping on each other's feet. This needs real-world testing, as I'm not sure of all the consequences of reducing the number of worker threads to 1.
2015-05-05 21:28:27 -07:00
1192ca36e9
Forgot this file in the last commit
2015-05-05 21:07:04 -07:00
Diva Canto