ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-03 15:36:16 +08:00
Code Issues Packages Projects Releases Wiki Activity
27,226 Commits 5 Branches 88 Tags
254008cd1fe8d76c1eb7f2aeb2e8e55d923f2e4e
Commit Graph

4566 Commits

Author SHA1 Message Date
Robert Adams
e5367d822b Merge of ubitworkvarnew with opensim/master as of 20150905. 
This integrates the OpenSim refactoring to make physics, etc into modules.
AVN physics hasn't been moved to new location.
Does not compile yet.

Merge branch 'osmaster' into mbworknew1
 2015-09-08 04:54:16 -07:00
Diva Canto
f928d41a27 Amend to previous commit: delete the corresponding AssemblyInfo's 2015-09-05 17:40:27 -07:00
Diva Canto
3cf07564b6 Moved the two region loaders into the RegionLoaderPlugin dll, therefore eliminating 2 top-level dlls that didn't make much sense. 2015-09-05 17:37:07 -07:00
UbitUmarov
0ddcc55166 let extra stats travel side by side with viewers ones... try to fix damm array indexes all over the place 2015-09-06 00:32:20 +01:00
Diva Canto
5bfc2743c6 Deleted unused file. 2015-09-05 15:20:32 -07:00
UbitUmarov
4b1ecc90fc fix modifing m_threads on a foreach scanning it 2015-09-05 21:23:22 +01:00
Diva Canto
d00f73c3a4 Deleted OpenSim.Framework.Communications. Moved its two remaining files to OpenSim.Framework. 2015-09-04 14:39:23 -07:00
Diva Canto
9005365115 Deleted old unfinished code under Framework.Communications that wasn't being used anywhere. 
Also folded GenericAsyncResult into RestClient, since it is used only there. This is preparation to remove Framework.Communications entirely.
 2015-09-04 14:14:53 -07:00
Diva Canto
1559fc42b6 Deleted unused interface 2015-09-04 13:45:52 -07:00
UbitUmarov
f0c865555b add a GetTimeStampMS method, this returns a time stamp in miliSeconds with the resolution avaiable for StopWatchs. Value in double since it can be large (as machine uptime in high resolution ticks) 2015-09-04 11:05:15 +01:00
UbitUmarov
b265e35d7c missing file 2015-09-03 18:50:51 +01:00
UbitUmarov
cdaed11387 at last we can login and see objects ( friends is dead and disable in 
scenepresence)
 2015-09-03 18:39:08 +01:00
UbitUmarov
a11edceb00 seems to compile ( tests comented out) 2015-09-02 19:54:53 +01:00
UbitUmarov
371c9dd2af bad merge? 2015-09-01 14:54:35 +01:00
Diva Canto
134d4300f0 All physics plugins are now region modules. Compiles but doesn't run. 2015-08-31 13:02:51 -07:00
UbitUmarov
0edffae7e4 more on tps and crossings 2015-08-30 19:17:35 +01:00
UbitUmarov
c7f148ee64 minor clear. Use isTainted in is read clear form 2015-08-27 14:13:23 +01:00
UbitUmarov
ef3deffeeb remove rest of ushort test code 2015-08-25 17:54:49 +01:00
UbitUmarov
244f0c6352 change terrain internal representation to float. ushort work with legal 
sl terrain, but may break existent terrain and that may cost a lot more
 than the cost of memory
 2015-08-25 16:51:48 +01:00
UbitUmarov
64d05bab0f terrain stored as ushorts with gzip compression 2015-08-25 13:36:45 +01:00
UbitUmarov
1c752296bf change internal representation of terrain from int to ushort. This will 
suporte height from 0 to 655.53m that includes SL limits ( still need to
 add code to trap eventual negative values from dbs or user input)
 2015-08-24 18:40:28 +01:00
UbitUmarov
e3d82ad706 delay terrain sending if land queue is 2 busy 2015-08-22 04:08:30 +01:00
UbitUmarov
0b105da626 Merge branch 'mbworkvar2' into ubitvar 2015-08-19 08:48:50 +01:00
UbitUmarov
48ef22f62e change pollService stop() to send 503 error and no keepalive. ( untested ) 2015-08-18 23:59:55 +01:00
UbitUmarov
05d72f77ff do keepalive on mesh and texture GET. Dont use reusecontext any where. 
setting of keepalive is wrong, it should follow the requested one ( or
always as http1.1) only deny if needed (errors). KeepAlive may increase
stress on number of avaiable file descritors.
 2015-08-18 21:32:03 +01:00
UbitUmarov
2cac56340a try to serialize http requests from same connection, so they are processed 
in order. ( next commits will be about necessary keepAlive changes needed)
 2015-08-18 21:03:34 +01:00
Melanie Thielker
1fb2f0296f Track selected objects per client 2015-08-15 02:46:41 +02:00
Oren Hurvitz
a3bed1fbcb Report "Script Execution Time" as the time spent executing the script in the last 30 seconds. Use a sliding window to calculate this. 
Notes:
- This metric provides a better indication of which scripts are taking up a lot of CPU (and therefore should be optimized).
- Previously the execution time was reset to 0 in every new measurement period, causing the reported time to fluctuate for no reason. This has been fixed by using a sliding window.
 2015-08-11 08:42:26 +01:00
