27c34b69bf
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2014-12-25 08:01:50 -08:00
ec91a6b34d
Revert "Update libomv to grab latest bug fixes for Collada upload."
...
This reverts commit 4c0745b589
2014-12-25 07:59:47 -08:00
4c0745b589
Update libomv to grab latest bug fixes for Collada upload.
2014-12-25 07:53:09 -08:00
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
7100475b90
Make sure we always dispose of disposables inside RestClient.Request()
2014-12-20 01:56:33 +00:00
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
e3d07bd0cc
minor: Correct propery doc RestClient._resource spelling mistake
2014-12-20 01:39:31 +00:00
798074c66f
Use using() semantics in XBakesModule to ensure disposable objects are alway disposed no matter what
2014-12-20 01:38:48 +00:00
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
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
e50aac020f
Add command to reset region's user cache
2014-12-16 12:47:02 -05:00
b39d697555
Adding command to reset user's email address
2014-12-16 12:20:56 -05:00
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
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
289cf2e3e2
Remove reference to MSSQL in prebuild.xml since feature has been removed
2014-12-09 19:47:31 -08:00
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 d7b92604http://opensimulator.org/mantis/view.php?id=7278
2014-12-10 00:25:27 +00:00
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
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
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
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
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
bee3f203cd
Allow scripts in attachments on an owned NPC to call NPC functions on that NPC
2014-12-04 22:52:46 +00:00
d930ca7b1d
minor: Add doc about [InventoryService] AllowDelete setting to robust ini example files.
2014-12-04 19:37:25 +00:00
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
ad91143880
refactor: breakout flotasm cache last file access time to separate UpdateFileLastAccessTime() method for imminent reuse.
2014-12-04 01:51:01 +00:00
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
5861401faa
Remove long unused region parameters from SceneBase. Some of these weren't even being set. Region parameters come from Scene.RegionInfo instead.
2014-12-03 21:44:22 +00:00
2d2aa6e076
minor: Just have one message that displays successful registration of a region with its parameters rather than 2
2014-12-03 21:40:39 +00:00
d34ad345d5
minor: If we are recompiling scripts in response to a ScriptStopStrategy config change (a rare situation), then explicitly log this for debug purposes.
2014-12-03 21:08:43 +00:00
c3c05a8693
Reintroduce general xengine extra debugging log level. This can be controlled at runtime with the command "debug xengine log <level>", as with similar commands.
...
If log level is 1 then every script load is logged.
This means the <logger name="OpenSim.Region.ScriptEngine.XEngine"> section in OpenSim.exe.config is no longer needed to avoid log spam on regions with many scripts and can be removed.
2014-12-03 20:48:17 +00:00
805b7ccb3e
minor: improve logged error in XEngine.SetXmlState if there was a problem writing the linemap.
...
The previous error report of already exists is inaccurate since existing files do get overwritten.
2014-12-03 20:35:49 +00:00
72d1d96c5c
Always close script linemap file after reading and always dispose of other streams in the script engine even if exceptions are thrown.
2014-12-03 20:31:09 +00:00
caa7b1e6a1
Fix typo in ini
2014-12-01 10:15:56 -05:00
db2a22e622
BulletSim: update BulletSim DLLs and SOs.
...
Hopefully fix problem of multiple physical meshes crashing Windows simulators.
2014-11-30 19:53:01 -08:00
3642198838
BulletSim: move detail log of InternalScheduleRebuild to reduce log file spam
2014-11-30 19:53:00 -08:00
63d192f011
BulletSim: Remove linkset 'Incomplete' flag as its meaning couldn't be made clear. Add 'InternalScheduleRebuild() CHange rebuild code to call InternalScheduleRebuild() rather than ForceRebuild() to limit the scope of the changes made by the linkset.
2014-11-30 19:53:00 -08:00
41a943bfd0
BulletSim: add BSLinkset.AllPartsComplete that checks of all linkset members are not Incomplete and not waiting for assets. Change BSPrimLinkable to use AllPartsComplete.
2014-11-30 19:52:59 -08:00
eef954a214
BulletSim: Make BSPrimLinkable 'incomplete' if any of its children are waiting for assets to load.
2014-11-30 19:52:59 -08:00
cf85ade81e
BulletSim: add shape and linkset rebuild scheduled flags. Add BSPrim.Incomplete flag based on rebuild flags to say when an object is being rebuilt.
2014-11-30 19:52:58 -08:00
981fff95cd
A little more cleaning of config files.
2014-11-30 15:09:13 -05:00
d0f9644417
A little bit of cleanup behind commit r5f88ceab2269
2014-11-30 14:57:47 -05:00
5f88ceab22
Set configuration files to use key expansion for widely used common settings.
2014-11-30 13:59:23 -05:00
432f0e8783
Correct 690fe0c to actually log the exception reported in DoOnRezScriptQueue()(and now the scene name).
2014-11-29 15:04:16 +00:00
690fe0c5e5
If there are any exceptions in XEngine.DoOnRezScriptQueue() then log the error and always set m_CurrentCompile = null
...
Setting m_CurrentCompile = null in the finally block reduces the risk that an exception could permanently stop any future scripts compiling until the simulator is restarted.
If an exception is seen from this then please report and further changes to fix the bug or improve compiling reliability can be made.
2014-11-29 01:42:52 +00:00
55e064baf7
Remove minor race condition where two threads could race on fields such as m_ScriptFailCount as set in XEngine.DoOnRezScriptQueue()
2014-11-29 01:33:14 +00:00
79e37e5ecc
Restore zero'ing RawVelocity in BSCharacter.ZeroMotion() in favour of not calling ZeroMotion in SetPhysicalProperties() at all
...
SetPhysicalProperties is only called when adding a new character so it looks like there is no existing data to reset anyway.
2014-11-29 01:13:48 +00:00
dfab60a7fd
minor: Remove a few indenting problems introduced to recent 265fe349 and convert the m_log.DebugFormat() call back to the original DetailLog call
2014-11-29 00:53:13 +00:00
dcc36507f3
Halve the prediction lag for region crossing to improve most flying region crossings without degrading the walk cross experience (neither of which have been that great anyway).
2014-11-29 00:48:26 +00:00
39eab72d7c
When performing region cross, don't add the velocity to the new position in ETM.CrossAgentIntoNewRegionMain() since this has already been performed by SP.CheckForBorderCrossing()
2014-11-29 00:16:23 +00:00
265fe349e0
Somewhat improve avatar region crossings by properly preserving velocity when avatar enters the new region.
...
This commit addresses the following issues were causing velocity to be set to 0 on the new region, disrupting flight in particular
* Full avatar updates contained no velocity information, which does appear to have some effect in testing.
* BulletSim was always setting the velocity to 0 for the new BSCharacter. Now, physics engines take a velocity parameter when setting up characters so we can avoid this.
This patch applies to both Bullet and ODE.
2014-11-29 00:12:11 +00:00
Diva Canto