Commit Graph

4649 Commits (d701de402101f8ecc4a1892bb2d7cf296bd9b990)

Author SHA1 Message Date
Diva Canto 5e4b16658b Flipped version to 0.9.0.0 2015-11-23 18:15:09 -08:00
Jak Daniels b23e5fd8b6 Changes to LandObject/ILandObject to support importing OARs with different Region sizes to the destination region.
Signed-off-by: UbitUmarov <ajlduarte@sapo.pt>
2015-11-22 01:31:48 +00:00
UbitUmarov 95a7a03052 work around some 'tests' error: normalization of <0,0,0> no longer causes argument exception, missed a few more 2015-11-16 19:00:53 +00:00
UbitUmarov fd2784a037 work around some 'tests' error: normalization of <0,0,0> no longer causes argument exception 2015-11-16 18:50:15 +00:00
Melanie Thielker b2592ab132 Fix a merge conflict 2015-11-16 15:30:39 +01:00
Melanie Thielker f93ce485b1 Merge branch 'master' into avinationmerge
Conflicts:
	OpenSim/Framework/AvatarAppearance.cs
2015-11-16 15:28:51 +01:00
UbitUmarov 53e0cd5534 handle diferente number of wearables on getting assets form another appearance 2015-11-15 10:04:35 +00:00
UbitUmarov bcb27d4406 fix the protection for more Wearables than region suports 2015-11-15 08:16:52 +00:00
UbitUmarov b383cdae33 fix cut points of UTF-8 strings 2015-11-10 20:08:44 -08:00
UbitUmarov ae9d40c7d0 add a StringToBytes variant that takes Maximum lenght as argument. 2015-11-10 14:29:13 +00:00
UbitUmarov baf5649b70 fix avatarAppearance wearables copy 2015-11-02 02:08:13 +00:00
Melanie Thielker 51e5204a67 Add forgotten file 2015-11-02 01:21:28 +01:00
Melanie Thielker 5f18f2ce6a More EntityTransferContext plumbing 2015-11-01 19:37:14 +01:00
Melanie Thielker 69585a4824 More plumbing of the EntityTransferContext (not yet complete) 2015-11-01 19:11:14 +01:00
UbitUmarov 72684592ba Merge branch 'master' into avinationmerge
Conflicts:
	OpenSim/Framework/AvatarAppearance.cs
	OpenSim/Framework/Servers/ServerBase.cs
	OpenSim/Framework/VersionInfo.cs
	OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs
	OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
	OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
	OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs
	OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
	OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
	OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/Properties/AssemblyInfo.cs
	OpenSim/Region/PhysicsModules/Ode/ODEPrim.cs
	OpenSim/Region/PhysicsModules/Ode/OdeScene.cs
	OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
	OpenSim/Services/HypergridService/GatekeeperService.cs
	OpenSim/Services/Interfaces/IAvatarService.cs
	OpenSim/Services/LLLoginService/LLLoginService.cs
2015-11-01 03:01:59 +00:00
Melanie Thielker dc6d9eadf3 Testing stage of the new versioning system. Use at own risk. May not
work. Will eat your babies. Yada. Yada.
2015-10-31 00:01:35 +01:00
UbitUmarov 45ff7cec80 fix cut points of UTF-8 strings 2015-10-28 21:27:56 +00:00
UbitUmarov 6821ace3c6 add basic SendFindAgent() to lludp. Future use may require a list of pairs (X,Y). For now one pair is good enough. 2015-10-26 21:56:02 +00:00
Diva Canto 59b63b6406 On to 0.8.3!
Conflicts:
	OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/Properties/AssemblyInfo.cs
2015-10-18 21:51:49 -07:00
Diva Canto 06d2508b96 On to 0.8.3! 2015-10-18 21:47:10 -07:00
Diva Canto 7ab633461e Fixed merge conflicts
Clean up of simulation version, the number that rules the compatibility of teleports:
- It's not configurable anymore, it's fixed in code. Each number means an increase in features of the teleport procedure
- Its definition moved to the global VersionInfo class
As of now it's still 0.3.

Conflicts:
	OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