Oren Hurvitz
c8135834db Prevent a crash if "debug jobengine log" is entered without a log level 2015-08-11 07:35:37 +01:00
Oren Hurvitz
4ad1468165 Better handling of invalid XML: a) prevent infinite loop on EOF; b) better logging 
If the XML was truncated for some reason then ExecuteReadProcessors() would get into an infinite loop, using high CPU. Now it detects EOF (and several other error cases) and aborts.

The rest of the changes just improve logging of XML in case of errors, so that we can see what the bad XML is.
 2015-08-11 07:35:37 +01:00
Diva Canto
2c9ffc2a87 Fixed failing test 2015-08-08 12:56:52 -07:00
Diva Canto
959872315f WARNING: massive refactor to follow libomv's latest changes regarding inventory folders. The newest version of libomv itself is committed here. Basically, everything that was using the AssetType enum has been combed through; many of those uses were changed to the new FolderType enum. 
This means that from now on, [new] root folders have code 8 (FolderType.Root), as the viewers expect, as opposed to 9, which was what we had been doing. Normal folders are as they were, -1. Also now sending folder code 100 for Suitcase folders to viewers, with no filter.
All tests pass, but fingers crossed!
 2015-08-08 12:12:50 -07:00
Oren Hurvitz
2153a01cc7 Have osAvatarName2Key check the cache first, even for foreign users 
Another change: removed the second call to userManager.AddUser(). UserManagementModule won't modify an existing record.
 2015-08-07 11:34:52 +03:00
Diva Canto
e5a1243abc Mantis #7657 and #7514. This should alleviate the problem of bad object assets being passed around via HG and archives. No guarantees that all the leaks have been found, but at least it detects and fixes these bad assets upon: 
(1) storing and getting assets over HG -- assuming the core HG asset service is being used (not the case with OSGrid!)
(2) importing assets via OAR and IAR

Instantiation of bad assets now should also work, instead of producing an exception, but the bad assets themselves aren't being fixed in the DB. That should be done with a cleaning tool -- see Perl script in Mantis #7657.

Virus!
 2015-08-01 18:58:05 -07:00
Oren Hurvitz
83da582261 Removed unused code related to DNS lookups 2015-07-23 14:50:50 +03:00
Cinder
0af17c9484 llListRandomize() wasn't very random 
Signed-off-by: Diva Canto <diva@metaverseink.com>
 2015-05-27 11:15:09 -07:00
Michael Heilmann
140ea04b9d Merging Opensim upstream before generating patch 2015-05-19 15:18:45 -04:00
Justin Clark-Casey (justincc)
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
Diva Canto
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
Diva Canto
1abbad71b4 Refactored some code that is used in two different dlls related to SOP rewriting. Also added some unit tests that relate to mantis #7514 2015-05-05 20:59:09 -07:00
Steven Zielinski
96a86e7d5a Fixed a bug that would cause the sim extra stats reporter to fail in 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
 2015-05-04 13:17:11 -04:00
Steven Zielinski
cb517839e9 Fixed vocabulary in a comment to match the code. 2015-05-04 10:05:36 -04:00
Diva Canto
09edc9619a It wasn't that. Revert "Mantis #7514" 
This reverts commit 365f46bfa9.
 2015-05-02 22:15:26 -07:00
Diva Canto
365f46bfa9 Mantis #7514 
Mono bug introduces double xmlns attribute names when rewriting the asset in HGAssetService, e.g.  <SceneObjectPart xmlns:xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xmlns:xsd="http://www.w3.org/2001/XMLSchema">.
Solution: remove all attributes before saving.
 2015-05-02 20:40:37 -07:00
Steven Zielinski
c4a3c93097 Fixed a bug that would cause the sim extra stats reporter to fail in 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
 2015-05-01 17:09:18 -04:00
Diva Canto
da32512ea4 Updated all occurrences of AssemblyVersion("0.8.1.*") to AssemblyVersion("0.8.2.*") 2015-04-29 18:47:17 -07:00
Robert Louden
c3138f9f38 Phase 2 additons with Frame Dilation metric. 2015-04-21 16:15:48 -04:00
Glenn Martin
1959eb8372 Moved over metrics from previous OpenSim 0.8.0.3 repository (this new repository is now the master branch from OpenSim). 2015-04-21 14:29:17 -04:00
AliciaRaven
1e444b1449 Change UserProfiles so that the parcel name is used for a ProfilePick and not the parcel owners name. This change also fixes a bug where if the avatar enters and does not move, creating or editing a ProfilePick would set the parcelId as an empty UUID. This is because ScenePresence.currentParcelUUID is not set until the avatar moves. 
Signed-off-by: Michael Cerquoni <nebadon2025@gmail.com>
 2015-04-12 15:36:22 -04:00
Robert Adams
c5a7bf6601 varregion: add varregion and TerrainData use in LLClientView. 
Add sending multiple parcel patches and sending patches by avatar
view distance.
 2015-03-28 08:30:52 -07:00