Commit Graph

21896 Commits (de7017b43d93cda7a627afa15f86854bd50ee040)

Author SHA1 Message Date
Diva Canto 462f521eba Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2014-12-30 23:47:29 -08:00
Diva Canto 3375841fee Capitalization fail. 2014-12-30 23:47:11 -08:00
dahlia 186d4a6d5b compile Prebuild.exe with mono 3.2.8 targeting .NET framework 3.5 2014-12-30 23:14:01 -08:00
Diva Canto 0af02efaed Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2014-12-30 20:05:33 -08:00
Diva Canto a88bc50a16 Add support for expansion of key values in nini config files.
Add loading of 3rd-party addin inis automatically.
2014-12-30 20:05:12 -08:00
Mic Bowman bc7570e59c Merge branch 'mb-throttle-test'
Merge in the new throttle code.
2014-12-30 16:26:57 -08:00
Diva Canto 2138d5c7f8 Renamed VERSION_NUMBER to VersionNumber 2014-12-30 15:27:28 -08:00
Mic Bowman 5bb73793c7 Comment out the debugging statements added in the last commit. Keeping
them in the code for later use rather than just reverting them.

Fixed the throttle tests for the new algorithm used when packets
are marked as expired.
2014-12-30 14:43:42 -08:00
Diva Canto 7466ef0525 This cleans up versioning. Specifically:
- It establishes 4 digits for opensim versions
- It uses the same number between opensim releases and mono addins versions