2015-10-18 16:24:33 -07:00
Diva Canto 70a46fe090 Clean up of simulation version, the number that rules the compatibility of teleports:
- It's not configurable anymore, it's fixed in code. Each number means an increase in features of the teleport procedure
- Its definition moved to the global VersionInfo class
As of now it's still 0.3.
2015-10-18 16:06:31 -07:00
UbitUmarov 4c0ef5a0ef change version string 2015-09-28 12:37:12 +01:00
UbitUmarov 18536b4be6 add missing SendAgentGroupDataUpdate to llClientView 2015-09-27 06:38:19 +01:00
UbitUmarov 759789bc45 change console main help to match master 2015-09-24 02:07:30 +01:00
UbitUmarov e441c9cac1 dont let http keepalive and context reuse be true 2015-09-23 23:59:50 +01:00
UbitUmarov c7b1d52e29 remove duplicated and breaking code 2015-09-21 17:59:44 +01:00
UbitUmarov 42954349e4 temporary reduce maxwearables, so teleport testing can be performed before other regions get updated 2015-09-15 16:48:04 +01:00
Melanie Thielker 783aff9723 Bump Interface Version to 8 2015-09-14 00:36:47 +02:00
Melanie Thielker 9d1515efdb Make regions tolerant to newer regions with more werables.
Also, bump the interface version to 8
2015-09-14 00:35:31 +02:00
Melanie Thielker f24414c063 Remove the last proprietary copyright headers, insert BSD ones. 2015-09-13 21:03:38 +02:00
UbitUmarov 82785f559e remove a avn thing before it gets into core 2015-09-10 13:00:30 +01:00
UbitUmarov b93412972e revert SynchronousRestObjectRequester timeout to miliseconds, and fix where it was wrong set in seconds 2015-09-09 23:17:18 +01:00
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
Robert Adams 08c72a8dc1 varregion: remove use of Constants.RegionSize is various places.
More use of the Util routines for conversion of region handles into addresses.
2015-03-28 07:50:04 -07:00
Robert Adams bedafb8fae varregion: refactor use of 'double heightmap[,]' into references to new class TerrainData
and push the implementation from Scene into the database readers and writers.
2015-03-27 19:32:50 -07:00
Robert Adams 9f18e3ba80 Varregion: first cut at removing Border class checks for region crossings.
Added Scene.PositionIsInCurrentRegion(pos) to sense when new position needs some crossing work.
Many changes made to EntityTransferModule to accomodate new crossing sense logic.
2015-03-22 21:53:02 -07:00
Justin Clark-Casey (justincc) 5b31bb9cb9 Don't log http auth details by default.
This is a security risk when people distribute logs for debug purposes.
If necessary the information can be retrieved via config console commands.
Relates to http://opensimulator.org/mantis/view.php?id=7501
2015-03-16 23:48:16 +00:00
Justin Clark-Casey (justincc) eda09d8763 Fix XBakes simulator-side authentication regression failure
Unlike the other connectors, XBakes uses a service auth retrieved from ServiceAuth.Create() and not code inherited from BaseServiceConnector.
Fixes regression from 7d3bafd5 (Wed 4 Mar 2015) where the new CompoundAuthenticator did not implement IServiceAuth.AddAuthorization()
2015-03-16 23:40:34 +00:00
Justin Clark-Casey (justincc) e6889a6023 Update version info to 0.8.2.0 2015-03-16 21:53:31 +00:00
dahlia 8b13e4e731 Revert "Allow a console command to give blank arguments ("") without the parser failing, e.g. login text """
This reverts commit 129cc49eb4.
It was causing the "alert" console command to fail.
2015-03-14 14:24:55 -07:00
Justin Clark-Casey (justincc) caa0e2a732 Don't try to write region size and MapfileStaticFile Nini settings that are not set up when invoking the RemoteAdmin create region facility.
Changes by MarcelEdward from http://opensimulator.org/mantis/view.php?id=7497.  Thanks.
2015-03-13 23:30:31 +00:00
Justin Clark-Casey (justincc) 129cc49eb4 Allow a console command to give blank arguments ("") without the parser failing, e.g. login text ""
Relates to http://opensimulator.org/mantis/view.php?id=7489
2015-03-11 22:42:14 +00:00
Melanie Thielker b5ac2eb1e1 Allow setting the size of the wearables array from config, for core compatibility 2015-03-10 01:04:04 +01:00
Freaky Tech 0ea6977013 solving HG IM, HGFriends issues based on falsified GridUser data
it does not consider GridUser as a viable source for residents' data.
it does not consider Friends, Inventory Creators to be trusted at all. There are lots of broken entries in existence.

There are lots of broken creator data fields in assets.

The following issues arise from the broken data in the old User Management Module:

failing HG IM
failing HGFriends Requests

Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
2015-03-05 16:17:12 -05:00
BlueWall 7adeb43a88 Merge branch 'master' of /team/src/opensim 2015-03-04 19:40:31 -05:00
BlueWall d7b45a3ed2 Alter the migrations so that it is a no-op as the columns are unused and the operation is very expensive 2015-03-04 19:27:34 -05:00
Justin Clark-Casey (justincc) 3255335c42 Make private services forbid llHTTPRequest() calls by rejecting those that have the X-SecondLife-Shard header.
If you need to enable this, set AllowHttpRequestIn = true in [Network] for all private services or individual [*Service] sections.
2015-03-04 18:27:51 +00:00
Justin Clark-Casey (justincc) 7d3bafd5ab Add outbound URL filter to llHttpRequest() and osSetDynamicTextureURL*() script functions.
This is to address an issue where HTTP script functions could make calls to localhost and other endpoints inside the simulator's LAN.
By default, calls to all private addresses are now blocked as per http://en.wikipedia.org/wiki/Reserved_IP_addresses
If you require exceptions to this, configure [Network] OutboundDisallowForUserScriptsExcept in OpenSim.ini
2015-03-04 18:27:50 +00:00
Cinder 7913417683 As per http://wiki.secondlife.com/wiki/Limits Prim description should be 128 bytes (127 + null terminator)
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
2015-03-03 22:42:31 -05:00
ft@noemail fb48ee1cb6 corrected script notecard parser. It now handles notecards with inventory as well.
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
2015-03-03 18:39:49 -05:00