It also eliminates the last addin.xml files that were still there, for consistency.
2014-12-30 12:53:31 -08:00
Mic Bowman 58229a968b Turn on logging of old acks, this is for debugging only, stats version coming later 2014-12-30 10:50:34 -08:00
Mic Bowman c06100c31f Another technique inspired by some of the newer flow control algorithms... rather
than drop exponentially to 0 (and then adjust up for the minimum flow), drop on
the delta between current rate and the minimum rate. This should smooth the fallback
to minimum.
2014-12-30 10:39:14 -08:00
Mic Bowman 75df04f0b3 Fix the throttle tests. Remove the hardcoded constant multipliers and
compute the expected values without depending on the token bucket code.
2014-12-30 10:03:37 -08:00
Diva Canto 2506728e35 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2014-12-30 07:59:09 -08:00
Diva Canto 5cf6a6f830 WARNING: BREAKING CHANGES FOR REGION MODULE DEVELOPMENT.
This cleans up Opensim's use of mono addins. In particular, the extension points /OpenSim/RegionModules and /OpenSim/WindModule moved from OpenSim.exe to OpenSim.Region.Framework.dll. From here on, developers of region modules should declare their dlls to be dependent on OpenSim.Region.Framework, starting with version 0.8.1
Additional changes:
- Addins version uniformly updated to 0.8.1. These numbers should be compatible with the release numbers or else it becomes very confusing.
- Mono addins directives moved from files addins.xml to embedded directives in the class and assembly declarations, to make it all consistent
2014-12-30 07:58:42 -08:00
Mic Bowman bda8f2a2c1 Change the effect of successfully acknowledged packets to bump the
adaptive throttle by a full MTU. This is consistent with some implementations
of congestion control algorithms and certainly has the effect of opening
the throttle window more quickly after errors. This is especially important
after initial scene load when the number and size of packets is small.
2014-12-29 23:19:10 -08:00
Mic Bowman 041a09ecb9 Enable runtime configuration of the minimum rate for adaptive
throttles. Setting adaptive_throttle_min_bps will change the
minimum rate that the adapative throttles will drop to in case
of network packet loss. The current rate default rate is 256kbps.
The viewer can throttle rates under that amount, but the dynamic
adaptation will not.
2014-12-29 18:46:33 -08:00
Justin Clark-Casey (justincc) 5410e4f1f9 minor: correct sent -> set in TokenBucket.RequestedDripRate method doc 2014-12-30 00:53:17 +00:00
Diva Canto 89c1ac4cff Updated OpenSim-as-addin version from 0.5 to 0.8.1. The addin version number doesn't need to match the release version number, but I think it's a very good idea that they do. 2014-12-29 15:05:44 -08:00
Diva Canto f4f82825c0 Added SharpZipLib's license. 2014-12-29 14:39:50 -08:00
Diva Canto b5bc5665a6 Updated Mono.Addins to version 1.2 (https://github.com/mono/mono-addins/releases/tag/mono-addins-1.2). Also included mautil.exe, the command line application for managing mono addins. 2014-12-29 14:38:18 -08:00
Diva Canto 601849b4fa Added AssemblyInfo.cs to OpenSim.exe 2014-12-29 14:13:17 -08:00
Mic Bowman e71549a2cb Add debugging code for simulating packet loss in outgoing UDP packets. The
algorithm for dropping packets is a modified two state algorithm for creating
bursts of dropped packets. As configured there is about a 1.5% drop rate.

Invocation of the packet loss code is commented out by default.
2014-12-29 12:02:36 -08:00
Diva Canto bb82076a4d Allow for richer semantics of object derez. Specifically, allow the existence of region modules that do other kinds of garbage collection. Instead of placing deleted objects in the user's Trash folder, or deleting them immediately (UseTrashOnDelete = false), a module may decide to take garbage collection under its control. For example, it may place derezzed objects in a certain area inworld and delete them later. 2014-12-25 12:17:07 -08:00
Diva Canto 789cd4e928 Updated libomv to grab the latest bug fixes in Collada upload 2014-12-25 08:02:34 -08:00
Diva Canto 27c34b69bf Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2014-12-25 08:01:50 -08:00
Diva Canto ec91a6b34d Revert "Update libomv to grab latest bug fixes for Collada upload."
This reverts commit 4c0745b589.
2014-12-25 07:59:47 -08:00
Diva Canto 4c0745b589 Update libomv to grab latest bug fixes for Collada upload. 2014-12-25 07:53:09 -08:00
Justin Clark-Casey (justincc) fc940ab09a If a moap entry has EnableWhiteList but WhiteList == null, then properly block the request instead of throwing an exception.
Normally, WhiteList is an empty list but from Mantis 7389 it looks like it might sometimes be possible for it to be null (haven't seen this up till now)
It looks like failing with an exception instead of properly replying to the request (which comes in via a cap) might be enough, surprisingly, to freeze a viewer until timeout.
Part of http://opensimulator.org/mantis/view.php?id=7389 but probably unrelated to the actual issue of that mantis.
2014-12-23 20:38:20 +00:00
Justin Clark-Casey (justincc) 7100475b90 Make sure we always dispose of disposables inside RestClient.Request() 2014-12-20 01:56:33 +00:00
Justin Clark-Casey (justincc) 9cff0bbd7c In XBakesModule.Get() use using() to always dispose of RestClient which disposes the stream rather than disposing the stream directly 2014-12-20 01:46:32 +00:00
Justin Clark-Casey (justincc) e3d07bd0cc minor: Correct propery doc RestClient._resource spelling mistake 2014-12-20 01:39:31 +00:00
Justin Clark-Casey (justincc) 798074c66f Use using() semantics in XBakesModule to ensure disposable objects are alway disposed no matter what 2014-12-20 01:38:48 +00:00
Justin Clark-Casey (justincc) 9edc5cac96 In XBakes use proper disposal semantics to always close the stream on Store() no matter what 2014-12-20 01:32:49 +00:00
Justin Clark-Casey (justincc) e901253b49 Fix recent regression where a race condition meant SP.MakeRootAgent() would sometimes look to start attachment scripts before ETM.HandleIncomingSceneObject() had added them.
Probably a regression since ghosts branch merge on Nov 26 2014
2014-12-17 00:25:24 +00:00
BlueWall e50aac020f Add command to reset region's user cache 2014-12-16 12:47:02 -05:00
BlueWall b39d697555 Adding command to reset user's email address 2014-12-16 12:20:56 -05:00
Justin Clark-Casey (justincc) 147d401b28 Remove XEngine.m_uniqueScripts
This provides no obvious benefit as far as I can tell but has a definite cost in keep script strings in memory for the entire simulator session.
2014-12-15 20:38:26 +00:00
Justin Clark-Casey (justincc) 92c9dd42c4 Restore OpenMetaverse.dll to the one compiled under Windows again from commit 2660619. Somehow it got replaced again in the ghosts merge with the one built under Linux.
No other dlls are affected
2014-12-10 23:44:13 +00:00
Robert Adams 289cf2e3e2 Remove reference to MSSQL in prebuild.xml since feature has been removed 2014-12-09 19:47:31 -08:00
Justin Clark-Casey (justincc) 2b9f0647de Fix a regression where objects crossing regions in the same simulator (on their own or as attachments) with AppDomainLoading = false would create the new state in the source region area rather than the dest.
This was beause the code was finding the script DLL compiled for the source region as everything is in the same appdomain and using this as the location for the destination script state, etc.
This resolves the regression by passing the proper destination separately from the DLL retrieved.
Probably a regression since commit d7b92604 (11 July 2014).
Added regression test for this case.
At least partly addresses http://opensimulator.org/mantis/view.php?id=7278
2014-12-10 00:25:27 +00:00
Justin Clark-Casey (justincc) 227d2e2b61 Avoid a possible race condition where the XEngine script compile thread could complete but see OnRezScript() insert a new job and complete before it set m_CurrentCompile = null
If the above happened, it would mean the new script would not compile until some  script was added for compilation.
2014-12-10 00:04:10 +00:00
Justin Clark-Casey (justincc) 76722d8324 In XEngine, enqueue a script rez to the compile queue after setting m_CompileDict to avoid a rare but not impossible race condition. 2014-12-09 23:59:19 +00:00
Justin Clark-Casey (justincc) f3ab7c0f5c refactor: rename IteratingUuidGather.AddAssetUuidToInspect() and RecordAssetUuids() to AddForInspection() as this properly describes what both of these methods do. 2014-12-05 00:21:42 +00:00
Justin Clark-Casey (justincc) b0ff3236be Make "fache assets" console command more efficient by only updating access times on each cached asset once, not for every reference. 2014-12-05 00:09:01 +00:00
Justin Clark-Casey (justincc) 9208fb5d54 refactor: Make IteratingUUIDGatherer take a dictionary in its constructor like UUIDGatherer, so we can deal with future cases where the dictionary may already be pre-populated. 2014-12-04 23:55:59 +00:00
Justin Clark-Casey (justincc) bee3f203cd Allow scripts in attachments on an owned NPC to call NPC functions on that NPC 2014-12-04 22:52:46 +00:00
Justin Clark-Casey (justincc) d930ca7b1d minor: Add doc about [InventoryService] AllowDelete setting to robust ini example files. 2014-12-04 19:37:25 +00:00
Justin Clark-Casey (justincc) 9dbe99af0f If "fcache assets" is executed, don't stop with an exception if there's an access violation if another thread is operating on the file at the same time.
Resolves one issue from http://opensimulator.org/mantis/view.php?id=7271
2014-12-04 01:53:42 +00:00
Justin Clark-Casey (justincc) ad91143880 refactor: breakout flotasm cache last file access time to separate UpdateFileLastAccessTime() method for imminent reuse. 2014-12-04 01:51:01 +00:00
Justin Clark-Casey (justincc) c36bfdc60f Don't worry about checking FlotsamAssetCache.m_CurrentlyWriting when updating access time.
The majority of updates won't be for anything currently writing and any sharing exception from an actual clash can be caught and ignored anyway.
2014-12-04 01:46:00 +00:00