Justin Clark-Casey (justincc)
f6aa262585
Lock GDI+ portion og VectorRenderModule.GetDrawStringSize() to prevent concurrent thread use provoking mono crashes.
...
Same rationale as commit 13690582
2012-09-28 01:56:25 +01:00
Justin Clark-Casey (justincc)
2cc7a89012
Fix usage statement on "debug http" console command since max level is now 5 rather than 3
2012-09-13 00:20:38 +01:00
Justin Clark-Casey (justincc)
108e77fe1a
Fix bug in logging sample input at debug http level 4.
...
Also converts newlines to "\n" text.
2012-09-13 00:20:31 +01:00
Justin Clark-Casey (justincc)
97b1b309ce
minor: Comment out friends notification log spam for now.
2012-09-13 00:20:21 +01:00
Justin Clark-Casey (justincc)
53839ac779
Make "show http-handlers" command available for ROBUST instances as well as the simulator executable.
2012-09-13 00:20:09 +01:00
Justin Clark-Casey (justincc)
4efcf38e17
Add levels 4 and 5 to "debug http" console command that will log a sample of incoming request data and the entire incoming data respectively.
...
See "help debug http" for more details.
2012-09-13 00:20:01 +01:00
Justin Clark-Casey (justincc)
639d147231
Add missing DynamicTexture.cs file from last commit
2012-09-13 00:19:45 +01:00
Justin Clark-Casey (justincc)
a53f90cf7a
If reusing dynamic textures, do not reuse small data length textures that fall below current viewer discard level 2 thresholds.
...
Viewer LL 3.3.4 and before sometimes fail to properly redisplay dynamic textures that have a small data length compared to pixel size when pulled from cache.
This appears to happen when the data length is smaller than the estimate discard level 2 size the viewer uses when making this GetTexture request.
This commit works around this by always regenerating dynamic textures that fall below this threshold rather than reusing them if ReuseDynamicTextures = true
This can be controlled by the [Textures] ReuseDynamicLowDataTextures config setting which defaults to false.
2012-09-13 00:19:39 +01:00
Justin Clark-Casey (justincc)
e0a3a8d47b
If the GetTexture capability receives a request for a range of data beyond that of an otherwise valid asset, return HTTP PartialContent rather than RequestedRangeNotSatisfiable.
...
This is because recent viewers (3.2.1, 3.3.4) and probably earlier ones using the http GetTexture capability will sometimes make such invalid range requests.
This appears to happen if the viewer's estimate of texture sizes at discard levels > 0 (chiefly 2) exceeds the total texture size.
I believe this does not normally happen but can occur for dynamic textures with are large but mainly blank.
If this happens, returning a RequestedRangeNotSatisfiable will cause the viewer to not render the texture at the final resolution.
However, returning a PartialContent (or OK) even with 0 data will allow the viewer to render the final texture.
2012-09-13 00:19:26 +01:00
Justin Clark-Casey (justincc)
7ce30cc49e
Make ReuseDynamicTextures an experimental config setting in [Textures]. Default is false, as before.
...
If true, this setting reuses dynamically generated textures (i.e. created through osSetDynamicTextureData() and similar OSSL functions) where possible rather than always regenerating them.
This results in much quicker updates viewer-side but may bloat the asset cache (though this is fixable).
Also, sometimes issue have been seen where dynamic textures do not transfer to the viewer properly (permanently blurry).
If this happens and that flag is set then they are not regenerated, the viewer has to clear cache or wait for 24 hours before all cached uuids are invalidated.
CUrrently experimental. Default is false, as before.
2012-09-13 00:19:12 +01:00
Justin Clark-Casey (justincc)
6c36471f0c
If the compile-time DynamicTextureModule.ReuseTextures flag is set, check metadata still exists for any reused asset in case some other process has removed it from the cache.
2012-09-13 00:19:05 +01:00
Justin Clark-Casey (justincc)
a100723aaf
Renaming existing 'torture' tests to 'performance' tests instead, since this better matches what they really do.
...
nant target name changes to test-perf instead of torture, to match test-stress
still not run by default
2012-09-13 00:18:56 +01:00
Justin Clark-Casey (justincc)
69dc9b89a2
Add VectorRenderModuleStressTests that contains a long running test that generates thousands of vector textures concurrently.
...
Intended for use if there are future issues with mono crashes whilst generate dynamic textures.
This test is triggered via a new test-stress nant target.
Not run by default.
2012-09-13 00:18:48 +01:00
Justin Clark-Casey (justincc)
c0d68d0aa4
Add experimental DynamicTextureModule.ReuseTextures flag, currently only configurable on compile.
...
Disabled (status quo) by default.
This flag makes the dynamic texture module reuse cache previously dynamically generated textures given the same input commands and extra params for 24 hours.
This occurs as long as those commands would always generate the same texture (e.g. they do not contain commands to fetch data from the web).
This makes texture changing faster as a viewer-cached texture uuid is sent and may reduce simulator load in regions with generation of lots of dynamic textures.
A downside is that this stops expiry of old temporary dynamic textures from the cache,
Another downside is that a jpeg2000 generation that partially failed is currently not regenerated until restart or after 24 hours.
2012-09-13 00:18:29 +01:00
Justin Clark-Casey (justincc)
ce89bc38e1
Add VectorRenderModule.TestRepeatSameDrawDifferentExtraParams()
2012-09-13 00:18:07 +01:00
Justin Clark-Casey (justincc)
a21ee11fe8
Add VectorRenderModuleTests.TestRepeatDrawContainingImage()
2012-09-13 00:18:00 +01:00
Justin Clark-Casey (justincc)
06df03d98a
Add VectorRenderModuleTests.TestRepeatDraw()
2012-09-13 00:17:47 +01:00
Justin Clark-Casey (justincc)
2f4181623d
Add IDynamicTextureManager.ConvertData() to match AsyncConvertData(). Remove mismatching ConvertStream() where there is no AsyncConvertStream and neither IDynamicTextureManager implementer implements this method.
2012-09-13 00:13:22 +01:00
Justin Clark-Casey (justincc)
bbfb501b02
minor: Simplify return of vector render module name and some very minor removal of unncessary syntax clutter
2012-09-13 00:13:13 +01:00
Justin Clark-Casey (justincc)
a70baa95d1
Lock disposal of separate gdi+ objects under different threads since this prevents malloc heap corruption seen under Ubuntu 10.04.1 and 11.04 - probably a libcairo issue
...
In testing, it appears that if multiple threads dispose of separate GDI+ objects simultaneously,
the native malloc heap can become corrupted, possibly due to a double free(). This may be due to
bugs in the underlying libcairo used by mono's libgdiplus.dll on Linux/OSX. These problems were
seen with both libcario 1.10.2-6.1ubuntu3 and 1.8.10-2ubuntu1. They go away if disposal is perfomed
under lock.
2012-08-22 23:09:33 +01:00
Justin Clark-Casey (justincc)
ed99017271
Tighten up OpenSim.Framework.Cache locking to avoid race conditions.
...
This is to resolve a reported issue in http://opensimulator.org/mantis/view.php?id=6232
Here, the land management module is using OpenSim.Framework.Cache (the only code to currently do so apart from the non-default CoreAssetCache).
2012-08-21 22:23:34 +01:00
Justin Clark-Casey (justincc)
061c748b75
Add --force flag to "kick user" console command to allow bypassing of recent race condition checks.
...
This is to allow a second attempt to remove an avatar even if "show connections" shows them as already inactive (i.e. close has already been attempted once).
You should only attempt --force if a normal kick fails.
This is partly for diagnostics as we have seen some connections occasionally remain on lbsa plaza even if they are registered as inactive.
This is not a permanent solution and may not work anyway - the ultimate solution is to stop this problem from happening in the first place.
2012-08-21 22:23:04 +01:00
Justin Clark-Casey (justincc)
c4645a899f
Add information to ThreadStackSize about possibly increasing if suffering StackOverflowExceptions during script conversion/compilation (e.g. on Windows 64-bit)
2012-08-21 22:15:17 +01:00
Justin Clark-Casey (justincc)
c223ac6929
minor: Make xengine debug message on script load a scripting loading message instead.
...
This is more useful if compilation fails due to an uncatchable exception since we know what was being compiled.
2012-08-21 22:14:56 +01:00
Melanie
7e287227a4
Release http-in URLs when llResetScript is called
2012-08-21 22:12:48 +01:00
Justin Clark-Casey (justincc)
d4470c6147
Fix the recent windows compile error by putting newFont for case "R" in VectorRenderModule inside its own context, rather than disposing of the old font before using it as a prototype for the new.
2012-08-21 22:11:53 +01:00
SignpostMarv
c14f983cca
attempting to fix a build issue
...
Signed-off-by: BlueWall <jamesh@bluewallgroup.com >
2012-08-21 22:11:39 +01:00
Justin Clark-Casey (justincc)
8a78d0f974
Delete old blank SOGSpamTest
2012-08-21 22:09:00 +01:00
Justin Clark-Casey (justincc)
f35e94f168
Properly dispose of all GDI+ entities used in VectorRenderModule for dynamic textures.
...
The convention is that if an object implements IDiposable() the code must explicitly call Dispose() or call it via the using statement.
This may be particularly important for GDI+ objects since they encapsulate native code entities.
2012-08-21 22:08:49 +01:00
Justin Clark-Casey (justincc)
0e9e60d55a
Remove duplicated IScenePresence.PresenceType. This is already in ISceneAgent.PresenceType from which IScenePresence inherits.
...
No other code changes required.
2012-08-21 22:06:31 +01:00
Justin Clark-Casey (justincc)
f6a7325961
Add information about each column to "show queues" region console command help.
2012-08-21 22:00:38 +01:00
Justin Clark-Casey (justincc)
ed63cafa65
Extend region console "show queues" command to show already collected time since last packeted received by the simulator from a viewer.
2012-08-21 22:00:31 +01:00
Justin Clark-Casey (justincc)
092e94035b
Backport fix of inventory skeleton fetch from XInventoryServicesConnector.
...
This is not used by login if the inventory service and login service are housed in the same ROBUST instance (which is the default config)
2012-08-02 01:55:44 +01:00
Justin Clark-Casey (justincc)
fa3ebd85c9
minor: Comment out noisy ScriptTaskInventory Request log message
2012-08-02 01:36:37 +01:00
Justin Clark-Casey (justincc)
08a9b01123
Fix a bug in pCampbot grabbing behaviour where an exception would be thrown if the bot was not yet aware of any objects.
2012-08-02 01:35:31 +01:00
Justin Clark-Casey (justincc)
5772d23ff6
Look up the NPC module when the SensorRepeat class is created, rather than on every single sensor sweep.
2012-08-02 01:34:53 +01:00
Justin Clark-Casey (justincc)
1d0ff7da2a
Resolve a deadlock between INPCModule and SensorRepeat by replacing the SensorRepeat list with a new list on add/removes rather than locking it for the duration of the sensor sweep.
...
A deadlock was observed today where NPC removal on a script thread would lock the NPC list and then try to lock the sensor list via scripted attachment removal.
Concurrently, the sensor sweep thread would lock the sensor list and then try to lock the NPC list to check NPC status.
This commit resolves the deadlock by replacing the sensor list on update rather than locking it for the duration of the sweep.
2012-08-02 01:30:35 +01:00
Justin Clark-Casey (justincc)
ec063b9088
Fix bug in SoundModule.TriggerSound() where every sound update to an avatar would base its gain calculation on the previous avatar's gain, instead of the original input gain.
...
This was making sound attenuate oddly when there were NPCs in the region, though it could also happen with ordinary avatars.
2012-08-02 01:30:27 +01:00
Justin Clark-Casey (justincc)
12fbfb6125
If we're fetching active gestures via the XInventoryServiceConnector, then properly look at the ITEMS dictionary already returned rather than the level above this.
2012-08-02 01:30:17 +01:00
SignpostMarv
272cd9886d
adding asset cache and map tile directories to .gitignore
2012-08-02 01:29:22 +01:00
Justin Clark-Casey (justincc)
627cfe6678
Remove the LandGeom checks in OdeScene - these are pointless since LandGeom is always IntPtr.Zero and contacts returned always have a valid geometry.
...
Possibly this was for a feature that was never implemented or was otherwise removed.
Thanks to SignpostMarv for the spot of the warning that shows this parameter was never changed.
2012-08-02 01:28:21 +01:00
Justin Clark-Casey (justincc)
aac4d9d682
Fix issue where RegionCombinerModule was not removing regions from its dictionary on RemoveRegion(), causing a later issue if regions were restarted (removed then readded).
2012-08-02 01:27:17 +01:00
Justin Clark-Casey (justincc)
25d39a19e1
When copying items, copy the item description field instead of the asset description field.
...
If we copy the asset description then we will only ever replicate the very first description, if there was one, not any subsequent changes.
Thanks to Oren Hurvitz of Kitely for this patch from http://opensimulator.org/mantis/view.php?id=6107
I have adapted it slightly to change the order of arguments (name before description rather than vice-versa) and slightly improve some method doc.
2012-08-02 01:27:03 +01:00
Justin Clark-Casey (justincc)
55d383e4be
Add MemoryWatchdog class missing from git master a1e9964
2012-08-02 01:19:01 +01:00
Justin Clark-Casey (justincc)
b180fdd0fd
Correct churn stat from MB/s from KB/s
2012-08-02 01:18:48 +01:00
Justin Clark-Casey (justincc)
cc6b2fdb9f
Add experimental "OpenSim object memory churn" statistics to output of region console "show stats" command
...
This aims to capture the amount of memory that OpenSim turns over whilst operating a region.
This memory is not lost - apart from leaks it is reclaimed by the garbage collector.
However, the more memory that gets turned over the more work the GC has to do to reclaim it.
2012-08-02 01:13:58 +01:00
Justin Clark-Casey (justincc)
9d6ea27df0
Make SceneManager.OnRegionsReadyStatusChange event available.
...
This is fired when all regions are ready or when at least one region becomes not ready.
Recently added EventManager.OnRegionReady becomes OnRegionReadyStatusChange to match OnLoginsEnabledStatusChange
2012-08-02 00:50:02 +01:00
Melanie
2d66fcd4cd
Committing Avination's memleak fix-a-thon, installment #2
...
Ensure items coming off the lockless queue are released. Also ensure this
is done when the queue is cleared.
2012-08-02 00:24:23 +01:00
Melanie
91ae1908fe
Committing Avination's memleak fix-a-thon, installment #3
...
When linking, detach the no longer used SOG's from backup so they can be
collected. Since their Children collection is never emptied, they prevent
their former SOPs from being collected as well.
2012-08-02 00:23:47 +01:00
Melanie
ed962bb3d3
Commiting Avination's memleak fix-a-thon, installment #1
...
As the MinHeap shrinks, free object references that have been sent. Also,
free the last item when it empties.
2012-08-02 00:23:38 +01:00
Justin Clark-Casey (justincc)
9ea09d785c
Add basic TestCreateRootScenePresence() regression test
2012-08-02 00:18:45 +01:00
Justin Clark-Casey (justincc)
e3db5fb603
Add EventManager.OnRegionLoginsStatusChange fired whenever logins are enabled or disabled at any point, not just during initial startup.
...
This replaces EventManager.OnLoginsEnabled which only fired when logins were first enabled
and was affected by a bug where it would never fire if the region started with logins disabled.
2012-08-02 00:11:11 +01:00
Justin Clark-Casey (justincc)
58aa51218e
Add back notification to neighbouring regions when RegionReadyModule is not active accidentally just removed in 528004d
2012-08-02 00:11:00 +01:00
Justin Clark-Casey (justincc)
0fff0e1fad
Perform other region ready actions even if simulator is configured to leave logins disabled on startup.
2012-08-02 00:10:46 +01:00
Justin Clark-Casey (justincc)
4457ec667a
Stop the 15 second initial script compile wait if a script is being rezzed on a previously empty region.
2012-08-02 00:07:41 +01:00
Justin Clark-Casey (justincc)
7f2e6a55c4
Fix bug where region ready would be triggered a second time if a script was rezzed on a previously script-free region.
...
There is no need to listen for OnRezScript in RegionReadyModule since OnEmptyScriptCompileQueue will only fire if scripts were compiled.
2012-08-02 00:07:27 +01:00
Justin Clark-Casey (justincc)
92a01a7e70
Fix bug where region ready was being triggered twice in quick succession if a region contained no scripts.
2012-08-02 00:04:37 +01:00
Justin Clark-Casey (justincc)
4debc67b48
Establish EventManager.OnRegionReady event. This will only be triggerred once when the region is ready.
...
Switch MapImageServiceModule to use this.
2012-08-02 00:04:17 +01:00
Justin Clark-Casey (justincc)
c8f60acc30
Pass entire scene object in OnLoginsEnabled event rather than just the region name.
...
This saves listeners from having to re-retrieve the scene from their own lists, which won't work anyway if multiple regions with the same name have been allowed
2012-08-01 23:59:47 +01:00
Justin Clark-Casey (justincc)
272c3c1069
Only listen to LoginsEnabled event in RegionReadyModule if it has been asked to disable logins until all scripts have been compiled
2012-08-01 23:50:59 +01:00
Justin Clark-Casey (justincc)
5aa9c21e7d
minor: switch around mixed up circuit code and endpoint data in "show connections" region console command
2012-07-25 23:37:21 +01:00
Justin Clark-Casey (justincc)
454c3fc913
Make LLClientView instant message handling asynchronous rather than synchronous to prevent long operations from holding up all inbound packet processing.
...
Giving a large folder from one avatar to another was causing a long delay when handled synchronously, since it took some time to retrieve the necessary data from the inventory service.
Handling this asynchronously instead stops this delay from disrupting all avatars in the scene. This has been shown in OSGrid.
I see no reason for not handling all IM messages asynchronously, just as incoming chat is handled asynchronously, so this has been switched for all instant messages.
Thanks to Nebadon for testing this change out.
2012-07-25 23:37:20 +01:00
Justin Clark-Casey (justincc)
3cd7c59696
Comment out OnIncomingInstantMessage and OnInstantMessage handlers in GroupsModule, since these led to a private blank method
2012-07-25 23:37:18 +01:00
Justin Clark-Casey (justincc)
1f8ac33ecb
Stop explicitly closing and nulling out Animator in order to prevent NREs in various places due to race conditions.
...
Even where checks are being made they aren't enough since they all assume that the Animator they just checked is still there in the next line, which is not necessarily the case without locking.
The memory used is small and these should be GC'd anyway when the SP is released. If this is not happening then the wider problem of old SPs being retained needs to be resolved.
2012-07-25 23:37:15 +01:00
Justin Clark-Casey (justincc)
47e2922a40
Prevent race conditions between two threads that call LLClientView.Close() simultaneously (e.g. ack timeout and an attempt to reconnect)
2012-07-25 23:32:27 +01:00
Justin Clark-Casey (justincc)
4deb25da87
Add TestCreateDuplicateRootScenePresence() regression test.
2012-07-25 23:32:21 +01:00
Justin Clark-Casey (justincc)
587c8017ab
Add basic TestCreateRootScenePresence() regression test
2012-07-25 23:32:06 +01:00
Justin Clark-Casey (justincc)
d5d801f218
Close() the ScenePresence after we've removed it from the scene graph, to cut down race conditions when another thread manages the grab the presence after some SP structures have been reset.
2012-07-25 23:30:59 +01:00
Justin Clark-Casey (justincc)
2f865da5c7
refactor: factor out common code in WebStatsModule.OnMakeRootAgent()
2012-07-19 01:00:50 +01:00
Justin Clark-Casey (justincc)
cf2f6843c6
In WebStatsModule.OnMakeRootAgent(), get region ID directly from SP.Scene.RegionInfo.RegionID instead of manually looking it up from the stored scene list.
2012-07-19 01:00:40 +01:00
Justin Clark-Casey (justincc)
97d084c9f5
Stop warning about no session from ViewerStats if user teleports to another region in the same simulator that was not next to the source region.
...
This was because teleporting to the new region invoked the new session setup code before the agent was removed from the old region, which then invoked the session teardown code.
Now, we only invoke the teardown code if the region ID occupied by the agent being removed is the same as the one registered for the current session.
2012-07-19 01:00:33 +01:00
Justin Clark-Casey (justincc)
14f72a9a43
Remove a callstack print out I accidentally left in 2 commits ago in 9ccb578
2012-07-19 00:57:50 +01:00
Justin Clark-Casey (justincc)
89efccaa71
Rather than instantiating a UTF8 encoding everywhere when we want to supress the BOM, use a single Util.UTF8NoBomEncoding.
...
This class is thread-safe (as evidenced by the provision of the system-wide Encoding.UTF8 which does not suppress BOM on output).
2012-07-19 00:57:36 +01:00
Justin Clark-Casey (justincc)
8f61da0759
Don't cache regions data on the other unused LocalGridServiceConnector that the module code still sets up even if we're using one directly instantiated from the RemoteGridServiceConnector.
...
Also improves log messages to indicate which regions are sending/receiving various neighbour protocol messages.
2012-07-19 00:50:17 +01:00
Justin Clark-Casey (justincc)
e88e87ff63
Stop redundantly passing in the endpoint to the LLClientView constructor.
...
This can always be retrieved via the LLUDPClient and is so done in various places already.
2012-07-19 00:45:19 +01:00
Justin Clark-Casey (justincc)
4f10d1aa0c
Remove IClientIPEndpoint client interface for now.
...
This may well come back in the future when this subinterface is actually used but it currently isn't and I feel the name was poor.
Everything uses IClientAPI.RemoveEndPoint which also returned the full endpoint rather than just the ip address.
2012-07-19 00:45:08 +01:00
Justin Clark-Casey (justincc)
1912215c40
Remove IClientAPI.GetClientEP() in favour of existing identical IClientAPI.RemoteEndpoint.
2012-07-19 00:45:02 +01:00
Justin Clark-Casey (justincc)
ffbca99b57
Extend "show circuits" to show circuit code, ip and viewer name.
...
Also change to use standard table formatting
"show circuits" and "show connections" console commands are very similar but access different data structures.
2012-07-19 00:44:48 +01:00
Justin Clark-Casey (justincc)
f660a25fa7
Add active status to "show connections"
2012-07-19 00:40:35 +01:00
Justin Clark-Casey (justincc)
523d03fb76
Put output for "show connections" command into standard table format.
...
Also moves into own method.
2012-07-19 00:40:18 +01:00
Justin Clark-Casey (justincc)
85985a8c3e
Where possible, use the system Encoding.ASCII and Encoding.UTF8 rather than constructing fresh copies.
...
The encodings are thread-safe and already used in such a manner in other places.
This isn't done where Byte Order Mark output is suppressed, since Encoding.UTF8 is constructed to output the BOM.
2012-07-19 00:25:40 +01:00
Justin Clark-Casey (justincc)
013e002b00
Fix build break for windows with missing package for IScriptEngine in prebuild.xml for OpenSim.Region.CoreModules.Tests.dll
2012-07-11 23:29:45 +01:00
Justin Clark-Casey (justincc)
5269d77cf9
Allow XEngine StartDelay to be configured in the [XEngine] config section.
...
This is only currently meant for use by regression tests that don't have any issues if XEngine is started up quickly, since no other operations will be occuring simultaneously.
Therefore, this is not yet documented externally.
2012-07-11 23:29:39 +01:00
Justin Clark-Casey (justincc)
8c8e6220fb
Remove WorldComm module from the regression TestCompileAndStartScript() since the infrastructure no longer fails if this module isn't present, at least on the tested codepaths
2012-07-11 23:29:31 +01:00
Justin Clark-Casey (justincc)
150860c964
Add regression TestDetachScriptedAttachmentToInventory()
...
This currently only does a relatively crude check for a ScriptState node in the serialized xml
2012-07-11 23:29:24 +01:00
Justin Clark-Casey (justincc)
0cb1b0bb4a
Add regression TestRezScriptedAttachmentsFromInventory() though this currently only checks for the presence of script items, not for started scripts
2012-07-11 23:29:16 +01:00
Justin Clark-Casey (justincc)
56d894ae24
refactor: move management of SOP.SitTargetAvatar into SOP.AddSittingAvatar() and SOP.RemoveSittingAvatar()
2012-07-11 23:29:07 +01:00
Justin Clark-Casey (justincc)
b34fd50155
Revert "refactor: Add SOP.IsSitTargetOccupied to improve readability"
...
This reverts commit c8f0d476d2
2012-07-11 23:15:35 +01:00
Justin Clark-Casey (justincc)
74486e767d
refactor: Add SOP.IsSitTargetOccupied to improve readability
2012-07-11 23:15:23 +01:00
Justin Clark-Casey (justincc)
1b8814878d
refactor: use sit orientation argument passed in to SP.SendSitResponse() rather than creating a new copy
...
There are no issues with side-effects since this is a struct.
2012-07-11 23:15:14 +01:00
Justin Clark-Casey (justincc)
095375d63d
Move common code to detect whether a part has a valid sit target into a SOP property rather than being repeated in SP.
...
This also makes the detection in SP.FindNextAvailableSitTarget() and SendSitResponse() identical.
Previously they varied slightly (SendSitResponse didn't check for an older type of invalid quaternion) but the practical effect is most probably zero.
2012-07-11 23:15:06 +01:00
Justin Clark-Casey (justincc)
cb4e074a8c
Remove log line accidentally left in SP.SendSitResponse()
2012-07-11 23:14:59 +01:00
Justin Clark-Casey (justincc)
222f844d65
Disable logging in regression test in OSSL_ApiAttachmentTests
2012-07-11 23:14:52 +01:00
Justin Clark-Casey (justincc)
bb2a9060f1
Fix recent SOP.GetSittingAvatars() to return null if there are no sitting avatars rather than throwing an exception.
...
Extends sitting avatar regression tests to test new sitters information
2012-07-11 23:14:45 +01:00
Justin Clark-Casey (justincc)
e21dd88ed5
When an attachment is detached to inv or derezzed, stop the scripts, update the known item with script state still in the script engine and then remove the scripts.
...
This is to fix a regression starting from 5301648
2012-07-11 23:14:36 +01:00
Justin Clark-Casey (justincc)
35457448ca
If a script is being stopped manually, then give the scriptpool thread 1 second to finish normally before forcibly aborting.
...
This is to avoid the worst of the problems in mono 2.6, 2.10 where an aborted thread does not always release all its locks.
This very short grace period is identical to the existing behaviour when a script is removed from the scene.
2012-07-11 23:14:30 +01:00
Justin Clark-Casey (justincc)
596caf41db
This script allows an object to be attached directly from prim inventory to another avatar in the scene.
...
Very useful in serious game/environment scenarios where its only allowed for trusted creators.
Threat level Severe
2012-07-11 23:14:14 +01:00
Justin Clark-Casey (justincc)
c62b46a167
Don't allow a prim to be sat upon if its part of an attachment
2012-07-11 23:14:04 +01:00
Justin Clark-Casey (justincc)
2b3098f011
Do not allow a script to attach a prim if its being sat upon.
...
This prevents a stack overflow where a get position on the avatar will refer to the attachment which will in turn refer back to the avatar.
This required recording of all sitting avatars on a prim which is done separately from recording the sit target avatar.
Recording HashSet is null if there are no sitting avatars in order to save memory.
2012-07-11 23:13:48 +01:00
Justin Clark-Casey (justincc)
74b4efd7f9
minor: remove some recent mono compiler warnings
2012-07-11 23:07:17 +01:00
Justin Clark-Casey (justincc)
298c4c0eb5
Remove duplicate Warp3DImageModule entry in CoreModulePlugin.addin.xml
...
This was causing 2 copies of the module to be created for each scene.
Probably no bad consequences other than a small waste of memory (both for the module and for the warp3D renderer it loaded)
2012-07-11 23:07:09 +01:00
Justin Clark-Casey (justincc)
068917bc29
Remove redundant SetScene() function in Scene.AddSceneObject()
...
This is always done later on in SceneGraph.AddSceneObject() if the call hasn't failed due to sanity checks.
There's no other purpose for this method to exist and it's dangerous/pointless to call in other conditions.
2012-07-11 23:06:41 +01:00
Justin Clark-Casey (justincc)
d8f1d2892c
Remove now duplicate interregion object check that should have been removed a few commits ago in 43a2da9
2012-07-11 23:06:30 +01:00
Justin Clark-Casey (justincc)
ccf8e89193
minor: Remove some wrong comments in attachments regression tests
2012-07-11 23:06:23 +01:00
Justin Clark-Casey (justincc)
f17f58ac2a
Add assert to attachment regression tests to check that number of objects in the scene graph
2012-07-11 23:06:14 +01:00
Justin Clark-Casey (justincc)
6bcb5baab6
Pull prim crossing/teleport checks up into Scene.IncomingCreateObject() from Scene.AddObject()
...
Only IncomingCreateObject() needs these checks. General object adding does not need to perform crossing perm checks
2012-07-11 23:05:59 +01:00
Justin Clark-Casey (justincc)
0aaf935333
refactor: extract method UpdateUserInventoryWithAttachment() from AttachObject() for better code comprehension
2012-07-11 23:05:53 +01:00
Justin Clark-Casey (justincc)
b30806822e
Log MONO_THREADS_PER_CPU value on simulator startup, or "unset" if it is not set
2012-07-11 23:05:43 +01:00
Justin Clark-Casey (justincc)
a2c3dfc422
Log warning if time between invocations of the watchdog thread is twice the timer setting.
...
This is to help detect situations where thread timeout warnings are being generated because of general machine issues rather than deadlock, network or other problems.
2012-07-11 23:05:34 +01:00
Justin Clark-Casey (justincc)
4050a6f8bb
minor: add client name to various login service log messages to disambiguate messages from concurrent logins. Also adds destination resolution debug log message showing region endpoint.
...
Adding endpoint to the log helps to find issues where the region external host information has been wrongly configured
2012-07-11 23:05:26 +01:00
Justin Clark-Casey (justincc)
0d0d04c484
minor: Add more information to OSFunctionThreatLevel and clarify some text in using PARCEL_OWNER, PARCEL_GROUP_MEMBER, ESTATE_MANAGER, ESTATE_OWNER permission categories
2012-07-11 23:05:09 +01:00
SignpostMarv
952b3448a6
porting console commands from raw2sculpt 3.2
2012-07-11 23:05:01 +01:00
Justin Clark-Casey (justincc)
d53ef3b302
Add OSSL function osForceAttachToAvatarFromInventory()
...
This works like osForceAttachToAvatar() but allows an object to be directly specified from the script object's inventory rather than forcing it to be rezzed in the scene first.
Still only attaches objects to the owner of the script.
This allows one to bypass the complicated co-ordination of first rezzing objects in the scene before attaching them.
Threat level high.
2012-07-11 23:04:49 +01:00
Justin Clark-Casey (justincc)
48e88397a0
Use GetInventoryItem() in llRezAtRoot rather than iterating through a cloned dictionary
2012-07-11 23:04:42 +01:00
Justin Clark-Casey (justincc)
976190fe96
refactor: In llGetNotecardLine() use existing GetInventoryItem() rather than inspecting a clone of the TaskInventory dictionary that was not cloned thread-safe
2012-07-11 23:04:34 +01:00
Justin Clark-Casey (justincc)
1e025d6074
refactor: In llGetNumberOfNotecardLines() use existing GetInventoryItem() rather than inspecting a clone of the TaskInventory dictionary that was not cloned thread-safe
2012-07-11 23:04:27 +01:00
Justin Clark-Casey (justincc)
fffd2fe10d
refactor: use existing GetInventoryItem() in GetScriptByName(), itself renamed from ScriptByName()
2012-07-11 23:01:41 +01:00
Justin Clark-Casey (justincc)
cf8adbe007
refactor: In llGetInventoryType() use existing GetInventoryItem()
2012-07-11 23:01:33 +01:00
Justin Clark-Casey (justincc)
890f617e58
refactor: In llGetInventoryCreator() use existing GetInventoryItem()
2012-07-11 23:01:27 +01:00
Justin Clark-Casey (justincc)
6ff0e58db7
refactor: In llGetInventoryPermMask() use existing GetInventoryItem()
2012-07-11 23:00:57 +01:00
Justin Clark-Casey (justincc)
795443cff1
refactor: in llGetInventoryPermMask use existing GetInventoryItem()
2012-07-11 23:00:50 +01:00
Justin Clark-Casey (justincc)
8c7f511e55
refactor: In llRemoteLoadScriptPin() use existing GetInventoryItem()
2012-07-11 23:00:43 +01:00
Justin Clark-Casey (justincc)
0acac2f890
refactor: replace use of LSL_Api.GetTaskInventoryItem() with existing GetInventoryItem()
2012-07-11 23:00:36 +01:00
Justin Clark-Casey (justincc)
72554fc5b8
refactor: In llGetInventoryKey() use existing GetInventoryItem()
2012-07-11 23:00:28 +01:00
Justin Clark-Casey (justincc)
aa1442b07e
In llMessageLinked() use GetInventoryItems() rather than cloning TaskInventory directory
...
GetInventoryItems() returns a new list and so is equivalent, and creates this list under lock whereas Clone() is not thread-safe
2012-07-11 23:00:21 +01:00
Justin Clark-Casey (justincc)
e8a0ec1287
In llRequestInventoryData() use GetInventoryItems() rather than cloning TaskInventory directory
...
GetInventoryItems() returns a new list and so is equivalent, and creates this list under lock whereas Clone() is not thread-safe
2012-07-11 23:00:13 +01:00
Justin Clark-Casey (justincc)
3436be2046
refactor: In llCollisionSound() use existing GetInventoryItem() method rather than have it iterate through TaskInventory itself.
2012-07-11 23:00:07 +01:00
Justin Clark-Casey (justincc)
9a0bcb7750
refactor: In llRemoveInventory() use existing GetInventoryItem() method rather than have it iterate through TaskInventory itself.
2012-07-11 22:59:59 +01:00
Justin Clark-Casey (justincc)
218fe36f84
refactor: make llGiveInventory() use existing GetInventoryItem() method rather than iterate through TaskInventory itself.
2012-07-11 22:59:53 +01:00
Justin Clark-Casey (justincc)
07298c8b4f
refactor: rename Watchdog.WATCHDOG_TIMEOUT_MS to DEFAULT_WATCHDOG_TIMEOUT_MS to reflect what it actually is
2012-07-11 22:59:46 +01:00
Justin Clark-Casey (justincc)
d9f40d1ebc
minor: Add some method doc to HasGroupChanged and Schedule GroupForFull/PartUpdate() to indicate when region modules need to invoke them
2012-07-11 22:59:39 +01:00
Justin Clark-Casey (justincc)
eddff428ed
Removing unused handling of incoming create object by userID and itemID only.
...
It appears this was never actually used since attachments were rezzed in other code.
This was never available on remote simulator comms, only local.
2012-07-11 22:58:57 +01:00
Justin Clark-Casey (justincc)
61aaa10460
Remove code listed for removal in 0.7.3 that handled script restart for incoming attachments from pre-fatpack regions (versions of OpenSimulator more than a year old)
2012-07-11 22:58:50 +01:00
Justin Clark-Casey (justincc)
e1d6929e61
Move update of the final optional ODE total frame stat inside the OdeLock rather than outside to avoid a very occasional race condition with the stat collection thread
2012-07-11 22:58:37 +01:00
Justin Clark-Casey (justincc)
6b87873aa7
refactor: rename _collisionEventPrim to m_collisionEventActors and _collisionEventPrimChanges to m_collisionEventActorsChanges to reflect their actual contents.
...
These dictionaries handle all actor types, not just physical prims.
2012-07-11 22:58:29 +01:00
Justin Clark-Casey (justincc)
f690acbfb6
Fix a regression where we stopped removing avatars from collision event reporting on logout, rather than stopping clearing their collision events.
...
This occurred in b18c8c8
2012-07-11 22:58:09 +01:00
Justin Clark-Casey (justincc)
f49c850269
If a link points to a non-existing item in FetchInventory caps, then don't try to add it to the return data rather than suffering an exception later on
2012-07-11 22:58:01 +01:00
Justin Clark-Casey (justincc)
70f85af75b
Add IScene.Name for code clarity to replace the RegionInfo.RegionName used in many, many log messages.
2012-07-11 22:57:53 +01:00
Justin Clark-Casey (justincc)
663b0cc681
Change AttachmentsModule.DetachSingleAttachmentToInv() to accept a SOG directly instead of an item ID to then shuffle through attachments, saving CPU busywork.
...
Almost all callers already had the sog to hand.
Still checking that it's really an attachment, but now by inspecting SOG.AttachedAvatar
2012-07-11 22:57:39 +01:00
Justin Clark-Casey (justincc)
733a8c9f89
Rather than iterating through all SOGs in the scene looking for the one that matches out fromItemID on detach, go through the agent's attachment sog list instead.
2012-07-11 22:57:31 +01:00
Justin Clark-Casey (justincc)
25109c8e4d
Remove code that tried to delete an attachment back to inventory if RezSingleAttachmentFromInventoryInternal() returned null.
...
null would only ever be returned if the item couldn't be located within inventory and this would happen immediately.
In this case, derezzing wouldn't work anyway since there is no item to derez.
2012-07-11 22:57:22 +01:00
Justin Clark-Casey (justincc)
51724128bf
If rest of first line after colon is blank then still warn about running in XEngine if engine specified does not exist.
...
This is to take account of situations where the user was intending to specify a script engine using colon using its default language.
This probably generates few false positive as scripts are less likely to end a first line colon with a comment for other purposes.
2012-07-11 22:57:12 +01:00
Justin Clark-Casey (justincc)
461831a65e
Avoid reporting false positives when a colon is in a comment in the first line of a script where the user was not trying to select a different script engine.
...
This works by only posting the "Selected engine unavailable" message if we're falling back on XEngine and the language is one handled by XEngine.
In cases where the language is not handled or not allowed, the user will still be notified by the later compiler error.
This avoids the overwhelming majority of false positives where the first line contains a : for other reasons (e.g. source control systems, vim settings, etc.)
Ultimately, I think it would be better to detect script language/engine with a mechanism that didn't just rely on : detection (e.g like #! in unix scripts).
2012-07-11 22:56:59 +01:00
Justin Clark-Casey (justincc)
c6fa09c3af
minor: reuse colon index calculation in XEngine.OnRezScript. The index if a colon is found on the first line will always be the same as for the whole script.
2012-07-11 22:56:45 +01:00
Justin Clark-Casey (justincc)
9ccf56eaae
Fix issue in InventoryArchiveTestCase where it didn't call down to OpenSimTestCase.SetUp()
2012-06-27 21:52:23 +01:00
Justin Clark-Casey (justincc)
ea9b0794e0
refactor: Move ScenePresence <-> AgentData attachments copying code into AttachmentsModule.
2012-06-27 21:52:16 +01:00
Justin Clark-Casey (justincc)
96191241be
Automatically disable log4net before each regression test so that logging is confined to a single test if it's turned on.
...
This involves making test classes inherit from a common OpenSimTestCase.
This will be applied to more classes as required.
2012-06-27 21:52:08 +01:00
Justin Clark-Casey (justincc)
779f0ede49
Fix output for help on some object region console commands
2012-06-27 21:51:54 +01:00
Justin Clark-Casey (justincc)
e511106d8d
Show region positions in "show regions" robust console command
2012-06-27 21:51:48 +01:00
Justin Clark-Casey (justincc)
37f22e2946
minor: correct GridService "show regions" cibsike cinnabd usage statement
2012-06-27 21:51:40 +01:00
Justin Clark-Casey (justincc)
b802906827
refactor: Remove unnecessary AttachmentModuleTests.m_userId in favour of local variables
2012-06-27 21:51:34 +01:00
Justin Clark-Casey (justincc)
c6fb5f0fe4
refactor: Use local attachment module variables instead of global m_attMod.
...
This also avoids confusion between tests where one sets up m_attMod and another accidentally uses it after failing to set one up itself.
2012-06-27 21:51:27 +01:00
Justin Clark-Casey (justincc)
8909e70fc3
refactor: make m_presence a local variable in all AttachmentsModuleTests since it doesn't need to be global and some tests set up more than one sp
2012-06-27 21:51:19 +01:00
Justin Clark-Casey (justincc)
78fcee1f4b
Add regression test to check that attachments in source region are deleting when an agent teleports to a neighbouring region
2012-06-27 21:51:12 +01:00
Justin Clark-Casey (justincc)
3106a0f25e
If crossing attachments into another region pre-fatpack, clone objects before changing properties to avoid hud display race condition with update threads.
...
This matches behaviour in fatpack crossing, where attachments are cloned before their properties are changed.
This only applies to crossings to simulators running code released before April 2011.
2012-06-27 21:51:03 +01:00
Justin Clark-Casey (justincc)
19c2f08a8b
Add much easier ConsoleDisplayTable AddColumn() and AddRow() methods.
...
Use these for new "show regions" command rather than old cumbersome stuff.
2012-06-27 21:50:52 +01:00
Justin Clark-Casey (justincc)
005ca12a99
Add "show regions" console command to ROBUST to show all regions currently registered.
...
Command is not added in standalone, which has its own version of "show regions" that can also show estate name
2012-06-27 21:50:44 +01:00
Justin Clark-Casey (justincc)
02fe1a676e
Add "show region at" command to grid service to get the details of a region at a specific location. "show region" command becomes "show region name" to disambiguate
...
This is the same format as used by "show object name", etc.
"deregister region" also becomes "deregister region id"
2012-06-27 21:50:38 +01:00
Justin Clark-Casey (justincc)
03fc8cf155
minor: update currently commented out log message at top of AvatarFactoryModule.SetAppearance() for future use
2012-06-27 21:50:30 +01:00
Justin Clark-Casey (justincc)
8dedd91961
When attachments are being saved and deleted for a closing root agent, delete first to avoid a hud race condition with update threads.
...
If delete doesn't occur first then the update thread can outrace the IsAttachment = false necessary to save attachments and send hud artifacts to other viewers.
2012-06-27 21:50:22 +01:00
Justin Clark-Casey (justincc)
0ac040d9ca
In AttachmentsModule.DetachSingleAttachmentToInvInternal(), remove attachment before changing properties for correct inventory serialization.
...
Serialization of attachments requires IsAttachment = false so that correct positions are serialized instead of avatar position.
However, doing this when a hud is still attached allows race conditions with update threads, resulting in hud artifacts on other viewers.
This change sets SOG.IsDeleted before serialization changes take place (IsDeleted itself is not a serialized property).
LLClientView then screens out any deleted SOGs before sending updates to viewers.
2012-06-27 21:50:09 +01:00
Justin Clark-Casey (justincc)
c5e5308120
Resolve various race conditions between accessing and removing external script URLs by more consistently locking on m_UrlMap
2012-06-27 21:45:07 +01:00
Justin Clark-Casey (justincc)
1cfaacb88b
Avoid a race condition where an incoming request to a script external URL can trigger an exception is the URL was being removed at the same time.
...
This involves three steps
1) Return gracefully in UrlModule.HttpRequestHandler() instead of throwing an exception when the url cannot be found in its index
2) Return true instead of false in HasEvents() if no matching request is found in the map. This call will only happen in the first place for raced requests.
3) Return a 404 in GetEvents() if the request is not in the index, rather than a blank 200 OK.
Many thanks to Tom Haines in http://opensimulator.org/mantis/view.php?id=6051 for doing some of the work on this.
2012-06-27 21:45:00 +01:00
Justin Clark-Casey (justincc)
689cafec63
Avoid race condition between m_PrimObjects iteration in XEngine.PostObjectEvent and places where the list is modified by extending the m_PrimObjects lock.
2012-06-27 21:44:53 +01:00
Justin Clark-Casey (justincc)
d4cd9e050b
If starting scripts on initial sim start, provide INFO level log feedback each time 50 scripts have been started.
...
This is to provide an indication of what's happening now that the default isn't to report every single script start.
Changes XEngine logging level in OpenSim.exe.config from WARN to INFO.
2012-06-27 21:44:45 +01:00
Justin Clark-Casey (justincc)
472785a5e8
Eliminate unnecessary extra call to TriggerEmptyScriptCompileQueue in XEngine.DoOnRezScriptQueue()
...
The later invocation of this function will happen on an empty compile queue.
2012-06-27 21:44:38 +01:00
Justin Clark-Casey (justincc)
da28fcd357
Stop flicking IsAttachment false and then true in AttachmentsModule.UpdateAttachmentPosition() in order to avoid a hud update race condition.
...
Previously, setting IsAttachment to false then true was necessary to serialize the updated attachment object information.
However, UpdateAttachmentPosition no longer does this update.
Whilst IsAttachment is set to false there is a race condition where the update thread can wrongly send hud object updates to clients that do not own the hud, resulting in screen artifacts.
2012-06-27 21:44:20 +01:00
Justin Clark-Casey (justincc)
1999338773
Fix bug where attachments would not retain position if just rotated and not moved.
...
This was because we were not setting AttachedPos in SOG.UpdateGroupPositionPR, unlike UpdateGroupPosition
2012-06-27 21:44:12 +01:00
Justin Clark-Casey (justincc)
95670d2086
refactor AttachmentsModule tests to use a common method for standard attachment item setup
2012-06-27 21:44:04 +01:00
Justin Clark-Casey (justincc)
af2c48449c
Add regression test for updating attachment position
2012-06-27 21:43:58 +01:00
Justin Clark-Casey (justincc)
ffc6110edf
Add item id, name, prim name and id to log message when state exists but loading fails.
...
Drop logging about memory limit exceeded to warn from error
2012-06-27 21:43:49 +01:00
Justin Clark-Casey (justincc)
1edd1f93c1
Retrigger build - last jenkins run was glitched
2012-06-27 21:41:49 +01:00
Justin Clark-Casey (justincc)
b6e42da21a
Add state file location to errors logged when there's some issue with retrieving state (e.g. exceeds memory limit)
2012-06-27 21:41:34 +01:00
Justin Clark-Casey (justincc)
2e0402433d
Use HasPrivateAttachmentPoint properties in SOG.DeleteGroupFromScene() instead of magic numbers
2012-06-27 21:41:24 +01:00
Justin Clark-Casey (justincc)
d19600e257
refactor: use SOG.HasPrivateAttachmentPoint in SOP.SendTerseUpdateToClient() instead of attachmentpoint magic numbers.
2012-06-27 21:41:15 +01:00
Justin Clark-Casey (justincc)
a6d97e6353
As with LLSDInventoryItem from commit 01a2b0b, send type values in LLSDInventoryFolder for inventory CAPs as integers rather than strings.
...
Should also resolve some issues with exceptions being thrown in some inventory fetches.
2012-06-20 23:56:25 +01:00
Justin Clark-Casey (justincc)
8eb39eb3ac
Lower warn logging on not having friends/group module on permissions to debug.
...
It's a valid configuration not to have these modules, but I think it's still worth logging the fact that certain permissions won't work (always return true)
2012-06-20 23:55:58 +01:00
Justin Clark-Casey (justincc)
553ac6335d
minor: Lower flotsam asset cache warning about not having a FlotsamCache.ini to debug
...
It's perfectly okay not to have this section.
2012-06-20 23:55:51 +01:00
Justin Clark-Casey (justincc)
32a2515817
Change default logging level for XEngine to WARN instead of DEBUG.
...
This is to reduce log spam from script loading, which is especially spammy for avatar movements with scripted attachments.
All important messages are at warn or above.
If you still want/need to see these messages, set <level value="DEBUG"/> in the <logger name="OpenSim.Region.ScriptEngine.XEngine"> section of OpenSim.exe.config.
This affects no other package logs, which still output at the root configured level (currently DEBUG by default).
2012-06-20 23:55:42 +01:00
Justin Clark-Casey (justincc)
a0482bccc7
Remove STARTUP COMPLETE message from the startuplogo.txt file and into main logging
2012-06-20 23:55:36 +01:00
Justin Clark-Casey (justincc)
3291e256ba
Comment out the neighbour and land in connectors from info logging that they are starting up
2012-06-20 23:55:27 +01:00
Justin Clark-Casey (justincc)
fb7573f713
Comment out recently added log message detailing number of scripts started when compile queue empties for now
2012-06-20 23:55:16 +01:00
Justin Clark-Casey (justincc)
4684207d6e
Raise some IO associated Exception logging in XEngine to error level, in line with other similar cases.
...
Remove more unnecessary Close() calls - these are being triggered by the Dispose() called when exiting the using statement for these sdk io objects.
2012-06-20 23:55:09 +01:00
Justin Clark-Casey (justincc)
499b778391
Log how many scripts are candidates for starting and how many are actually started.
...
Adds DebugLevel infrastructure to XEngine though currently commented out and unused.
2012-06-20 23:54:16 +01:00
Justin Clark-Casey (justincc)
9779ceded5
If RegionReady is active, don't falsely say that logins are enabled in the main scene loop before RegionReady is signalled when initial script compilation finishes.
...
Also raises this logging level to Info from Debug since this information is of high importance. This matches the behaviour of the RegionReady module
2012-06-20 23:44:28 +01:00
Justin Clark-Casey (justincc)
512d0ac411
minor: If logging because mesh/sculpt data isn't present for an object, log object UUID rather than local id, since UUID doesn't potentially vary between simulator starts.
2012-06-20 23:44:16 +01:00
Justin Clark-Casey (justincc)
981c7d63a0
Like the assembly and text files, only write the c#-lsl linemap in XEngine.SetXMLState() if the trust binaries flag is set.
...
This doesn't affect other locations where the map is written, such as on script compilation.
2012-06-20 23:44:03 +01:00
Justin Clark-Casey (justincc)
7bd1601a3f
minor: Add a little more detail to IOException logging in XEngine.SetXMLState()
...
Also removes superflous Close() commands for statements taking place within using() constructs
Also adds some comment out debug log messages for future use.
2012-06-20 23:43:47 +01:00
Justin Clark-Casey (justincc)
3aef006e78
Change read config paramter from max_urls_per_simulator to max_external_urls_per_simulator, which is what it was meant to be
2012-06-20 23:33:54 +01:00
Justin Clark-Casey (justincc)
9a6aa528db
Fix bug introduced in commit c6e3752 (13 Jun 2012) where poll responses would always return OK even if some other status code had been set
2012-06-20 23:33:46 +01:00
Justin Clark-Casey (justincc)
02a163848c
Implement max_external_urls_per_simulator setting in [LL-Functions] to allow configuration of how many urls can be set up by llRequestURL()
...
Defaults remains as 100.
This setting is per simulator instead of per region due to how the url script module is structured.
2012-06-20 23:33:38 +01:00
Justin Clark-Casey (justincc)
b9f122be07
Add region name to UseCircuitCode log messages
2012-06-20 23:33:27 +01:00
Justin Clark-Casey (justincc)
e64ca361df
Put all debug console commands into a single Debug section rather than scattering them over other categories
2012-06-20 23:33:13 +01:00
Justin Clark-Casey (justincc)
8a11c4e7d4
Make the "debug http" command available for robust as well as the simulator. This allows one to see incoming requests as they happen.
...
This required making everything use the common MainServer class for registering and retrieving http servers, rather than duplicate structures.
2012-06-20 23:33:04 +01:00
Justin Clark-Casey (justincc)
584a076bec
Add main instance to internal MainServer.m_Servers list to simplify internal logic.
...
This does require the server to be added before it is set as the main Instance
2012-06-20 23:32:57 +01:00
Justin Clark-Casey (justincc)
88596d6097
minor: Tell user the current debug http level if "debug http" console command is executed without a level parameter
2012-06-20 23:32:44 +01:00
Justin Clark-Casey (justincc)
84d97b3bc0
When setting debug http level, do this for all known http servers, not just the main instance.
2012-06-20 23:32:38 +01:00
Justin Clark-Casey (justincc)
2b4e97eeaf
Make XMLRPCModule use an existing HTTP server if one already exists on the desired port.
2012-06-20 23:32:30 +01:00
Justin Clark-Casey (justincc)
a544280ef2
Get rid of some unnecessary null checks in RegionApplicationBase.StartupSpecific() - a constructor can never return null.
...
Also adds some method doc to MainServer
2012-06-20 23:32:23 +01:00
Justin Clark-Casey (justincc)
3a0f9836f3
minor: Extend 'debug http' usage statement to 0..3 from 0..2
2012-06-20 23:32:12 +01:00
Justin Clark-Casey (justincc)
4bfac5688d
Shuffle "debug http" levels so that 1 and 2 now cause different levels of warn to be logged if we receive invalid xml for xmlrpc.
2012-06-20 23:32:06 +01:00
Justin Clark-Casey (justincc)
0fb93042c6
Fix a regression in BaseHttpServer.HandleXmlRpcRequests() from recent c6e3752
...
Accidentally make responseString null by default instead of String.Empty.
It needs to be something in case the XmlRpcRequest deserialize throws an exception due to bad xml (a failure which we silently swallow!)
2012-06-20 23:31:50 +01:00
Melanie
a3586a7c4b
Fix not sending TransferInfo when an asset is not found. This clogs
...
up the sound pipeline in the viewer.
2012-06-20 23:31:02 +01:00
Justin Clark-Casey (justincc)
d4ff56710b
Don't include time to transmit response back to requester when assessing slow handling of requests.
...
This is to avoid logging a 'slow' request when the source of delay is the viewer in processing a response.
This is not something we can do much about on the server end - it's server-side delay that we're interested in.
To ensure consistency, this commit also had to refactor and simplify inbound non-poll network request handling, though there should be no functional change.
IOSHttpResponse no longer exposes the Send() method, only classes in OpenSim.Framework.Servers.HttpServer should be doing this.
Only the GetTextureHandler was sending its own response. Now it leaves this to BaseHttpServer, like all other core handlers.
2012-06-20 23:29:49 +01:00
Justin Clark-Casey (justincc)
6219c137e1
Fix very recent regression in 917d753 where I put the ++updatesThisCall outside the batching part of ProcessEntityUpdates()
...
This stopped any batching happening and since this method is called periodically updates were sent very slowly
2012-06-14 04:00:32 +01:00
Justin Clark-Casey (justincc)
da3877a77d
If we're going to discard a terse update block because it's now someone else's hud, then don't still add it to the list of blocks for the update message.
2012-06-14 04:00:22 +01:00
Justin Clark-Casey (justincc)
10ed7e3bbc
correct wrong incomplete comment from previous commit 3c3ea19 in AttachmentsModule
2012-06-14 04:00:04 +01:00
Justin Clark-Casey (justincc)
f248f8bf31
Fix a bug where scene objects attached as HUDs through scripts would not disappear for other avatars.
...
We do this by sending a kill message for that object to all other avatars apart from the one that has the hud.
2012-06-14 03:59:56 +01:00
Justin Clark-Casey (justincc)
6f2031001b
Fix a race condition where an object update for a hud could be sent to non-owner avatars if the hud was attached directly from within the region.
...
If this happens, then the non-owners would see unremovable huds that they did not own until relog, and sometimes even beyond that.
This was due to a race between the entity update and the attachment code when moving an object from within scene to a hud.
2012-06-14 03:59:46 +01:00
Justin Clark-Casey (justincc)
1c5ad8e9ab
Add SOG.HasPrivateAttachmentPoint to tell if a SOG has a private attachment point. HUDs attachment points are private.
...
Change SOP.SendFullUpdateToClient() and SoundModule.PlayAttachedSound() to use this rather than different magic number formulations.
This also corrects a bug in PlayAttachedSound() where the code assumed that all attachment points over 30 were HUDs.
It appears this is no longer true with Neck and Root (Avatar Center)
2012-06-14 03:59:39 +01:00
Justin Clark-Casey (justincc)
d8d8b8fc9b
minor: remove unnecessary IsAttachment = false setting for new object in UploadObjectAssetModule, property always starts as false
2012-06-14 03:59:09 +01:00
Justin Clark-Casey (justincc)
719efdaf1f
minor: refactor part of LLClientView.ProcessEntityUpdates() to remove duplicate code
2012-06-14 03:58:54 +01:00
Justin Clark-Casey (justincc)
6a8e3907ca
Remove long obsolete and unused IClientAPI.KillEndDone()
2012-06-14 03:18:23 +01:00
Justin Clark-Casey (justincc)
5a1b8fc6f7
Add ObjectUpdate as one of the packets that can be screened out when setting debug packet level
2012-06-14 03:18:15 +01:00
Justin Clark-Casey (justincc)
00ac962db7
In the osGetGrid functions, if the [GridInfo] section does not exist then return "Configuration Error", as already happens if there is no GridInfoURI
2012-06-14 03:18:08 +01:00
Justin Clark-Casey (justincc)
cb518ad68c
Add "deregister region" by uuid command to grid service to allow manual deregistration of simulators.
...
Useful if a simulator has crashed without removing its regions and those regions have been reconfigured differently
2012-06-14 03:18:00 +01:00
Justin Clark-Casey (justincc)
4859bc8c49
Remove accidental timeout left in during earlier debugging. Has been in since two commits ago ( b099f26)
2012-06-14 03:13:55 +01:00
Justin Clark-Casey (justincc)
196e014782
OnConnectionClosed listeners, retrieve data from IClientAPI.SceneAgent rather than scanning all scene for the presence with the right id
...
Stop checking IsLoggingOut on these listeners, if called with a root agent then we always want to perform these actions.
This covers cases where the client is closed due to manual kick, simulator shutdown, etc.
2012-06-14 03:13:37 +01:00
Justin Clark-Casey (justincc)
c6ffaaa959
Set IClientAPI.IsActive = false early on client removal due to ack timeout rather than using IsLoggingOut flag.
...
IsActive is more appropriate since unack timeout is not due to voluntary logout.
This is in line with operations such as manual kick that do not set the IsLoggingOut flag.
It's also slightly better race-wise since it reduces the chance of this operation clashing with another reason for client deactivation (e.g. manual kick).
2012-06-14 03:08:08 +01:00
Justin Clark-Casey (justincc)
c3104f4bd2
If the simulator closes a root agent due to ack timeout, then send the client a kick message with that reason, in case it is somehow still listening.
2012-06-14 03:07:32 +01:00
Justin Clark-Casey (justincc)
d8c40ca462
In PresenceDetector.OnConnectionClose(), use the IsChildAgent check already available on IClientAPI.SceneAgent rather than retrieving it again by scanning all scenes.
2012-06-14 03:07:25 +01:00
Justin Clark-Casey (justincc)
48f47bb4c7
Comment out the scene presence sitting debug log messages for now
2012-06-14 03:04:09 +01:00
Justin Clark-Casey (justincc)
8db6edbe87
Set CreateDefaultAvatarEntries = true in Robust.HG.ini.example to match Robust.HG.ini
...
Thanks to Ai Austin for the spot.
2012-06-14 03:04:02 +01:00
Justin Clark-Casey (justincc)
a57b78b44b
Scale down per frame MS stats to match scaled simulator FPS stat.
...
This makes frame time stats properly tally with fps, which saves confusion and makes it easier to interpret numbers.
In some ways this is not so artifical - physics FPS runs at the higher rate.
2012-06-14 03:03:26 +01:00
Justin Clark-Casey (justincc)
280d005d55
Start sending spare frame time MS viewer stat. Make frame time correctly display total frame time, not just non-spare time.
...
This makes it easier to see when components of frame time exceed normal permitted frame time.
Currently reflect scene frame times.
2012-06-14 03:03:01 +01:00
Justin Clark-Casey (justincc)
61e7d4a0e2
Properly show per frame millisecond statistics per frame, not as amount of time taken per second.
...
This is to make these statistics actually match their names (and also be more accurate as number of frames can vary under heavy load)
Currently using scene frames (11.23 every second) instead of physics frames (56.18 per second)
2012-06-14 02:51:43 +01:00
Justin Clark-Casey (justincc)
3e75083d2d
Add last frame time monitor to MonitorModule now that this value is useful
2012-06-14 02:51:17 +01:00
Justin Clark-Casey (justincc)
3d400dd677
Create avatar entries necessary to stop new v3 avatars being clouds (pants, shape, etc.) by default in grid mode.
...
This only affects avatars created through the "create user" console command or createuser XMLRPC.
This matches the default setting for standalone
2012-06-14 02:50:59 +01:00
Justin Clark-Casey (justincc)
1fbb0f97bf
Add documentation to AllowGodFunctions setting in [LL-Functions]
2012-06-14 02:50:43 +01:00
Justin Clark-Casey (justincc)
4968191c1e
Fix regression in 5f4f9f0 (Fri Jun 8 2012) which stopped "show stats" and json stats from working
2012-06-14 02:50:36 +01:00
Justin Clark-Casey (justincc)
8889309324
Stop sending a DisableSimulator packet in LLClientView.Close(), which is a duplicate for child agents and unnecessary for root agents.
...
Close() already calls Scene.RemoveClient() which sends the right eq or udp DisableSimulator message to child agents.
2012-06-14 02:50:28 +01:00
Justin Clark-Casey (justincc)
27a7ba3e6a
Instead of retrieving the known client again in LLUDPServer.RemoveClient(), check the IsLoggingOut flag instead.
...
This is slightly better thread-race wise
2012-06-14 02:50:17 +01:00
Justin Clark-Casey (justincc)
2d16d14ef1
If logging a client out due to ack timeout, do this asynchronously rather than synchronously on the outgoing packet loop.
...
This is the same async behaviour as normal logouts.
This is necessary because the event queue will sleep the thread for 5 seconds on an ack timeout logout as the client isn't around to pick up the final event queue messages.
2012-06-14 02:50:09 +01:00
Justin Clark-Casey (justincc)
f2f8dcd65c
Add regression test for client logout due to ack timeout.
2012-06-14 02:50:02 +01:00
Justin Clark-Casey (justincc)
332f8b6623
Remove null checks at top of LLUDPServer.ProcessInPacket(). Neither packet nor client are ever null.
2012-06-14 02:49:55 +01:00
Justin Clark-Casey (justincc)
4eda679e12
Store already retrieve IClientAPI in IncomingPacket structure for later use rather than doing another retrieve on dequeue.
...
Instead of checking whether the client still exists by trying to retrieve again from the client manager, this patch gets it back from IncomingPacket and checks the IClientAPI.IsActive state.
2012-06-14 02:49:39 +01:00
Justin Clark-Casey (justincc)
498154af80
Don't make duplicate call to ScenePresence.Close() separately in ETM.DoTeleport() if an agent needs closing.
...
This is always done as part of Scene.RemoveClient()
Also refactors try/catching in Scene.RemoveClient() to log NREs instead of silently discarding, since these are useful symptoms of problems.
2012-06-14 02:49:31 +01:00
Justin Clark-Casey (justincc)
ba0ebe6d75
Go back to calling IncomingCloseAgent() in the "kick user" command for consistency instead of IClientAPI.Close() directly.
...
This no longer double counts child agent removals
2012-06-14 02:49:22 +01:00
Justin Clark-Casey (justincc)
28f93512bc
Remove duplicate update of user count in Scene.IncomingCloseAgent()
...
This is already done in Scene.RemoveClient() which IncomingCloseAgent() always ends up calling.
2012-06-14 02:49:14 +01:00
Justin Clark-Casey (justincc)
78c2ef2346
Fix bug with "kick user" reducing agent counts by 2 instead of 1.
...
This is done by making the kick user command call IClientAPI.Close() rather than routing through Scene.IncomingCloseAgent(), which also called IClientAPI.Close()
DisableSimulator for child agents is moved from IncomingCloseAgent() to RemoveClient(), this is not a functional change since IncomingCloseAgent() always ends up calling RemoveClient()
2012-06-14 02:49:05 +01:00
Justin Clark-Casey (justincc)
d30d68657e
Record the fact that child agents can have asset transactions.
...
Also change code to grab the agent asset transaction module once.
2012-06-14 02:48:56 +01:00
Justin Clark-Casey (justincc)
3a27f656b3
Don't send kill object messages to clients when a child agent is closed.
2012-06-14 02:48:48 +01:00
Justin Clark-Casey (justincc)
cc27a6cb84
Log warning if we try to remove a UDP client that has already been removed.
2012-06-14 02:48:36 +01:00
Justin Clark-Casey (justincc)
ed21576ce0
Allow the thread watchdog to accept an alarm method that is invoked if the timeout is breached.
...
This alarm can then invoke this to log extra information.
This is used in LLUDPServer to show which client was being processed when incoming and outgoing udp watchdog alarms are triggered.
2012-06-14 02:48:29 +01:00
Talun
9d9e042b4c
Mantis 4597 AgentPaused packet is ignored.
...
The packet was actually being handled but not acted on.
This change extends the default timeout for paused clients to 5 minutes
and makes both the paused and non-paused timeout periods configurable.
2012-06-14 02:47:21 +01:00
Justin Clark-Casey (justincc)
4fb8d5cfba
Remove unused ScenePresence list structure in llGetAgentList()
2012-06-06 01:40:45 +01:00
Justin Clark-Casey (justincc)
896c4b6248
Fix build break whree accidentally did inv.Folders rather than inv.Folders.Count in a minor change.
2012-06-04 21:17:43 +01:00
Justin Clark-Casey (justincc)
f6730da13a
minor: tidy up some comments
2012-06-04 21:17:23 +01:00
Justin Clark-Casey (justincc)
41d98916df
Fix various issues with http inventory
...
1) The return messages were being wrongly populated with the names of asset, inventory and sale types when their corresponding integers should have been used instead.
2) Folders with links were including the linked items in the descendents figure, when only the links should be included.
3) Links and linked items in link folders were not being included in the return data, and not in the correct order.
Now that these issues have been addressed, outfits and attachments appear to work consistently when HTTP inventory is enabled (as is now the default).
2012-06-04 21:17:15 +01:00
Justin Clark-Casey (justincc)
771539a4e0
Instead of updating sim stats root agent, child, objects and scripts accounts every single scene frame, update in the once every 3 seconds SimStatsReporter run
2012-06-04 21:16:46 +01:00
Justin Clark-Casey (justincc)
27c62bba99
Add optional total avatars, total prims and active prims stats to ODE plugin.
...
These will act as a sanity check with the main scene stats, to show that physics scene entities are being managed properly.
Total prims will not match scene total prims since physics total does not include phantom prims
2012-06-04 21:08:28 +01:00
Justin Clark-Casey (justincc)
93e053a122
If OdeScene.Near() returns no collision contacts, then exit as early as possible. All subsequent code is only relevant if there are contacts.
2012-06-04 21:08:21 +01:00
Justin Clark-Casey (justincc)
eb022f4cc1
Add optional stat for the other collision time per frame not spent in ODE native spaces or geom collision code
2012-06-04 21:08:12 +01:00
Justin Clark-Casey (justincc)
83542034dd
Add avatar forces calculation, prim force and raycasting per frame millisecond optional stats
2012-06-04 21:08:02 +01:00
Justin Clark-Casey (justincc)
627382f702
Collection optional avatar and prim taint frame millisecond times
2012-06-04 21:07:51 +01:00
Justin Clark-Casey (justincc)
2eb563b3bb
Remove recent optional native collision frame milliseconds stat
...
Unnecessary since this has now been broken down into space collisions and geom collisions
2012-06-04 21:07:41 +01:00
Justin Clark-Casey (justincc)
54a23f14d5
Add optional stat that records milliseconds spent notifying collision listeners in physics frames
2012-06-04 21:07:32 +01:00
Justin Clark-Casey (justincc)
e8059b74f8
Add avatar and prim update milliseconds per frame optional stats
2012-06-04 21:07:23 +01:00
Justin Clark-Casey (justincc)
075909520a
Add option native step frame ms stat
2012-06-04 21:07:16 +01:00
Justin Clark-Casey (justincc)
808bf12cd5
Add total ODE frame time optional stat, as a sanity check on the main scene physics stat
2012-06-04 21:07:07 +01:00
Justin Clark-Casey (justincc)
0f39f41317
Break down native ODE collision frame time stat into native space collision and geom collision stats
2012-06-04 21:07:00 +01:00
Justin Clark-Casey (justincc)
f23b7ae3e9
Rename new collision stats to 'contacts' - there are/can be multiple contacts per collision and this is what is actually being measured.
2012-06-04 21:06:52 +01:00
Justin Clark-Casey (justincc)
5e4b09fc22
Stop adding an unnecessary duplicate _perloopcontact if the avatar is standing on a prim.
...
This has already been added earlier on in the method.
2012-06-04 21:06:42 +01:00
Justin Clark-Casey (justincc)
25ab7841b7
minor: comment out currently unused OdeScene.sCollisionData
2012-06-04 21:06:32 +01:00
Justin Clark-Casey (justincc)
0c0e575379
Add ODE avatar and prim collision numbers if extra stats collection is enabled.
2012-06-04 21:06:23 +01:00
Justin Clark-Casey (justincc)
68946bffae
Fix OdeScene.GetTopColliders() to return the top 25 colliders rather than the first 25 that had non-zero collision scores.
...
Also zeros collisions scores on all prims after report collection, not just the top 25.
As before, this collision scores are only reset after a report is requested, which may give unrealistic numbers on the first request.
So to see more realistic scores, ignore the first report and then refresh the request after a couple of seconds or so.
2012-06-04 21:06:13 +01:00
Justin Clark-Casey (justincc)
2fc461d9ab
Add an optional mechanism for physics modules to collect and return arbitrary stats.
...
If active, the physics module can return arbitrary stat counters that can be seen via the MonitoringModule
(http://opensimulator.org/wiki/Monitoring_Module )
This is only active in OdeScene if collect_stats = true in [ODEPhysicsSettings].
This patch allows OdeScene to collect elapsed time information for calls to the ODE native collision methods to assess what proportion of time this takes compared to total physics processing.
This data is returned as ODENativeCollisionFrameMS in the monitoring module, updated every 3 seconds.
The performance effect of collecting stats is probably extremely minor, dwarfed by the rest of the physics code.
2012-06-04 21:05:57 +01:00
Justin Clark-Casey (justincc)
59a48d9ebb
Add console command "teleport user" to allow teleport from the region console
...
See "help teleport user" on the console for more details
2012-05-31 02:28:30 +01:00
Justin Clark-Casey (justincc)
533d1ea20c
refactor: factor out entity transfer state machine into a separate class to make code more analyzable
2012-05-31 02:28:20 +01:00
Justin Clark-Casey (justincc)
dca1ca1d07
If handling the failure of teleport, move agent state to CleaningUp when we start the handling.
...
Also fixes the log warning from ResetInTransit() if the state is cleared direct from Transferring or ReceiveAtDestination, as pointed out in mantis 5426
2012-05-31 02:25:07 +01:00
Justin Clark-Casey (justincc)
20a3907e86
If restating a region, clean up the physics scene after the main scene has been closed not before.
...
If this is done before then on ODE agent update calls still incoming can fail as they try to use a raycastmanager that has been disposed.
Bullet plugin does nothing on Dispose()
However, I wouldn't be at all surprised if individual region restarting was buggy in lots of other areas.
2012-05-31 02:24:36 +01:00
Justin Clark-Casey (justincc)
7358e5748d
Add Blake/Techplex to CONTRIBUTORS. Thanks!
2012-05-31 02:24:31 +01:00
Blake.Bourque
a1b64db942
One can now get hyoergrid region co-ordinates with llRequestSimulatorData
2012-05-31 02:23:00 +01:00
Justin Clark-Casey (justincc)
4d44f2d248
Use GetInventoryItem() in LSL_Api.InventoryKey(string name, int type).
...
Also removes small bug where calling this method would add 1 to LPS, evne though all callers already did this.
2012-05-31 02:22:53 +01:00
Justin Clark-Casey (justincc)
67abbcf269
Use SceneObjectPartInventory.GetInventoryItem() in OSSL.AvatarStopAnimation instead of searching the task inventory manually.
2012-05-31 02:22:45 +01:00
Justin Clark-Casey (justincc)
6b819a9032
refactor: replace LSL_Api.InventoryKey(string) largely with SceneObjectPartInventory.GetInventoryItem(string)
...
Also gets llStopAnimation() to call KeyOrName rather than duplicating logic.
2012-05-31 02:22:27 +01:00
Talun
2021a8aedb
Mantis 6028 osAvatarStopAnimation not stopping animations via UUID
...
Corrected to stop animations using the animation UUID similar to llStopAnimation.
See http://opensimulator.org/wiki/OsAvatarStopAnimation
2012-05-31 02:18:55 +01:00
Justin Clark-Casey (justincc)
58dc175ae3
on agent cross, remove from physics scene after its been placed in transit, not before.
2012-05-31 02:18:27 +01:00
Justin Clark-Casey (justincc)
4ad6763956
refactor: make ETM.CrossAgentToNewRegionAsync neighbourRegion == null check return earlier to simplify method
2012-05-31 02:18:20 +01:00
Justin Clark-Casey (justincc)
702826b850
Fix bug where a failed QueryAccess to a remove region would always have the reason "Communications failure" no matter what the destination region actually returned
2012-05-31 02:18:11 +01:00
Justin Clark-Casey (justincc)
8d30a1f74b
Stop it being possible for an agent to teleport back to its source region before the source region has finished cleaning up old agent data and structures.
...
If this is allowed, then the client usually gets forcibly logged out and data structures might be put into bad states.
To prevent this, the binary state machine of EMT.m_agentsInTransit is replaced with a 4 state machine (Preparing, Transferring, ReceivedAtDestination, CleaningUp).
This is necessary because the source region needs to know when the destination region has received the user but a teleport back cannot happen until the source region has cleaned up.
Tested on standalone, grid and with v1 and v3 clients.
2012-05-31 02:18:03 +01:00
Justin Clark-Casey (justincc)
1a988ba835
In remote QueryAccess, also receive the actual status (true|false) instead of always true no matter what the callee actually returned.
...
This was due to two things
1) SimulationServiceConnector.QueryAccess was always looking to the outer result["success"].
But if a "_Result" map is returned (which is certainly the case right now), then the true success is _Result["success"], result["success"] is always true no matter what
2) If QueryAccess was false at the destination, then AgentHandlers.DoQueryAccess() was never putting this in the result.
The default action of SerializeJsonString() is not to put false booleans in the JSON!!!, so this has to be explicitly set.
2012-05-31 02:17:55 +01:00
Justin Clark-Casey (justincc)
c422f852a6
Don't actually proceed on a within-region teleport if another is already taking place, rather than just (falsely) logging that we're not going to proceed.
...
An oversight from recent commit 9ab0c81
2012-05-31 02:17:49 +01:00
Justin Clark-Casey (justincc)
bcacdb3352
On inter-region teleport, only stand the avatar up if the QueryAccess call to the destination scene actually succeeds.
2012-05-31 02:17:42 +01:00
Justin Clark-Casey (justincc)
cd61567de8
Now that the EntityTransferModule is per-region, fetch the event queue module once rather than repeatedly via scene presences
2012-05-31 02:17:35 +01:00
Justin Clark-Casey (justincc)
5c48c3c57a
Fix issue where a dns resolution failure on the final destination might leave the user unable to teleport since the transit flag was not being reset.
...
This moves the 'already in transit' check further up and resets the flag if dns resolution fails and in the new required places.
2012-05-31 02:17:28 +01:00
Justin Clark-Casey (justincc)
7692ccc0cc
Make ISimulationScene.GetScene() used the more efficient region id for lookup rather than the region handle.
2012-05-31 02:17:18 +01:00
Justin Clark-Casey (justincc)
17cc7e85e2
If an agent is still registered as 'in transit' by the source region, don't allow an immediate teleport back.
...
This is to help relieve a race condition when an agent teleports then immediately attempts to teleport back before the source region has properly cleaned up/demoted the old ScenePresence.
This is rare in viewers but much more possible via scripting or region module.
However, more needs to be done since virtually all clean up happens after the transit flag is cleared .
Possibly need to add a 'cleaning up' state to in transit.
This change required making the EntityTransferModule and HGEntityTransferModule per-region rather than shared, in order to allow separate transit lists.
Changes were also required in LocalSimulationConnector.
Tested in standalone, grid and with local and remote region crossings with attachments.
2012-05-31 02:16:52 +01:00
Justin Clark-Casey (justincc)
96b3e1d0fa
Don't eagerly clear frame collision events when physics actors subscribe and unsubscribe from collisions, in order to avoid a race condition.
...
Since this is done directly from ScenePresence, it can lead to a race condition with the simulator loop.
There's no real point doing it anyway since the clear will be done very shortly afterwards by the simulate loop and either there are no events (for a new avatar) or events don't matter (for a departing avatar).
This matches existing behaviour in OdePrim
2012-05-31 02:11:45 +01:00
Justin Clark-Casey (justincc)
dc3cfcbe69
Check agent limit against root agent count rather than both root and child agents
...
From sl docs such as http://community.secondlife.com/t5/English-Knowledge-Base/Managing-Private-Regions/ta-p/700115
agent should apply to avatars only.
This makes sense from a user perspective, and also from a code perspective since child agents with no physics or actions take up a fraction of root agent resources.
As such, the check is now only performed in Scene.QueryAccess() - cross and teleport check this before allowing an agent to translocate.
This also removes an off-by-one error that could occur in certain circumstances on teleport when a new child agent was double counted when a pre-teleport agent update was performed.
This does not affect an existing bug where limits or other QueryAccess() checks are not applied to avatars logging directly into a region.
2012-05-31 02:05:59 +01:00
Justin Clark-Casey (justincc)
1ca1f80eac
Remove a call stack debugging line accidentally left in from a few days ago at SceneObjectPartInventory.ApplyNextOwnerPermissions().
2012-05-25 02:56:06 +01:00
Justin Clark-Casey (justincc)
afe2b437bc
minor: Change [OBJECT COMMANDS MODULE] log strings to [REGION COMMANDS MODULE] strings, though all these are currently commented out anyway
2012-05-24 01:24:24 +01:00
Justin Clark-Casey (justincc)
dff71c1aa9
Add "show scene" command which lists stats for the currently selected console scene(s)
...
This includes prim count, script count, avatar count, etc.
Information is currently the same as "show stats", though show stats can only show one scene at a time because it listens for the latest outgoing stats packet (a bad approach that needs to change).
Might be better to tie this module into the other stats module to display arbitrary stats rather than fetching directly from scene.SimStatsReporter.
Console command is "show scene" because "show region" already exists for the grid service, which is unfortunate.
Might need to make a distinction between "scene" relating to a live scene and "region" relating to more static region data (url, coords, etc.)
2012-05-24 01:24:12 +01:00
Justin Clark-Casey (justincc)
7f9a025e30
refactor: Rename ConsoleTableRow and ConsoleTableColumn to ConsoleDisplayTableRow and ConsoleDisplayTableColumn
2012-05-24 01:24:06 +01:00
Justin Clark-Casey (justincc)
a0ac284a11
Add ConsoleDisplayList for more consistent formatting of console output in list form.
...
Convert "show region" to use this structure rather than hand-constructing
2012-05-24 01:23:57 +01:00
Justin Clark-Casey (justincc)
5341036261
refactor: rename ConsoleTable -> ConsoleDisplayTable for clarity
2012-05-24 01:23:50 +01:00
Justin Clark-Casey (justincc)
46a6cab307
Add missing Y co-ord in "show region" console command information
2012-05-24 01:23:43 +01:00
Justin Clark-Casey (justincc)
edb17d1aac
Lay out "show region" information in an easier to read line by line format
2012-05-24 01:23:34 +01:00
Justin Clark-Casey (justincc)
dd05e96066
Fetch the dialog module reference in AttachmentsModule in RegionLoaded() not AddRegion()
...
The reference is not guaranteed to be there when AddRegion() is called but will definitely be present at RegionLoaded() if it's going to be present at all.
2012-05-24 01:23:27 +01:00
Justin Clark-Casey (justincc)
ed0878ca23
minor: Make log class names in InventoryAccessModule uniform
2012-05-24 01:23:20 +01:00
Justin Clark-Casey (justincc)
54c222be26
Fix bug where an avatar that had an object they owned attached through llAttachToAvatar() or osForceAttachToAvatar() would wrongly have next permissions come into play when they detached that object and rezzed it in scene.
...
This is because the attachments module code was setting the 'object slam' bit by using PermissionMask.All
Solution here is to route the attachment item creation call through the existing inventory code in BasicInventoryAccessModule rather than copy/pasted code in AttachmentsModule itself.
2012-05-24 01:23:09 +01:00
Justin Clark-Casey (justincc)
80d139297a
Setting 'in transit' on a local teleport as well as inter-region teleports.
...
This is to eliminate possible race conditions if two teleport calls are made concurrently, where at least one is a local teleport.
This is pretty much impossible on a manual user teleport but can happen on script-invoked teleports.
2012-05-24 01:23:03 +01:00
Justin Clark-Casey (justincc)
8e6459f616
minor: extend commented out LinkInventoryItem log message for future use
2012-05-24 01:22:48 +01:00
Justin Clark-Casey (justincc)
ba909cb692
Fix bug where outfit folders could not be renamed.
...
Outfit folders are a type of system folder whose details are allowed to change.
2012-05-24 01:19:53 +01:00
Justin Clark-Casey (justincc)
96b964f7fa
Enable FetchInventoryDescendents2 and FetchInventory2 caps by default. This appears to be required now for LL 3.3.1 to work properly.
...
Without this, LL 3.3.1 continually pushes LLInventoryModelFetchDescendentsResponder::error 499 to its log.
This cap will be ignored by older viewers - UDP inventory will work normally.
2012-05-24 01:15:04 +01:00
Justin Clark-Casey (justincc)
7bbab2f1d5
Fix issue where a new outfit folder is not created when a new outfit is saved if there are no previous outfits
...
This was because AddFolder() was disallowing these though they are legal.
2012-05-24 01:14:44 +01:00
Justin Clark-Casey (justincc)
e5f3af4abe
Fix build break. Comment out EQG deregister/register logging.
2012-05-24 01:10:33 +01:00
Justin Clark-Casey (justincc)
452538c6b0
Add millisecond logging to pCampBot for debugging purposes
2012-05-24 01:10:24 +01:00
Justin Clark-Casey (justincc)
5c828724f3
Add level 2 debug eq logging which logs event queue polls.
...
Refactor: eq message logging into common method.
2012-05-24 01:10:15 +01:00
Justin Clark-Casey (justincc)
6538dd24bb
Invoke log4net configurator in pCampBot.exe in order to get OpenSim sylte logging
2012-05-24 01:10:09 +01:00
Justin Clark-Casey (justincc)
996abe1ea5
refactor: move EventQueueGet path generation into common method. Rename some local variables in line with code conventions. Add commented out EQG log lines for future use.
2012-05-24 01:09:58 +01:00
Justin Clark-Casey (justincc)
f421e0c3d1
Don't eagerly clear frame collision events when physics actors subscribe and unsubscribe from collisions, in order to avoid a race condition.
...
Since this is done directly from ScenePresence, it can lead to a race condition with the simulator loop.
There's no real point doing it anyway since the clear will be done very shortly afterwards by the simulate loop and either there are no events (for a new avatar) or events don't matter (for a departing avatar).
This matches existing behaviour in OdePrim
2012-05-24 01:09:46 +01:00
Justin Clark-Casey (justincc)
e4eaca5f9b
minor: improve method doc for TestSameSimulatorSeparatedRegionsCreateAgentFails()
2012-05-24 01:08:32 +01:00
Justin Clark-Casey (justincc)
ef5925fa18
Add regression TestSameSimulatorSeparatedRegionsCreateAgentFails()
2012-05-24 01:08:30 +01:00
Justin Clark-Casey (justincc)
bae48a9394
minor: Remove redundant EstateOwner != UUID.Zero check in IsAdministrator because checking EstateOwner == user
...
Due to an earlier check we already know that user != UUID.Zero so if EstateOwner == UUID.Zero, EstateOwner == user can never be true
2012-05-24 01:06:47 +01:00
Justin Clark-Casey (justincc)
c813ed44d8
Comment out TestSameSimulatorSeparatedRegionsQueryAccessFails() regression test logging accidentally left in
2012-05-17 01:52:15 +01:00
Justin Clark-Casey (justincc)
885bec68bd
Add regression TestSameSimulatorSeparatedRegionsQueryAccessFails()
2012-05-17 01:52:06 +01:00
Justin Clark-Casey (justincc)
b553a05db3
Remove redundant "Teleport failed:" from reason when QueryAccess fails for the destination simulator. This part of the string is already provided by the viewer.
...
Also adds more reason logging for diagnostics when teleports are refused/fail.
2012-05-17 01:51:59 +01:00
Justin Clark-Casey (justincc)
5473c4f8cc
Route OAR SOG loading through the common SceneObjectSerializer.FromXml2Format() rather than the functionally identical but buggy Xml2ToSOG().
...
Remove buggy Xml2ToSOG().
2012-05-17 01:51:48 +01:00
Justin Clark-Casey (justincc)
0d73f81fb5
Fix issue where loading OARs could sometimes result in link numbers being reordered.
...
This was because the parts in scene objects were sometimes not serialized in link order.
This is perfectly fine since the parts still have the right link numbers, but an extra fix to adjust for this
had not been done in the SerialiserModule methods that OAR loading used.
Add regression test for same.
Addresses http://opensimulator.org/mantis/view.php?id=5948 , http://opensimulator.org/mantis/view.php?id=5749
2012-05-17 01:51:39 +01:00
Justin Clark-Casey (justincc)
66c204b983
Allow use of regular expressions in "show object name", "show part name" and "delete object name" console commands if --regex switch is used.
...
Deleteing objects by name, creator uuid or owner uuid now requires confirmation to avoid accidental deletion.
2012-05-17 01:51:32 +01:00
Justin Clark-Casey (justincc)
afb0600621
minor: add explanative comment to 'missing baked texture' logging commonly seen on inter-simulator teleports where avatar baked textures are not available from the asset service.
2012-05-17 01:50:52 +01:00
Justin Clark-Casey (justincc)
a13f2c6985
minor: comment out individual attachment transfer log messages for now
2012-05-17 01:50:45 +01:00
Justin Clark-Casey (justincc)
17c7ef06ba
Set the agent in transit teleport flag at the first available opportunity (i.e. when IsInTransit() was being checked) to close down a race condition.
...
On EntityTransferModule.DoTeleport() there was an IsInTransit() check to prevent multiple simultaneous teleport attempts.
However, the SetInTransit() was only performed later on, which left a window in which multiple threads could pass the IsInTransit() check.
This has been seen in the field and the results aren't pretty.
This commit effectively combines the IsInTransit() and SetInTransit() checks so there is no such window.
More failure cases are made to to call ResetInTransit() to adjust to this move.
2012-05-17 01:50:35 +01:00
Justin Clark-Casey (justincc)
4933ce49b6
Add more region information to some teleport related logging
2012-05-17 01:50:27 +01:00
Justin Clark-Casey (justincc)
5cec1fa50a
Fix mono compiler warning.
...
Last jenkins failure looked like a glitch.
2012-05-17 01:50:14 +01:00
Justin Clark-Casey (justincc)
debd83b06a
Print out more information on connecting bots
2012-05-17 01:50:02 +01:00
Justin Clark-Casey (justincc)
f01618ad1a
Stagger multiple bot logins by 5 seconds to make this part of the test more 'realistic'
...
TODO: Need to make this value configurable by a command line parameter to pCampbot
2012-05-17 01:49:48 +01:00
Justin Clark-Casey (justincc)
cfc1dba99b
Do bot startup on another thread so console is responsive during this process
2012-05-17 01:49:39 +01:00
Justin Clark-Casey (justincc)
529a3f2400
Do each bot shutdown on its own threads to prevent one slow shutdown holding up all the rest.
...
This does increase the aggressiveness of shutdown
Also prevents the bot list being locked for a long period, which was preventing commands such as "show bots" from working during shutdown
2012-05-17 01:49:31 +01:00
Justin Clark-Casey (justincc)
7c1abc5225
Increase minimum period between bot actions to 3 seconds, so that teleport doesn't fall under the minimum 2 second limits that clients take to process it
2012-05-17 01:49:15 +01:00
Justin Clark-Casey (justincc)
ca22b5e2f0
Change bot.IsConnected to be ConnectionState with Disconnected, Connecting, Connnected and Disconnecting states
2012-05-17 01:48:47 +01:00
Justin Clark-Casey (justincc)
9ec74f2098
Provide feedback on bot login states in pCampbot
2012-05-17 01:48:45 +01:00
Justin Clark-Casey (justincc)
cb4ae39cb9
If a bot is not connected, show region name "(none)" instead of throwing an exception in the "show bots" command of pCampbot
2012-05-17 01:46:55 +01:00
Justin Clark-Casey (justincc)
802488814f
Add ConsoleTable framework class for future uniform formatting of console output tables.
...
Still subject to change - if you use this be prepared to change your output code if/when the methods change.
Make new "attachments show" command use this.
2012-05-17 01:46:46 +01:00
Justin Clark-Casey (justincc)
53aa48b42c
Add "attachments" show console command that will show the server's record of which attachments an in-scene avatar has.
...
For debugging purposes.
2012-05-17 01:46:36 +01:00
Justin Clark-Casey (justincc)
b33801f854
Improve logging on the prim inventory script asset request path for future use.
...
This adds name and description of the request handler to http request logging when DebugLevel >= 1
2012-05-17 01:45:51 +01:00
Talun
fc88ce0615
Mantis 6015 new LSL function llGetAgentList.
...
Details in the lsl wiki
2012-05-17 01:45:43 +01:00
Justin Clark-Casey (justincc)
28daec7f4e
Remove physics actor related race conditions in SetVehicleFlags() and SetPhysicsAxisRotation()
...
sop.PhysActor can currently become null at any time.
2012-05-17 01:45:35 +01:00
Justin Clark-Casey (justincc)
f25efa291d
Add automated TestllBreakLink()
2012-05-17 01:45:24 +01:00
Justin Clark-Casey (justincc)
5ed0559cf2
Add automated TestllCreateLink()
2012-05-17 01:45:13 +01:00
Justin Clark-Casey (justincc)
8c1e549c12
refactor: Eliminate local id parameter from api initialize.
...
This is always available from m_host.LocalId
2012-05-17 01:44:59 +01:00
Justin Clark-Casey (justincc)
796334c5ff
Instead of constantly looking up unchanging self item in script code, pass in self item on initialization.
2012-05-17 01:44:21 +01:00
Justin Clark-Casey (justincc)
2e1c2e1261
Escape and unescape xml element names if necessary in ServerUtils.BuildXmlData() and ParseElement()
...
If AvatarService appearance data is retrieved over the network, then ServerUtils was attempting to transfer names such as "Wearable 0:0" directly to xml element names, resulting in an exception.
Space is not valid in xml element names. Neither is : in this case since the intention is not to namespace. Using names directly as keys is not a good idea.
To get around this problem this patch escapes and unescapes the element names as appropriate.
This has no impact on existing xml (since it had to be valid in the first place) but allows AvatarService data to be used over the network.
Setting appearance (from simulator to AvatarService) did not suffer this problem since the values are passed in the query string which is already properly escaped.
2012-05-10 00:50:20 +01:00
Talun
a896aac4bd
Mantis 1456 same region teleport of a sitting avatar.
...
Region to region was fixed some time ago in EntityTransferModule.
This applies the same fix for same region teleports.
2012-05-10 00:50:00 +01:00
Justin Clark-Casey (justincc)
80030d3f15
Perform SceneGraph.DuplicateObject() under existing m_updateLock already used for link and delinking, in order to avoid race conditions.
...
DuplicateObject() relies on source object having correct link numbers for the duration of the dupe.
Both link and delink can change link numbers such that they are not consistent for short periods of time.
2012-05-10 00:49:37 +01:00
Oren Hurvitz
4eba4a37ed
Log the full exception when errors occur in BaseHttpServer
2012-05-10 00:49:29 +01:00
Justin Clark-Casey (justincc)
dd0858e204
For osGetGridNick(), osGetGridName(), osGetGridLoginURI() and osGetGridCustom(), try to read from the [GridInfoService] section on standalone rather than [GridInfo]
...
[GridInfoService] is the section that's actually in bin/config-include/StandaloneCommon.ini.example
2012-05-10 00:49:15 +01:00
Justin Clark-Casey (justincc)
25fa6ee699
refactor: Instead of performing a ScenePresence lookup twice over LocateClientObject() and GetClientScene(), do the lookup just once in LocateClientObject()
2012-05-10 00:49:08 +01:00
Justin Clark-Casey (justincc)
84dfffe0aa
Fix a bug in FriendsModule.StatusNotify() where all subsequent friends would not be notified once a non-local friend was found.
2012-05-10 00:48:57 +01:00
Justin Clark-Casey (justincc)
aba803c447
Change LongCallTime on WebUtil to 3000, to match the time where request handling is considered "slow".
...
This may be the wrong thing to do but stops lots of log spam in HG setups now that the monitoring is extended to other outgoing calls.
LongCallTime may need to be made configurable.
2012-05-10 00:47:59 +01:00
Justin Clark-Casey (justincc)
79aae63aff
minor: Tweak BaseHttpServer message to make it clear that this relates to slow handling of inbound requests.
2012-05-10 00:47:43 +01:00
Justin Clark-Casey (justincc)
59e93b8ee3
Extend 'slow' request logging to other server outbound requests (forms, rest, async rest) as well as the existing logging on outbound OSD requests.
...
Also prints out the first 100 chars of any slow request data since this can contain useful info (such as agent ID).
2012-05-10 00:47:26 +01:00
Justin Clark-Casey (justincc)
e0e63f312f
Reinsert a 2000ms delay before closing a no longer required agent on the source region after teleport to resolve Imprudence teleport problems.
...
Viewers 1 and 3 are fine with doing this immediately. However, Imprudence has a small delay (<200ms, >500ms) after receiving the AgentCompleteMovement reply packet on the destination region before regarding that region as the currnet region.
If Imprudence receives a DisableSimulator in this period, it quits.
We are not restoring the full 5000ms delay since this brings back a bug where teleports permanently fail if an avatar tries to teleport back too quickly.
This commit also sends the AgentCompleteMovement packet to the client before telling the source region to release its old agent, in order to further cut down any possibility of the DisableSimulator being recieved before the AgentMovementComplete.
2012-05-10 00:39:57 +01:00
Snoopy Pfeffer
d453372f4e
Fixes Mantis #5999 . llSetLinkPrimitiveParams with PRIM_BUMP_SHINY did cause a runtime error.
2012-05-10 00:39:50 +01:00
Justin Clark-Casey (justincc)
0f5a77c5bd
Remove the somewhat misleading logging of the string length of some unknown requests, as this appeared to be some kind of numbered error code.
...
This brings these messages into line with similar messages that did not do this.
2012-05-10 00:39:43 +01:00
Justin Clark-Casey (justincc)
0c96d7ea5c
minor: resolve some mono compiler warnings
2012-05-10 00:39:35 +01:00
Justin Clark-Casey (justincc)
4b947cd6d3
Implement optional name and description on http stream handlers so that we can relate a slow request to what the handler actually does and the agent it serves, if applicable.
...
This is most useful for capabilities where the url is not self-describing.
2012-05-10 00:38:26 +01:00
Justin Clark-Casey (justincc)
ca586ca809
Comment out the five second sleep in etm.DoTeleport() if the old agent needs to be closed because it is no longer in the child's view distance.
...
This sleep appears unnecessary since a sleep has already occurred in WaitForCallback() whilst waiting for the destination region to notify of teleport success.
There are no async operations between this sleep and the WaitForCallback()
If this sleep is present, then teleporting back to the source region within 5 seconds results in a disconnection.
If this sleep is commented out then teleporting quickly back and forth between two simulators appears to work without issue.
Tested on standalone, local grid and distributed grid.
Please revert if there's something that I've missed.
2012-05-10 00:29:02 +01:00
Justin Clark-Casey (justincc)
880358f46b
Remove some test code that accidentally crept in with 9d2e1c67
2012-05-10 00:28:53 +01:00
Justin Clark-Casey (justincc)
3393babb7d
Add regression test for teleporting between neighbouring regions on the same simulator
...
This adds a non-advertised wait_for_callback option in [EntityTransfer]. Default is always true.
Teleport tests disable the wait for callback from the destination region in order to run within a single thread.
2012-05-10 00:28:47 +01:00
Justin Clark-Casey (justincc)
c3ae90c067
Move max teleport distance check down into etm.DoTeleport() since this should apply to all teleport calls, not just those through Teleport()
2012-05-10 00:28:27 +01:00
Justin Clark-Casey (justincc)
25983f20a0
refactor: Split most of EntityTransferModule.Teleport() into its same region and different region teleport components.
...
DoTeleport() now retrives IEventQueue itself rather than requiring it to be passed in.
2012-05-10 00:25:25 +01:00
Justin Clark-Casey (justincc)
1441758bc6
Create TestHelpers.EnableLogging() and DisableLogging() to turn logging on and off within tests.
...
This makes *.Tests.dll.config files no longer needed, hence deleted.
2012-05-10 00:25:14 +01:00
Justin Clark-Casey (justincc)
c7bbeb4490
Add request verb and url to error messages in WebUtil that lack this.
...
Make exception printing consistent across windows and mono.
Conflicts:
OpenSim/Framework/WebUtil.cs
2012-05-10 00:21:09 +01:00
Diva Canto
6145f90423
Slight rewording of output messages.
2012-05-10 00:17:36 +01:00
Diva Canto
2e397d1514
HG: Moved User-level code down to the HGEntityTransferModule where it belongs.
2012-05-10 00:16:51 +01:00
Diva Canto
a5d0a29dd9
Moved the inventory manipulation from HGEntityTransferModule to HGInventoryAccessModule where it belongs. They need to exchange some events, so added those to EventManager. Those events (TeleportStart and TeleportFail) are nice to have anyway.
2012-05-10 00:10:18 +01:00
Melanie
de843fd0a8
Implement bulk inventory update over CAPS (not recursive by design,
...
do NOT CHANGE THIS, needed for HG 2.0)
2012-05-10 00:05:47 +01:00
Melanie
ced4eeddcf
Typo fix
2012-05-10 00:05:41 +01:00
Melanie
093910e90e
Fix typos
2012-05-10 00:05:32 +01:00
Melanie
37685ec1b4
Start on Bulk inventory update via CAPS. Not functional yet. HG v2
2012-05-10 00:05:26 +01:00
Melanie
ccd7d35b3f
Add a corresponding method for items. HG v2
2012-05-10 00:05:19 +01:00
Melanie
de7e0d7e52
Add SendRemoveInventoryFolders which allows to remove one or more
...
folders from the viewer's inventory view. For HG v2.0. More to come
2012-05-10 00:05:13 +01:00
Diva Canto
89ee03a24d
HG: beginning of a more restrictive inventory access procedure (optional). Experimental: we'll try switching the root folder from under the viewer.
2012-05-10 00:02:14 +01:00
Melanie
79d1d3ca55
Commit the avination Teleport() methods (adaptedto justincc's changes)
2012-05-09 23:58:42 +01:00
Justin Clark-Casey (justincc)
675c208c7e
zero out SP velocity before calling SP.Teleport(), as the client expects (though this is also effectively done by physics at the moment)
2012-05-09 23:58:35 +01:00
Justin Clark-Casey (justincc)
b3307850ab
refactor: Combine ScenePresence.Teleport() and TeleportWithMomentum()
...
These are identical apart from setting Velocity = zero, which has no practical effect anyway since this is zeroed when the avatar is added back to the physics scene.
2012-05-09 23:58:27 +01:00
Oren Hurvitz
eaa840dbd9
OSSL: fixed the threat level check for osParseJSONNew
2012-05-09 23:57:49 +01:00
Justin Clark-Casey (justincc)
f64089fa6c
Restore _parent_scene.actor_name_map[prim_geom] = this; accidentally removed from ODEPrim.SetGeom.
...
This occurred in 7a574be3fdhttp://opensimulator.org/mantis/view.php?id=5988
2012-05-09 23:57:27 +01:00
Justin Clark-Casey (justincc)
5157d2023d
refactor: simply some properties code in BasicPhysicsPlugin
2012-05-09 23:52:41 +01:00
Justin Clark-Casey (justincc)
2cd927bb14
Fix bug where setting phantom on a prim would result in a server log message rather than setting phantom.
...
This was an oversight when removing some race conditions from PhysicsActor setting recently.
Regression tests extended to probe this code path.
Extending regression tests required implementation of a BasicPhysicsPrim (there was none before). However, BasicPhysics plugin is still of no current practical use other than to fill in as a component for other parts of regression testing.
2012-05-09 23:52:04 +01:00
Justin Clark-Casey (justincc)
2889961622
Comment out spurious Body != IntPtr.Zero code after disableBody(), since disableBody() sets Body == IntPtr.Zero on all code paths.
2012-05-09 23:51:56 +01:00
Justin Clark-Casey (justincc)
232f59749e
refactor: Simplify ODEPrim.AddChildPrim() by returning early where appropriate.
2012-05-09 23:51:48 +01:00
Justin Clark-Casey (justincc)
d368a10cc7
Add test for setting physics in a linkset
2012-05-09 23:51:41 +01:00
Justin Clark-Casey (justincc)
139b848774
Add regression test for prim status when root prim in a new linkset is non-physical
2012-05-09 23:51:34 +01:00
Justin Clark-Casey (justincc)
74a5226af5
Fix a bug where linking a non-physical prim with a physical prim as root would make the non-physical prim phantom rather than part of the physics object.
...
On region restart, the whole object would become physical as expected.
Observed behaviour from elsewhere is that all prims in a new linkset should take on the status of the root prim.
Add regression test for this behaviour.
2012-05-09 23:51:25 +01:00
Justin Clark-Casey (justincc)
c7ddc7a633
Remove redundant prim_geom != IntPtr.Zero checks in ODEPrim.
...
prim_geom == IntPtr.Zero only before a new add prim taint is processed (which is the first taint) or in operations such as scale change which are done in taint or under lock.
Therefore, we can remove these checks which were not consistently applied anyway.
If there is a genuine problem, better to see it quickly in a NullReferenceException than hide the bug.
2012-05-09 23:39:47 +01:00
Justin Clark-Casey (justincc)
265707d21c
If a physical prim is manually moved (e.g. by a user) then set the geometry position as well as the body position
...
This is necessary to stop the moved prim snapping back to the original position on deselection if moved only once
This resolves http://opensimulator.org/mantis/view.php?id=5966
2012-05-09 23:39:37 +01:00
Justin Clark-Casey (justincc)
eb39d1c4d4
Comment out debug [ASYNC DELETER] messages for now.
2012-04-30 19:29:17 +01:00
Justin Clark-Casey (justincc)
1197d48fc7
Remove mono compiler warning. Adjust message log to error from info
2012-04-30 19:29:08 +01:00
Justin Clark-Casey (justincc)
23e1a55ed5
Add text about using double quotes to surround console command arguments containing spaces to "help" text.
...
e.g. show object name "My long object name"
2012-04-30 19:29:01 +01:00
Justin Clark-Casey (justincc)
ba2a539603
Put scene object related console commands into new "Objects" help category rather than "Regions"
2012-04-30 19:28:54 +01:00
Justin Clark-Casey (justincc)
8a8093d8dd
Add flags information (phantom, physics, etc.) to "show object" and "show part" console commands
2012-04-30 19:28:41 +01:00
Justin Clark-Casey (justincc)
3fb0103452
Add regression test for teleporting an agent between separated regions on the same simulator.
...
This involves a large amount of change in test scene setup code to allow test scenes to share shared modules
SetupScene is now an instance method that requires an instantiation of SceneHelpers, though other SceneHelpers methods are still static
May split these out into separate classes in the future.
2012-04-30 19:27:21 +01:00
Justin Clark-Casey (justincc)
aeefdaedc7
minor: make NPC tests run in a given order, comment out log lines in mock region data plugins, null out scene in script and npc torture tests, add other doc comments to torture tests
2012-04-30 19:18:54 +01:00
Justin Clark-Casey (justincc)
756d1f917f
Stop individually deleting objects at the end of each ObjectTortureTest.
...
We can now do this since the entire scene and all objects within it are now successfully gc'd at the end of these tests.
This greatly improves the time taken to run each test (by reducing teardown time, not the time to actually do the test work that we're interested in).
Slightly simplifies config read in Scene constructor to help facilitate this.
2012-04-30 19:18:47 +01:00
Justin Clark-Casey (justincc)
6fa3dffad2
Use a fully stubbed out MockConsole for unit tests rather than inheriting from CommandConsole.
...
This is so that the static MainConsole.Instance doesn't retain references to methods registered by scene and other modules to service commands.
This prevents the scene from being garbage collected at the end of a test.
This is not the final thing preventing GC - next up is the timer started by SimStatsReporter that holds a reference to Scene that prevents end of test gc.
2012-04-30 19:17:06 +01:00
Justin Clark-Casey (justincc)
123e781cb3
Make TestSetPhysicsSinglePrim() actually add the object to the scene in order to test more code paths.
2012-04-30 19:15:07 +01:00
Justin Clark-Casey (justincc)
ed9bf5b0c6
Add regression test for prim status when root prim in a new linkset is non-physical
2012-04-30 19:14:35 +01:00
Justin Clark-Casey (justincc)
dd4e39ca1d
refactor: extract common setup code in SceneObjectStatusTests
2012-04-30 19:13:33 +01:00
Justin Clark-Casey (justincc)
5a551b074b
Add TestSetPhysics() to SOP status tests
2012-04-30 19:13:24 +01:00
Justin Clark-Casey (justincc)
c1a9355865
Tweak log messages on local region to region teleport path to help with problem resolution.
2012-04-30 19:05:27 +01:00
Diva Canto
3ea6c25fb6
Teleports: bounce off repeated requests of teleporting the same agent. Some scripts do that, and that fails the whole thing.
2012-04-30 19:05:24 +01:00
Justin Clark-Casey (justincc)
2d3135448c
Comment out old Scene.HandleLogOffUserFromGrid() to reduce client closing analysis complexity
2012-04-30 19:01:30 +01:00
Justin Clark-Casey (justincc)
36a99af37c
minor: Add more detail to unauthorized caps client message
2012-04-30 19:01:23 +01:00
Justin Clark-Casey (justincc)
2aefd15913
minor: Add region name to dropped inbound packet message
2012-04-30 19:01:13 +01:00
Justin Clark-Casey (justincc)
6bc55b1086
minor: Add avatar name to removing agent log message
2012-04-30 19:00:47 +01:00
Justin Clark-Casey (justincc)
7058ce2c70
Comment out avatar move to target message for now.
2012-04-30 19:00:39 +01:00
Justin Clark-Casey (justincc)
8e111e9018
Add regression test TestSameRegionTeleport()
2012-04-30 18:59:50 +01:00
Justin Clark-Casey (justincc)
d8bd7ca436
Comment out AvatarService.SetAvatar debug log line for now
2012-04-30 18:59:43 +01:00
Justin Clark-Casey (justincc)
392f73a000
Comment out some debug ATTACHMENTS log messages for now.
2012-04-30 18:59:35 +01:00
Justin Clark-Casey (justincc)
67efbaf33b
Comment out the noisier AVFACTORY log messages for now.
...
Permanently comment out warnings about ScenePresence not being found - this is entirely expected if the avatar has alraedy logged out or left the scene.
2012-04-30 18:59:27 +01:00
Justin Clark-Casey (justincc)
0d06740148
Improve teleport log debug and error messages to tell us who is teleporting.
2012-04-30 18:58:37 +01:00
Diva Canto
eda6947a22
Changed the Map-related messages from Info to Debug. They're debug messages.
2012-04-30 18:49:07 +01:00
Justin Clark-Casey (justincc)
f331173145
Add online/offline indicator to "friends show" region console command.
...
Improve output table formatting.
2012-04-30 18:48:57 +01:00
Justin Clark-Casey (justincc)
a666cd9e1f
Add osForceAttachToAvatar() and osForceDetachFromAvatar()
...
These behave identically to llAttachToAvatar() and llDetachFromAvatar() except that they do not enforce the PERMISSION_ATTACH check
Intended for use in completely controlled dedicated environments where these checks are more a UI hinderance than a help.
Threat level high.
2012-04-24 00:50:32 +01:00
Justin Clark-Casey (justincc)
2657aa6987
Replace common code to fetch self inventory item (as opposed to uuid) with GetSelfInventoryItem()
...
However, at some point it would be far more convenient to receive the TaskInventoryItem in the constructor rather than just the item UUID, so we don't have to constantly refetch our self item.
2012-04-24 00:45:09 +01:00
Justin Clark-Casey (justincc)
6610cd2332
refactor: Replace calls to InventorySelf() with existing m_itemID in LSL_Api
...
There's no point look up an item ID that we already have.
2012-04-24 00:44:57 +01:00
Justin Clark-Casey (justincc)
0c8b44d514
Add more exception detail to Exception and IOException throws in BaseHttpServer.HandleRequest()
2012-04-24 00:40:19 +01:00
Justin Clark-Casey (justincc)
ec46ff4445
Stop teleports from dropping tall avatars through or embedding them in the floor when lured by short avatars.
...
This involves giving the ceiling of the Z-component in a lure rather than the floor.
Ideally we would give the exact float compensating for relative avatar height but it looks like that isn't possible with the parcel id format used in lures
2012-04-24 00:37:37 +01:00
Melanie
db891880e6
Fix a logic error in app domain creation
2012-04-24 00:36:54 +01:00
Melanie
9c433e8c50
Don't re-add the assembly resolver for each script if not creating the appdomain
2012-04-24 00:36:46 +01:00
Justin Clark-Casey (justincc)
5141863ae3
On "show part" command, show link number.
...
This replaces the Parts count which was rather pointless for a prim (it was either 1 if a child or the number of parts if the root).
This information is still avaliable on the "show object" command.
2012-04-18 23:02:02 +01:00
Justin Clark-Casey (justincc)
d23550dea5
minor: Add some method doc. Add warnings since calling SOG link/delink methods directly rather than through Scene may allow race conditions.
2012-04-18 23:01:56 +01:00
Justin Clark-Casey (justincc)
c3b12510ae
Add TestGetChildPartPositionAfterObjectRotation()
2012-04-18 23:01:42 +01:00
Justin Clark-Casey (justincc)
b2685e3671
Add test TestGetChildPartPosition()
2012-04-18 23:01:33 +01:00
Justin Clark-Casey (justincc)
601d2ddbf3
Move some public methods on WebStatsModule to private to reduce some static analysis complexity.
...
There's no obvious reason for these methods to be public.
2012-04-18 23:01:27 +01:00
Justin Clark-Casey (justincc)
a5e8fe70af
Use INSERT OR REPLACE INTO sql in WebStatsModule for session update rather than separate insert and update statements
2012-04-18 23:01:12 +01:00
Justin Clark-Casey (justincc)
9b3a96aa81
correct bug where f_invalid was being inserted on a webstats update for an existing session rather than d_world_kb
2012-04-18 23:01:06 +01:00
Justin Clark-Casey (justincc)
d674e815bd
Simplify WebStatsModule by removing the uncompleted migrations section.
...
Use "create table if not exists" instead.
Client stats data is transitory data that it is not worth migrating.
2012-04-18 23:01:00 +01:00
Justin Clark-Casey (justincc)
c2e696d686
Fix bug in WebStatsModule where an exception would always be output on update if the user teleported to another region on that simulator.
...
This was because update was looking for an existing stats record unique in session id, agent id and region id.
But if the user teleports to another region then region id changes.
WebStatsModule promptly doesn't find the existing record and tries to insert a new one, but only session id is the primary key and that's still the same, which makes things go bang.
This makes the update search only on the unique session id.
This is only an issue with simulators that have multiple regions where the webstats module is enabled.
2012-04-18 23:00:51 +01:00
Justin Clark-Casey (justincc)
411dbb8df4
Add GroupPosition and GetWorldPosition() checks to TestGetRootPartPosition()
2012-04-18 23:00:43 +01:00
Justin Clark-Casey (justincc)
b22dfbbf15
minor: make test names consistent
2012-04-18 23:00:36 +01:00
Justin Clark-Casey (justincc)
4c39a3fdbf
refactor: move common init code into SetUp() in SceneObjectSpatialTests
2012-04-18 23:00:30 +01:00
Justin Clark-Casey (justincc)
f3eb366f24
refactor: put SOG position test in a separate TestSceneObjectGroupPosition()
2012-04-18 23:00:22 +01:00
Justin Clark-Casey (justincc)
a20d1b8f6b
Add simple RelativePosition and OffsetPosition checks to TestGetRootPartPosition
2012-04-18 23:00:14 +01:00
Justin Clark-Casey (justincc)
0a51289332
Add very basic TestGetRootPartPosition() test
2012-04-18 23:00:02 +01:00
Justin Clark-Casey (justincc)
97ebfb00b4
Rather than having a FromFolderID property on every single prim and only ever using the root prim one, store on SOG instead.
...
This reduces pointless memory usage.
2012-04-18 22:59:24 +01:00
Justin Clark-Casey (justincc)
c7d664f9d0
Store FromItemID for attachments once on SOG instead of on every SOP and only ever using the root part entry.
...
This eliminates some pointless memory use.
2012-04-18 22:59:18 +01:00
Justin Clark-Casey (justincc)
c2fbaaa95d
refactor: Eliminate unnecessary SOP.m_physActor
2012-04-18 22:59:08 +01:00
Justin Clark-Casey (justincc)
84d4b390f1
remove possible PhysActor unexpectedly null race conditions when changing prim collision status
...
factor out common SOP physics scene adding code into a common SOP.AddToPhysics() that is the counterpart to the existing RemoveFromPhysics()
2012-04-18 22:58:17 +01:00
Justin Clark-Casey (justincc)
54e59099b7
Fix more SOP.PhysActor race conditions in LSL_Api
2012-04-18 22:58:10 +01:00
Justin Clark-Casey (justincc)
d9585ba37e
Eliminate race condition where many callers would check SOP.PhysicsActor != null then assume it was still not null in later code.
...
Another thread could come and turn off physics for a part (null PhysicsActor) at any point.
Had to turn off localCopy on warp3D CoreModules section in prebuild.xml since on current nant this copies all DLLs in bin/ which can be a very large number with compiled DLLs
No obvious reason for doing that copy - nothing else does it.
2012-04-18 22:58:03 +01:00
Justin Clark-Casey (justincc)
45c617b5c3
Allow llRegionSayTo() to work on the PUBLIC_CHANNEL, as per http://wiki.secondlife.com/wiki/LlRegionSayTo
...
Addresses http://opensimulator.org/mantis/view.php?id=5950
2012-04-18 22:55:30 +01:00
Justin Clark-Casey (justincc)
4b0c78c64f
minor: remove some now unneeded code from FriendsCommandsModule
2012-04-18 22:55:12 +01:00
Justin Clark-Casey (justincc)
dd36e23a62
Make default "show friends" console command show friends fetched from the friends service.
...
There is no a --cache option which will show friends from the local cache if available.
2012-04-18 22:55:05 +01:00
Justin Clark-Casey (justincc)
e2dade05d9
Lock NullFriendsData.m_Data for consistency and against concurrent read/write
2012-04-18 22:54:57 +01:00
Justin Clark-Casey (justincc)
fbd61106cb
refactor: Move "friends show cache" console command out into separate FriendsCommandsModule.
...
Expose required methods on IFriendsModule. Rename GetFriends() -> GetFriendsFromCache() for self-documentation
2012-04-18 22:54:45 +01:00
Justin Clark-Casey (justincc)
67e66a2d34
Add simple login test with online friends. Add IFriendsModule.GrantRights() for granting rights via a module call.
...
Rename IFriendsModule.GetFriendPerms() -> GetRightsGrantedByFriend() to be more self-documenting and consistent with friends module terminology.
Add some method doc.
2012-04-18 22:46:10 +01:00
Justin Clark-Casey (justincc)
59911963ca
refactor: Stop passing both IClientAPI and agentID to friend event listeners, these are redundant. Replace a few magic numbers with FriendRights enum already used elsewhere.
2012-04-18 22:45:31 +01:00
Justin Clark-Casey (justincc)
dc2a4a6ccd
Add simple regression test for logging in with offline friends. Don't expect to receive any in this instance.
2012-04-18 22:41:19 +01:00
Justin Clark-Casey (justincc)
81fb0b4f07
Add back parts of reverted changes that were not concerned with child agent caching.
...
This adds ScenePresence to IClientAPI.SceneAgent earlier on in the add client process so that its information is available to EventManager.OnNewClient() and OnClientLogin()
Also add a code comment as to why we're caching friend information for child agents.
2012-04-18 22:41:12 +01:00
Melanie
a06c8fb7b2
Also add OSS header to interface
2012-04-18 22:41:05 +01:00
Melanie
05e70f76a9
Change namespace on CallingCardModule and correct interface file placemant. Also ass OpenSource header
2012-04-18 22:36:24 +01:00
Melanie
b9f4836d3e
Committing the Avination calling card module
2012-04-18 22:36:03 +01:00
Melanie
ef77dc932b
Adding the Avination calling card interface
2012-04-18 22:35:57 +01:00
Justin Clark-Casey (justincc)
bd5b1d4d48
Earlier fix to remove localCopy on prebuild
2012-04-18 22:35:27 +01:00
Melanie
5c2ffa260c
Pushing the Avination Calling card hooks. Module to follow.
2012-04-18 22:35:11 +01:00
Justin Clark-Casey (justincc)
23d04fa25c
Add "friends show cache <first-name> <last-name>" command for debugging purposes.
...
This adds a reverse lookup (name -> ID) to IUserManagement instead of hitting the UserAccountService directly.
2012-04-18 22:11:42 +01:00
Justin Clark-Casey (justincc)
67dbce4512
minor: Add some documentation to OnNewClient and OnClientClosed events
2012-04-18 22:11:31 +01:00
Justin Clark-Casey (justincc)
46170fd0d8
minor: clean up some code formatting in VivoxVoiceModule.cs
2012-04-18 22:11:18 +01:00
Justin Clark-Casey (justincc)
f85a453dc8
Allow the user to enter help topics in upper or lowercase.
...
Forcing uppercase (e.g. help Assets) is too annoying.
Thanks to WhiteStar for pointing this out.
2012-04-18 22:10:27 +01:00
nebadon
bcfe48e05b
fix yield prolog so it compiles with mono 2.11 there has been a bugzilla
...
report files with mono project in regards to this change, this simply
lets us move forward with using mono 2.11 for now :
https://bugzilla.xamarin.com/show_bug.cgi?id=4052
2012-04-18 22:10:05 +01:00
Justin Clark-Casey (justincc)
722ca250ea
Move "change region" command into general category
2012-04-18 22:05:45 +01:00
Justin Clark-Casey (justincc)
f4df128e52
Uses shorter AddCommand form for "show estates"
2012-04-18 22:05:38 +01:00
Justin Clark-Casey (justincc)
8cc5322b39
Display help commander topics in capitalized form - the commands themselves are still lowercase.
...
Also convert the estate commands to simply AddCommand() calls so that commands from two different modules can be placed in the same category
2012-04-18 22:05:24 +01:00
Justin Clark-Casey (justincc)
1480845597
Change "help" to display categories/module list then "help <category/module>" to display commands in a category.
...
This is to deal with the hundred lines of command splurge when one previously typed "help"
Modelled somewhat on the mysql console
One can still type help <command> to get per command help at any point.
Categories capitalized to avoid conflict with the all-lowercase commands (except for commander system, as of yet).
Does not affect command parsing or any other aspects of the console apart from the help system.
Backwards compatible with existing modules.
2012-04-18 22:05:03 +01:00
Justin Clark-Casey (justincc)
c877e73463
Comment out log message about sending periodic appearance updates.
2012-03-30 02:33:26 +01:00
Justin Clark-Casey (justincc)
3ce5e8eb6c
Add information about SendPeriodicAppearanceUpdates to OpenSimDefaults.ini for now.
...
Default remains false.
2012-03-30 02:33:18 +01:00
Justin Clark-Casey (justincc)
e6b12e1f9d
Add experimental SendPeriodicAppearanceUpdates = true/false setting to [Startup] in OpenSim.ini
...
On osgrid and other places, I have observed that manually sending appearance updates from the console often relieves grey avatar syndrome.
Despite hunting high and low, I haven't been able to find where this packet is sometimes being lost - it might be a persistent viewer bug for all I know.
Therefore, this experimental setting resends appearance data for everybody in the scene every 60 seconds. These packets are small and the viewer only fetches texture
data if it doesn't already have it.
Default is false.
2012-03-30 02:33:10 +01:00
Justin Clark-Casey (justincc)
bfbbd4ccba
Add a scene maintenance thread in parallel to the heartbeat thread. The maintenance thread will end up running regular jobs that don't need to be in the main scene loop.
...
The idea is to make the critical main scene loop as skinny as possible - it doesn't need to run things that aren't time critical and don't depend on update ordering.
This will be done gradually over time to try and uncover any issues. Many non-criticial scene loop activities are being launched on separate threadpool threads anyway.
This may also allow modules to register their own maintenance jobs without having to maintain their own timers and threads.
Currently the maintenance loop runs once a second, as opposed to the 89ms scene loop.
2012-03-30 02:33:01 +01:00
Justin Clark-Casey (justincc)
fec7016665
Remove unnecessary shutting down check in Scene.Heartbeat(). Add some method doc. Rename HeartbeatThread, shuttingdown to conform to code standards.
2012-03-30 02:32:53 +01:00
Justin Clark-Casey (justincc)
47fe6170b2
Rename Scene.StartTimer() to Start() - this method no longer uses a timer. Comment out more effectively unused old heartbeat code.
2012-03-30 02:32:34 +01:00
Justin Clark-Casey (justincc)
24b5fb8523
Add commented out section on collisions switch in Scene.SetSceneCoreDebug().
...
This was not implemented before the recent changes but should be at some point.
2012-03-30 02:24:03 +01:00
Justin Clark-Casey (justincc)
e8cd9688ce
If "debug scene updates true" then print out to log when a garbage collection occurs.
2012-03-30 02:23:27 +01:00
Justin Clark-Casey (justincc)
fa952f6d35
Add Scene.DebugUpdates switch which, if turned on, will print out a warning when a frame updates takes longer than twice the desired time
...
This is controlled via "debug scene updates true|false" on the region console.
Also fix an oversight with "debug scene teleport true|false"
2012-03-30 02:23:20 +01:00
Justin Clark-Casey (justincc)
df55fd69af
Incorporate scene teleporting debugging into "debug scene teleport true|false" command
2012-03-30 02:23:13 +01:00
Justin Clark-Casey (justincc)
019fc4c1f2
Replace "scene debug true false true" console command with "scene debug scripting true" or other parameters as appropriate.
...
This is to allow individual switching of scene debug settings and to provide flexibiltiy for additional settings.
2012-03-30 02:22:59 +01:00
Justin Clark-Casey (justincc)
22ea441feb
fix compile error from last commit
2012-03-30 02:22:57 +01:00
Justin Clark-Casey (justincc)
9f5b33e52e
refactor: simplify EstateManagementModule.handleEstateDebugRegionRequest()
2012-03-30 02:21:42 +01:00
Justin Clark-Casey (justincc)
92837c4f89
Add ability to log warn if a frame takes longer than twice the expected time. Currently commented out.
2012-03-30 02:21:32 +01:00
Justin Clark-Casey (justincc)
68ce06f40f
remove unnecessary tmpFrameMS, use maintc instead for frame time calculation
2012-03-30 02:21:04 +01:00
Justin Clark-Casey (justincc)
279b31c75b
Move frame loop entirely within Scene.Update() for better future performance analysis and stat accuracy.
...
Update() now accepts a frames parameter which can control the number of frames updated.
-1 will update until shutdown.
The watchdog updating moves above the maintc recalculation for any required sleep since it should be accounted for within the frame.
2012-03-30 02:20:46 +01:00
Justin Clark-Casey (justincc)
3117b3cd88
refactor: precalculate the fixed movement factor for avatar tilting (sqrt(2)) rather than doing it multiple times on every move.
2012-03-30 02:20:35 +01:00
Justin Clark-Casey (justincc)
9b547f76e7
refactor: Eliminate unnecessary duplicate avCapsuleTilted
2012-03-30 02:20:29 +01:00
Justin Clark-Casey (justincc)
3d6675784a
Remove pointless ThreadAbortException catching in a test that isn't run anyway.
2012-03-30 02:20:21 +01:00
Justin Clark-Casey (justincc)
26f50eadd1
Remove some pointless catching/throwing in the scene loop.
2012-03-30 02:20:14 +01:00
Justin Clark-Casey (justincc)
6e8496ffc5
Comment out unused scene loop restart code.
...
This has actually been unused since at least 0.7.2 due to earlier changes.
2012-03-30 02:18:13 +01:00
Justin Clark-Casey (justincc)
88d6c4ec0e
Use m_lastFrameTick instead of m_lastUpdate in Scene.GetHealth(). m_lastUpdate is no longer properly updated and is redundant anyway.
2012-03-30 02:18:05 +01:00
Justin Clark-Casey (justincc)
135eeb45d6
Change flavour to extended
2012-03-30 02:16:11 +01:00
Justin Clark-Casey (justincc)
54ee59c0bb
Add Extended flavour option to opensim version information.
...
This flavour is for changes in addition to the 0.7.3-post-fixes branch that are too large to be considered fixes but should be reasonably stable.
This flavour will almost certainly never see a formal release.
2012-03-30 02:13:37 +01:00
Justin Clark-Casey (justincc)
4a5c61a33d
Enable voice by default on parcels to weaken effects of viewer 2/3 ParcelVoiceInfoRequest bug
...
Viewer 2/3 contains a bug where the viewer will constantly retry ParcelVoiceInfoRequest requests on voice-disabled parcels where voice is otherwise available.
Attempts to fix this server-side have not been successful - sending a non-OK http code (e.g. a 404) just makes the viewer request again immediately.
Dropping the request entirely is a bit better but the viewer still retries after a minute.
Estate settings already enabled voice by default so doing the same for parcels. This only has an effect if you have any voice system active at all.
Ultimately, the re-request bug needs to be fixed viewer-side (LL suffers from the same issue!) but it might be worth implementing the drop request hack.
2012-03-30 02:03:52 +01:00
Diva Canto
179c0f5f56
Merge branch '0.7.3-post-fixes' of ssh://opensimulator.org/var/git/opensim into 0.7.3-post-fixes
2012-03-22 20:36:01 -07:00
Justin Clark-Casey (justincc)
4dbf937707
Comment out login parameters debug output accidentally included with c4b2d24
2012-03-22 23:33:08 +00:00
Justin Clark-Casey (justincc)
9edb57e5e9
Comment out a terrain save-tile debugging message that accidentally crept in with c4b2d24
2012-03-22 23:17:54 +00:00
Justin Clark-Casey (justincc)
4d15ad63bf
refactor: simplify code for checks when part.OwnerID != destPart.OwnerID in MoveTaskInventoryItem()
2012-03-22 23:03:00 +00:00
Justin Clark-Casey (justincc)
4021709371
Fix llGiveInventory() so that it checks the destination part for AllowInventoryDrop, not the source.
...
This allows llAllowInventoryDrop() to work.
Regression test added for this case.
2012-03-22 23:02:49 +00:00
Justin Clark-Casey (justincc)
3c13f5c3aa
Add llGiveInventory() test from object to object where both objects are owned by the same user.
2012-03-22 23:02:35 +00:00
Justin Clark-Casey (justincc)
381517b451
Add prim name to "[MESH]: No recognized physics mesh..." log message
2012-03-22 23:01:39 +00:00
Justin Clark-Casey (justincc)
6ecf36d49c
Fix small typo
2012-03-22 22:47:03 +00:00
Justin Clark-Casey (justincc)
64eb4b8408
Fix crash where two scene loop threads could changes m_MeshToTriMeshMap at the same time.
...
Have to lock m_MeshToTriMeshMap as property is static and with more than one region two scene loops could try to manipulate at the same time.
2012-03-22 22:46:45 +00:00
Diva Canto
318da3fdcd
Added new simple_build_permissions config to the .ini and .example files.
2012-03-22 14:34:46 -07:00
Melanie
50c99fcda6
Change a false false to be truly true - or is this statement false?
...
Fixes perms boo-boo
2012-03-22 14:34:33 -07:00
Melanie
321de1f263
Rework Diva's patch to simplify it
2012-03-22 14:34:19 -07:00
Diva Canto
fa30ace67d
Fixed borkness with map search introduce by my last changes to it.
2012-03-20 17:49:05 -07:00
Justin Clark-Casey (justincc)
92baa79253
Add some doc about the EventManager.OnLoginsEnabled event.
2012-03-19 22:49:34 +00:00
Justin Clark-Casey (justincc)
e861b45313
Fix a bug where logins to standalones would fail if the RegionReady module was not active
...
Unfortunately, the OnLoginsEnabled event is currently only guaranteed to fire if the RegionReady module is active.
However, we can instantiate the AuthorizationService in the module RegionLoaded method since by this time all other modules will have been loaded
2012-03-19 22:49:14 +00:00
Justin Clark-Casey (justincc)
cf91ac68b6
Stop console command "xengine status" throwing an exception if there are no scripts in a region.
...
Addresses http://opensimulator.org/mantis/view.php?id=5940
2012-03-19 21:45:18 +00:00
Justin Clark-Casey (justincc)
d4aba13526
Clean up "save iar" help
2012-03-19 21:33:03 +00:00
Justin Clark-Casey (justincc)
d36c7c3782
minor: reuse threadpool count we just fetched instead of fetching it again
2012-03-19 21:32:50 +00:00
Justin Clark-Casey (justincc)
4385fcdeae
Add total scripts count to "show threads"
...
However, this returns 0 on Mono (at least on 2.6.7)! So not showing if it is zero.
2012-03-19 21:32:42 +00:00
Justin Clark-Casey (justincc)
04eb170624
refactor: separate out console and status report generation parts of XEngine
2012-03-19 21:32:34 +00:00
Justin Clark-Casey (justincc)
4803686078
Improve threadpool reporting to "show threads" console command (also gets printed out periodically)
2012-03-19 21:32:25 +00:00
Justin Clark-Casey (justincc)
20b0fda3bb
Add process working memory to "show stats" memory statistics.
...
This shows the actual amount of RAM being taken up by OpenSimulator (objects + vm overhead)
2012-03-19 21:32:16 +00:00
Justin Clark-Casey (justincc)
4e5f823595
In Top Scripts report, don't show scripts with no or less than 1 microsecond of execution time.
...
This is to make the report clearer and less confusing.
2012-03-19 21:32:02 +00:00
Justin Clark-Casey (justincc)
a74408d1d2
Aggregate script execution times by linksets rather than individual prims.
...
This is for the top scripts report.
2012-03-19 21:31:53 +00:00
Justin Clark-Casey (justincc)
8206537efd
Fix owner name display in "Top Colliders" and "Top Script" region reports.
2012-03-19 21:31:45 +00:00
Justin Clark-Casey (justincc)
a9a77bb3ab
Replace script-lines-per-second with the script execution time scaled by its measurement period and an idealised frame time.
...
The previous lines-per-second measurement used for top scripts report was inaccurate, since lines executed does not reflect time taken to execute.
Also, every fetch of the report would reset all the numbers limiting its usefulness and we weren't even guaranteed to see the top 100.
The actual measurement value should be script execution time per frame but XEngine does not work this way.
Therefore, we use actual script execution time scaled by the measurement period and an idealised frame time.
This is still not ideal but gives reasonable results and allows scripts to be compared.
This commit moves script execution time calculations from SceneGraph into IScriptModule implementations.
2012-03-19 21:31:38 +00:00
Justin Clark-Casey (justincc)
6390de689d
Remove property/field duplication in ScriptInstance where it's unnecessary.
2012-03-19 21:31:17 +00:00
Justin Clark-Casey (justincc)
41ce19836b
Simplify some logic in the ScriptInstance constructor - running is set to false in both if/else branches
2012-03-19 21:31:07 +00:00
Melanie
883a4f6fff
FireAndForget scripted rez - port from Avination
2012-03-19 21:30:31 +00:00
Justin Clark-Casey (justincc)
5f1da80fc1
minor: correct indentation levels
2012-03-19 21:30:16 +00:00
Justin Clark-Casey (justincc)
64217d67f6
Remove duplication of m_RunEvents and Running
2012-03-19 21:29:45 +00:00
Justin Clark-Casey (justincc)
b01c79354c
Fix a problem where multiple near simultaneous calls to llDie() from multiple scripts in the same linkset can cause unnecessary thread aborts.
...
The first llDie() could lock Scene.m_deleting_scene_object.
The second llDie() would then wait at this lock.
The first llDie() would go on to remove the second script but always abort it since the second script's WorkItem would not go away.
Easiest solution here is to remove the m_deleting_scene_object since it's no longer justified - we no longer lock m_parts but take a copy instead.
This also requires an adjustment in XEngine.OnRemoveScript not to use instance.ObjectID instead when firing the OnObjectRemoved event.
2012-03-19 21:29:34 +00:00
Justin Clark-Casey (justincc)
9ecbcb787c
Alleviate an issue where calling Thread.Abort() on script WorkItems can fail to release locks, resulting in a crippled simulator.
...
This seems to be a particular problem with ReaderWriterLockSlim, though other locks can be affected as well.
It has been seen to happen when llDie() is called in a linkset running more than one script.
Alleviation here means supplying a ScriptInstance.Stop() timeout of 1000ms rather than 0ms, to give events a chance to complete.
Also, we check the IsRunning status at the top of the ScriptInstance.EventProcessor() so that another event doesn't start in the mean time.
Ultimately, a better solution may have to be found since a long-running event would still exceed the timeout and be aborted.
2012-03-19 21:29:24 +00:00
Justin Clark-Casey (justincc)
e17e376b04
refactor: rename ScriptInstance.m_CurrentResult to m_CurrentWorkItem to make it more understandable as to what it is and what it does (hold a thread pool work item for a waiting of in-progress event)
...
Also add other various illustrative comments
2012-03-19 21:29:09 +00:00
Justin Clark-Casey (justincc)
1b4ea4f178
Add max thread and min thread information to "xengine status" region console command
2012-03-19 21:28:54 +00:00
Melanie
1de29fb362
Change OpenSim.ini.example to reflect how to actually enable prim limits,
...
as opposed to how it was first designed.
2012-03-19 21:28:37 +00:00
Justin Clark-Casey (justincc)
7e4bd492fd
Add documentation to make more explicit the difference between OnRezScript and OnNewScript in the event manager
...
OnNewScript fires when a script is added to a scene
OnRezScript fires when the script actually runs (i.e. after permission checks, state retrieval, etc.)
2012-03-19 21:26:32 +00:00
Justin Clark-Casey (justincc)
588d56503d
Remove unnecessary explicit ElapsedEventHandler in SimReporter
2012-03-19 21:26:12 +00:00
Justin Clark-Casey (justincc)
e9602656f8
Add sensor, dataserver requests, timer and listener counts to "xengine status" command.
...
This is for diagnostic purposes.
2012-03-19 21:26:04 +00:00
Justin Clark-Casey (justincc)
0116d418f0
Fix TestSyntaxError() and TestSyntaxErrorDeclaringVariableInForLoop()
...
They were all failing assertions but the exceptions these threw were caught as expected Exceptions.
I don't think we can easily distinguish these from the Exceptions that we're expecting.
So for now we'll do some messy manually checking with boolean setting instead.
This patch also corrects the assertions themselves.
2012-03-19 21:25:41 +00:00
Justin Clark-Casey (justincc)
9992974c66
Get all test methods in OpenSim.Region.ScriptEngine.Tests.dll to report that they're running
2012-03-19 21:25:30 +00:00
Justin Clark-Casey (justincc)
ba27d8a389
Fix off by one error in script error reporting.
2012-03-19 21:25:20 +00:00
Justin Clark-Casey (justincc)
f96e985763
Simplify NPCModuleTests code by putting the NPCModule in an instance variable rather than making each test fetch it seperately.
...
Also rename instance variables in the test to conform to naming standards and for understandability
2012-03-19 21:25:07 +00:00
Diva Canto
5b9eaae50d
Region access control! Region operators can now specify things like DisallowForeigners (means what it says) and DisallowResidents (means that only admins and managers can get into the region). This puts the never-completed AuthorizationService to good use. Note that I didn't implement a grid-wide Authorization service; this service implementation is done entirely locally on the simulator. This can be changed as usual by pluging in a different AuthorizationServicesConnector.
2012-03-17 19:49:14 -07:00
Diva Canto
74a13f7e3b
Fixes mantis #5923
2012-03-17 19:47:05 -07:00
Diva Canto
3e88fc8aad
Datasnapshot: added "secret" to the registration/deregistration query so that data providers can verify authenticity if they want.
2012-03-16 17:27:45 -07:00
Diva Canto
881740d702
DataSnapshot: renamed gridserverURL to gatekeeperURL, and normalimzed the capitalization of 'name' to lower case, also in the same <grid> section.
2012-03-16 17:27:29 -07:00
Diva Canto
9a643a1bb9
Terrain: added [Terrain] section with an option to load an initial flat terrain. Default is still pinhead island. I much rather have a flat land in the beginning.
...
Conflicts:
bin/OpenSim.ini.example
2012-03-16 13:14:26 -07:00
Diva Canto
a5488650ff
More on map search: send extra messages to the user regarding the region being found or not, because the UI is horribly confusing -- places profile is always "loading..." whether the region exists or not.
2012-03-15 20:24:26 -07:00
Diva Canto
a275127a65
More on SLURLs and V3. This is hacky, but it works. Basically, we have to redefine the encoding of HG URLs because the viewer messes them up. Examples of what works and doesn't work:
...
- secondlife://ucigrid00.nacs.uci.edu|8002/128/128 <-- works throughout the viewer
- secondlife://http|!!ucigrid00.nacs.uci.edu|8002+Test+Zone+1/128/128 <-- works throughout the viewer
- secondlife://http|!!grid.sciencesim.com!grid!hypergrid.php+Yellowstone01+74/128/128 <-- works throughout
- secondlife://http%3A%2F%2Fucigrid00.nacs.uci.edu%3A8002%20UCI%20Central%201/128/128 <-- works in chat, but not as URLs in the webkit
2012-03-15 16:14:20 -07:00
Diva Canto
02db31db6a
Revert "Revert "More hacking around viewer bug""
...
This reverts commit 0434758a0d
2012-03-15 16:14:07 -07:00
Diva Canto
8bd813e6fc
Revert "Revert "Hack around https://jira.secondlife.com/browse/VWR-28570 ""
...
This reverts commit 09ff121654
2012-03-15 16:13:50 -07:00
Diva Canto
09ff121654
Revert "Hack around https://jira.secondlife.com/browse/VWR-28570 "
...
This reverts commit d7651a389e
2012-03-15 14:38:22 -07:00
Diva Canto
0434758a0d
Revert "More hacking around viewer bug"
...
This reverts commit 8bb0a71083
2012-03-15 14:38:03 -07:00
Diva Canto
8bb0a71083
More hacking around viewer bug
2012-03-15 11:04:56 -07:00
Diva Canto
d7651a389e
Hack around https://jira.secondlife.com/browse/VWR-28570
2012-03-15 10:18:55 -07:00
Justin Clark-Casey (justincc)
824318a0c1
Go back to setting appearance directly in NPCModule.SetAppearance() to fix mantis 5914
...
The part reverted is from commit 2ebb421http://opensimulator.org/mantis/view.php?id=5914
2012-03-06 01:32:44 +00:00
Justin Clark-Casey (justincc)
5e9ed22e84
Merge branch '0.7.3-post-fixes' of ssh://opensimulator.org/var/git/opensim into 0.7.3-post-fixes
2012-03-06 00:48:24 +00:00
Chris Hart
a6c611e7c9
Updates to MSSQL store for 0.7.3 to include:
...
* Telehub support
* Bugfix to Friends lookups
* Updates to Creator fields to store up to 255 characters for HG item creator storage
2012-03-06 00:45:58 +00:00
Diva Canto
72b325f8b5
Send the right name and creation date on the BasicProfileModule.
2012-03-01 19:58:57 -08:00
Justin Clark-Casey (justincc)
54d0514b13
Move SenseRepeaters.Count check inside the SenseRepeatListLock.
...
No methods in the List class are thread safe in the MS specification/documentation
2012-03-02 00:37:48 +00:00
Justin Clark-Casey (justincc)
58b1c3cec0
lock SenseRepeatListLock when added a new sensor during script reconstitution.
...
This is already being done in the other place where a sensor is added.
Adding a sensor whilst another thread is iterating over the sensor list can cause a concurrency exception.
2012-03-02 00:37:42 +00:00
Justin Clark-Casey (justincc)
71641523a3
Flick 0.7.3-post-fixes to Flavour.Post_Fixes
2012-02-29 23:43:41 +00:00
Justin Clark-Casey (justincc)
94c5e25c3b
Extend distsrc target to cleanup the files generated by running prebuild
2012-02-29 22:32:32 +00:00
Justin Clark-Casey (justincc)
20bad0aa6c
Merge branch '0.7.3-post-fixes' of ssh://opensimulator.org/var/git/opensim into 0.7.3-post-fixes
2012-02-29 22:22:42 +00:00
Justin Clark-Casey (justincc)
e7f23a6218
Switch flavour to release
2012-02-29 22:10:33 +00:00
Justin Clark-Casey (justincc)
25c29db8b6
Don't start pCampbot if the user doesn't supply bot firstname, lastname stub and password
2012-02-29 22:04:17 +00:00
Justin Clark-Casey (justincc)
1750fba9ce
Call Dispose() via using() on SqliteCommands in WebStatsModule after use.
2012-02-29 22:04:04 +00:00
PixelTomsen
b18e410586
PRIM_SCULPT_FLAG_INVERT, PRIM_SCULPT_FLAG_MIRROR implemented
...
http://opensimulator.org/mantis/view.php?id=5763
2012-02-29 22:03:28 +00:00
Justin Clark-Casey (justincc)
38d5e1fab3
Move libopenjpeg native libraries into lib32 and lib64 as appropriate.
2012-02-29 22:03:15 +00:00
Justin Clark-Casey (justincc)
4180c32eb1
Remove some more unused Bullet libraries.
2012-02-29 22:03:08 +00:00
Justin Clark-Casey (justincc)
5115229fdf
Remove old libbulletnet native libraries. These are not used in the current generation bullet physics plugin.
2012-02-29 22:02:59 +00:00
Justin Clark-Casey (justincc)
e8f2d814e7
Move other sqlite and ode 32-bit and 64-bit libraries into lib32 or lib64 as appropriate.
2012-02-29 22:02:50 +00:00
Diva Canto
1fda8c5a86
HG: Remove async in posting assets to foreign grid. Mono hates concurrency there.
2012-02-26 14:30:58 -08:00
Justin Clark-Casey (justincc)
6b77b55d40
Merge branch 'master' into 0.7.3-post-fixes
2012-02-25 00:49:16 +00:00
Justin Clark-Casey (justincc)
82cdb08c1f
Merge branch 'master' into 0.7.3-post-fixes
2012-02-25 00:49:05 +00:00
Justin Clark-Casey (justincc)
b48b0b1e58
Remove EXPERIMENTAL tags from load iar/save iar commands.
2012-02-25 00:48:41 +00:00
Justin Clark-Casey (justincc)
f9066e7d86
Establish a distsrc nant target for producing the source distribution.
...
This is in addition to the distbin target. The distbin target now needs distsrc to be run first.
Still needs some extra tweaking that I shall eventually put in as sed invocations or similar.
2012-02-25 00:36:28 +00:00
Justin Clark-Casey (justincc)
dafcb3bcd7
Merge branch 'master' into 0.7.3-post-fixes
2012-02-24 23:35:59 +00:00
PixelTomsen
7b5e42c744
llGetLinkMedia, llSetLinkMedia, llClearLinkMedia implementation mantis: http://opensimulator.org/mantis/view.php?id=5756 http://opensimulator.org/mantis/view.php?id=5755 http://opensimulator.org/mantis/view.php?id=5754
2012-02-24 23:10:41 +00:00
Justin Clark-Casey (justincc)
bafef292f4
Take watchdog alarm calling back outside the m_threads lock.
...
This is how it was originally. This stops a very long running alarm callback from causing a problem.
2012-02-24 05:25:18 +00:00
Justin Clark-Casey (justincc)
9e6ffe7798
Rename Watchdog.GetThreads() to GetThreadsInfo() to reflect what it actually returns and for consistency.
2012-02-24 05:15:47 +00:00
Justin Clark-Casey (justincc)
84735b644c
Get rid of some of the identical exception catching in Scene.Update().
2012-02-24 05:12:56 +00:00
Justin Clark-Casey (justincc)
f67f37074f
Stop spurious scene loop startup timeout alarms for scenes with many prims.
...
On the first frame, all startup scene objects are added to the physics scene.
This can cause a considerable delay, so we don't start raising the alarm on scene loop timeouts until the second frame.
This commit also slightly changes the behaviour of timeout reporting.
Previously, a report was made for the very first timed out thread, ignoring all others until the next watchdog check.
Instead, we now report every timed out thread, though we still only do this once no matter how long the timeout.
2012-02-24 05:02:33 +00:00
Justin Clark-Casey (justincc)
fe229f10e6
In osSetSpeed(), if no avatar for a uuid is found then don't attempt to set speed.
2012-02-24 04:08:59 +00:00
PixelTomsen
0b9f4d7e74
llLinkSitTarget implementation http://wiki.secondlife.com/wiki/LlLinkSitTarget
2012-02-24 00:58:11 +00:00
Justin Clark-Casey (justincc)
f034958bdc
Load appropriate 32-bit/64-bit Windows sqlite dll if using WebStatsModule.
...
This should resolve http://opensimulator.org/mantis/view.php?id=5901
2012-02-23 23:11:47 +00:00
Justin Clark-Casey (justincc)
90ea00a109
Try to resolve some problems with viewers crashing after hitting parcel banlines or freezing on the banline.
...
This involves
1) On forcible teleport, call m_scene.RequestTeleportLocation() rather than ScenePresence.Teleport() - only EntityTransferModule now should call SP.Teleport()
2) When avatar is being forcibly moved due to banlines, use a 'stop movement' tolerance of 0.2 to requested position rather than 1
This prevents the avatar sometimes being stuck to banlines until they teleport somewhere else.
This aims to fix some problems in http://opensimulator.org/mantis/view.php?id=5822
2012-02-23 22:56:42 +00:00
Melanie
9ed4245d9e
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2012-02-23 01:42:08 +00:00
Melanie
1dfc990264
Add a position parameter to region crossing of objects. This avoids the
...
potential bad update that places an object at the opposite side of the
origin sim for a moment before actually crossing it. Especially important in
grids like OSG where lag between sims is high.
2012-02-23 01:40:30 +00:00
Justin Clark-Casey (justincc)
5d31267185
Remove two spurious m_sceneGraph != null checks in Scene.cs. It's set in constructor and never subsequent set to null.
2012-02-22 00:55:16 +00:00
Justin Clark-Casey (justincc)
cf9b3e7708
Restore the taskItem null check that I accidentally blatted in 5397a6d
...
This is a valid check because the caller could supply an invalid uuid.
2012-02-21 23:41:48 +00:00
PixelTomsen
1c533eb520
Fix:LINK_ROOT flag for llGetLinkName() by SinglePrim
2012-02-21 23:15:33 +00:00
Justin Clark-Casey (justincc)
5397a6d4c6
Fix problem with dragging child part inventory item to user inventory.
...
This fixes the problem by fixing the permissions module to look at root part permissions rather than having to do this for every caller.
Resolves http://opensimulator.org/mantis/view.php?id=5569
2012-02-21 22:54:30 +00:00
Justin Clark-Casey (justincc)
76f411147d
Revert "Fix:Cannot drag inventory from child prim into inventory http://opensimulator.org/mantis/view.php?id=5569 "
...
This reverts commit 15ce73cacahttp://opensimulator.org/mantis/view.php?id=5569 , I was going to fix this in a more general way.
2012-02-21 22:49:06 +00:00
PixelTomsen
15ce73caca
Fix:Cannot drag inventory from child prim into inventory http://opensimulator.org/mantis/view.php?id=5569
2012-02-21 22:07:12 +00:00
Justin Clark-Casey (justincc)
a27e5a9c95
Both 32-bit and 64-bit BulletSim.dll must have the same name. Rename the 64 bit one in lib64
2012-02-21 04:12:17 +00:00
Justin Clark-Casey (justincc)
daee2eda93
Load 32-bit or 64-bit BulletSim Windows library automatically as appropriate.
...
This uses the same approach as ODE.
radams, if this doesn't work for you please feel free to revert.
2012-02-21 04:10:39 +00:00
Justin Clark-Casey (justincc)
a15b00d3ef
Replace previous windows 64-bit sqlite3.dll with one from http://system.data.sqlite.org/downloads/1.0.79.0/sqlite-netFx35-binary-bundle-x64-2008-1.0.79.0.zip
...
In this zip, it's called System.Data.SQLite.dll. We rename it to lib64/sqlite3.dll
This is a little unexpected but it works. For some reason my hand-rolled one in Visual Studio 2008 did not.
This is sqlite 3.7.10. Other libraries are still currently 3.7.6 but this should make no difference.
This should make it possible to use OpenSim.exe on 64-bit Windows now, though currently the bullet physics plugin will still complain (can be ignored if you are not using bullet).
2012-02-21 04:01:27 +00:00
Justin Clark-Casey (justincc)
1b906ef2ad
Replace win 64-bit sqlite3.dll with another version, though I suspect this one won't work either.
2012-02-21 03:24:01 +00:00
Justin Clark-Casey (justincc)
68a4ef5ef6
Add 64 bit Windows sqlite3.dll and use this if running a 64-bit windows process.
2012-02-21 02:52:20 +00:00
Justin Clark-Casey (justincc)
90dc5f47e7
Fix bug where NPCs would establish child agents on other neighbour regions that had come up after the NPC was created.
2012-02-21 01:57:19 +00:00
Justin Clark-Casey (justincc)
19d271d3fc
Remove PhysXPlugin and wrappers.
...
In over 4 years this never progressed beyond an unimplemented stub.
This doesn't mean that it can't come back if someone is interested in implementing PhysX support.
2012-02-21 01:45:17 +00:00
Diva Canto
3259b1d1e0
Amend to last commit: synchronize access to queues.
2012-02-20 11:13:02 -08:00
Diva Canto
4a329098e8
Amend to last commit: synchronize access to queues.
2012-02-20 11:12:02 -08:00
Diva Canto
512910a51f
More improvements on agent position updates: if the target sims fail, blacklist them for 2 min, so that we don't keep doing remote calls that fail.
2012-02-20 11:00:01 -08:00
Diva Canto
99b9c1a9d5
More improvements on agent position updates: if the target sims fail, blacklist them for 2 min, so that we don't keep doing remote calls that fail.
2012-02-20 10:58:07 -08:00
Diva Canto
fdda57cf10
Merge branch '0.7.3-post-fixes' of ssh://opensimulator.org/var/git/opensim into 0.7.3-post-fixes
2012-02-19 16:48:09 -08:00
Diva Canto
ec8e34950d
One more tweak related to the previous 2 commits.
2012-02-19 16:47:04 -08:00
Diva Canto
93964ef3a4
Amend to last commit. This should have been committed too.
2012-02-19 16:46:47 -08:00
Diva Canto
5c8af6a136
A few more tweaks on position updates and create child agents. Mono hates concurrent uses of the same TCP connection, and even of the connections to the same server. So let's stop doing it. This patch makes movement much smoother when there are lots of neighbours.
2012-02-19 16:46:32 -08:00
Diva Canto
1c3ee5d1ce
One more tweak related to the previous 2 commits.
2012-02-19 16:42:01 -08:00
Diva Canto
b489c85226
Amend to last commit. This should have been committed too.
2012-02-19 15:37:37 -08:00
Diva Canto
dcea23906b
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-02-19 12:28:47 -08:00
Diva Canto
20c65ac438
A few more tweaks on position updates and create child agents. Mono hates concurrent uses of the same TCP connection, and even of the connections to the same server. So let's stop doing it. This patch makes movement much smoother when there are lots of neighbours.
2012-02-19 12:28:07 -08:00
PixelTomsen
4d0c8aca05
Fix:OmegaX, OmegaY and OmegaZ not saved for child prims http://opensimulator.org/mantis/view.php?id=5893
...
Signed-off-by: nebadon <michael@osgrid.org >
2012-02-19 13:49:51 -05:00
PixelTomsen
8fc16ece96
Fix:Fly setting for Parcel dosen't work http://opensimulator.org/mantis/view.php?id=5887
...
Signed-off-by: nebadon <michael@osgrid.org >
2012-02-19 13:49:41 -05:00
BlueWall
fcbb375e8f
Use localy defined name, TPFlags, for Constants.TeleportFlags
2012-02-19 12:42:05 -05:00
BlueWall
49c65279fa
Route logins according to Estate, Telehub and TeleportFlags
2012-02-19 12:41:44 -05:00
BlueWall
86e8a56fe1
Propagate our teleport flags on logins
2012-02-19 12:41:30 -05:00
BlueWall
b199330682
Parcel sales support to SQLite
2012-02-19 12:41:11 -05:00
BlueWall
7a7ebaebd1
Fillin missing SQLite support for Telehubs
2012-02-19 12:40:46 -05:00
BlueWall
164ae0b24b
Fix missing telehub handling on login
2012-02-19 12:40:26 -05:00
BlueWall
bcb9577495
Use localy defined name, TPFlags, for Constants.TeleportFlags
2012-02-19 12:09:57 -05:00
PixelTomsen
d22715126c
Fix:Fly setting for Parcel dosen't work http://opensimulator.org/mantis/view.php?id=5887
...
Signed-off-by: nebadon <michael@osgrid.org >
2012-02-19 01:58:28 -07:00
PixelTomsen
a114367b9b
Fix:OmegaX, OmegaY and OmegaZ not saved for child prims http://opensimulator.org/mantis/view.php?id=5893
...
Signed-off-by: nebadon <michael@osgrid.org >
2012-02-19 01:00:01 -07:00
Diva Canto
7156545fca
This should smooth movement in heteregeneous networks by a lot: cache the region by position instead of looking it up all the time -- this was being done during the main update loop!
2012-02-18 22:15:58 -08:00
Diva Canto
2ffc055f7e
This should smooth movement in heteregeneous networks by a lot: cache the region by position instead of looking it up all the time -- this was being done during the main update loop!
2012-02-18 21:59:42 -08:00
BlueWall
14e9bf894c
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-02-18 00:51:23 -05:00
BlueWall
f4cd35322f
Route logins according to Estate, Telehub and TeleportFlags
2012-02-18 00:45:43 -05:00
BlueWall
7bdcf9eb26
Propagate our teleport flags on logins
2012-02-18 00:32:09 -05:00
Justin Clark-Casey (justincc)
9846a1e56e
Report an error if the required native Windows ODE library can't be found.
2012-02-18 02:52:29 +00:00
Justin Clark-Casey (justincc)
4cc97df8f3
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-02-18 02:46:44 +00:00
Justin Clark-Casey (justincc)
0ef64fbe03
Actually add the Windows 64-bit ode.dll file.
...
This might be why it didn't work.
2012-02-18 02:46:07 +00:00
BlueWall
fbccff4994
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-02-17 21:15:18 -05:00
Justin Clark-Casey (justincc)
84184708de
Fix a bug where changing shape parameters of a child prim in a linkset would not persist.
...
Resolves http://opensimulator.org/mantis/view.php?id=5819
2012-02-18 01:15:43 +00:00
BlueWall
8f8b478d36
Parcel sales support to SQLite
2012-02-17 20:04:38 -05:00
Justin Clark-Casey (justincc)
b817c337dc
On Windows automatically load the correct native ODE library depending on whether the process is 32-bit or 64-bit
...
In theory, this means that a 64-bit Windows OS user can now run OpenSim.exe with ODE and use more than 2 (or 3) GB of memory.
However, this is completely untested since I don't currently own a 64-bit Windows box. Feedback appreciated.
Using OpenSim.32BitLaunch.exe should continue to work. Other platforms are unaffected.
This will currently not work with sqlite - I will add that too if this works.
2012-02-18 00:33:52 +00:00
BlueWall
d03e878d53
Fillin missing SQLite support for Telehubs
2012-02-17 17:31:20 -05:00
Dan Lake
b313d16493
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-02-17 13:51:54 -08:00
Dan Lake
784263f5e3
Added the TriggerAvatarAppearanceChanged to EventManager. It's triggered by AvatarFactoryModule after an avatar's appearance has been succesfully changed and persisted (if the persist option is set).
2012-02-17 13:45:45 -08:00
Robert Adams
6baa13ab7a
Add new and updated script events
2012-02-17 09:12:41 -08:00
BlueWall
0e16e0fb6a
Merge branch 'master' of /home/opensim/src/opensim
2012-02-17 08:21:33 -05:00
BlueWall
ba98d6fffe
Fix missing telehub handling on login
2012-02-17 08:03:53 -05:00
Justin Clark-Casey (justincc)
73a5abf4d9
Merge branch 'master' into 0.7.3-post-fixes
2012-02-17 04:04:38 +00:00
Justin Clark-Casey (justincc)
630c8dc828
switch version flavour to rc2
2012-02-17 04:03:59 +00:00
Justin Clark-Casey (justincc)
972f73ed2b
Make osNpcStopAnimation() call AvatarStopAnimation() rather than AvatarPlayAnimation()
2012-02-17 02:53:12 +00:00
Justin Clark-Casey (justincc)
6de89246c2
Merge branch 'master' into 0.7.3-post-fixes
2012-02-17 00:02:16 +00:00
BlueWall
c5ff37bf3e
Merge branch 'master' of /home/opensim/src/opensim
2012-02-16 09:01:02 -05:00
BlueWall
6b867773a8
Remove some debugging output form the logger
2012-02-16 08:59:34 -05:00
Justin Clark-Casey (justincc)
96973a5778
Merge branch 'master' into 0.7.3-post-fixes
2012-02-16 03:39:25 +00:00
Justin Clark-Casey (justincc)
912aac3447
minor formatting changes from last commit (4486n7d)
2012-02-16 03:37:40 +00:00
PixelTomsen
4486b7d8e8
Fix: Object owned by the group does not return to the last owner http://opensimulator.org/mantis/view.php?id=5404
2012-02-16 03:35:18 +00:00
Justin Clark-Casey (justincc)
1267094a51
Turn off logging on test in last commit ( 2b84295).
2012-02-16 03:02:11 +00:00
Justin Clark-Casey (justincc)
2b842958cc
If shape properties fail SOP parsing (e.g. due to commas instead of decimal points) print out one short message listing the failing node names rather than lots of exceptions.
...
Adds skeleton bad float values deserialization test
2012-02-16 02:58:00 +00:00
Justin Clark-Casey (justincc)
80ec2ac167
Correct a bug introduced in 1f402fdf (Feb 7 2012) where the delete friends grid call would try and contact the wrong uri. Also fixes the build from df960d5
2012-02-16 01:39:12 +00:00
Justin Clark-Casey (justincc)
df960d5767
Add known identity informatio nto log message if an exception is thrown during LLUDPServer.HandleUseCircuitCode()
2012-02-16 01:25:54 +00:00
Justin Clark-Casey (justincc)
c0760f9f91
Comment out "experimental" log message printed out whenever a physics mesh was generated for a mesh
...
Also adds prim name to the "no asset data" error log message
2012-02-16 00:28:57 +00:00
Justin Clark-Casey (justincc)
c906128191
Fix some logic mistakes where firstly osNpcCreate() without options was creating npcs sensed as agents and secondly the OS_NPC_SENSE_AS_AGENT option was having the opposite effect.
...
Hopefully makes progress on addressing http://opensimulator.org/mantis/view.php?id=5872
2012-02-16 00:22:39 +00:00
Justin Clark-Casey (justincc)
96843f2b17
Merge branch 'master' into 0.7.3-post-fixes
2012-02-15 02:41:50 +00:00
Justin Clark-Casey (justincc)
f574d3c8fc
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-02-15 01:50:57 +00:00
Justin Clark-Casey (justincc)
ebe5e1731d
In ObjectTortureTests, run garbage collector on Teardown and run scene loop update when scene objects have been deleted.
...
At least on mono 2.6.4, running GC.Collect() is not guaranteed to force gc of all objects when run in the same method where those objects had references.
Therefore, GC.Collect() is now being done in the per-script teardown of ObjectTortureTests.
In addition, scene loop update is being run after garbage collection in order to clean out the viewer update list of scene objects in the SceneGraph.
These measures mean that scene objects/parts are now garbage collected after a test run if deleted from the scene, resulting in a much better memory usage report (though probably still not very accurate).
However, deletion takes a very long time - what's really needed is to find out now why the entire scene isn't being GC'd by this measure.
This change hasn't yet been applied to the other stress tests.
2012-02-15 01:45:25 +00:00
Dan Lake
2ebb421331
Refactor appearance saving for NPC to use AvatarFactoryModule interface.
2012-02-14 17:20:34 -08:00
Mic Bowman
a9e8bd59a3
Fix a race condition in the simian groups connector. When requests were
...
too slow they would circumvent the cache (piling up on the network service
and making the problem even worse). This condition happens frequently
during permission checks.
2012-02-13 19:38:22 -08:00
PixelTomsen
4589ce61bc
Fix: get embedded objects from Notecard fails with activated FreeSwitchVoiceModul
...
http://opensimulator.org/mantis/view.php?id=2607
2012-02-14 02:12:12 +00:00
PixelTomsen
33e66107be
Fix: Lightshare Module(Windlight)-Region settings are not applicable for database sqlite mantis: http://opensimulator.org/mantis/view.php?id=5888
2012-02-14 02:06:42 +00:00
PixelTomsen
db90dea9bd
Fix: MSSQLDB Grid - unable to register region http://opensimulator.org/mantis/view.php?id=5886
2012-02-14 02:04:02 +00:00
Justin Clark-Casey (justincc)
04544b4510
Revert "Add GridStore migration for MSSQL."
...
This reverts commit 0b17a66e68
2012-02-14 02:03:23 +00:00
Justin Clark-Casey (justincc)
0b17a66e68
Add GridStore migration for MSSQL.
...
This is done blind since I don't use MSSQL. If this doesn't work, then one will have to wait for it to be updated for the 0.7.3 opensim release.
2012-02-14 02:02:11 +00:00
Justin Clark-Casey (justincc)
04986bbb15
Add some more data to the new user connection logging for debug purposes.
2012-02-14 01:50:51 +00:00
Justin Clark-Casey (justincc)
b0d02adeee
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-02-14 00:01:24 +00:00
Justin Clark-Casey (justincc)
48b962c401
Update [XEngine] AppDomainLoading advice in OpenSim.ini.example
2012-02-14 00:00:49 +00:00
Mic Bowman
04a195266b
short circuit the expensive parts of the permission checking code
...
if the current user is the owner of an object. none of the later
checks can reverse the outcome.
2012-02-13 13:21:42 -08:00
Justin Clark-Casey (justincc)
21393af631
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-02-13 20:48:50 +00:00
Justin Clark-Casey (justincc)
189c67db95
On object deserialization, go back to logging errors at DEBUG level rather than ERROR. Restore extra log message if shape processing fails.
...
Logging level was DEBUG before 312e145312e145
2012-02-13 20:43:26 +00:00
Justin Clark-Casey (justincc)
b92b9228ef
correct the default avatar_terminal_velocity value that I accidentally left in whilst testing
2012-02-11 02:29:07 +00:00
Justin Clark-Casey (justincc)
f49897a419
Clamp ODE character velocity. Make ODE falling character 54m/s by default.
...
If velocity reaches 256 in any vector then bad things happen with ODE, so we now clamp this value.
In addition, a falling avatar is clamped by default at 54 m/s, which is the same as a falling skydiver.
This also appears to be the value used on the linden lab grid.
This should resolve http://opensimulator.org/mantis/view.php?id=5882
2012-02-11 02:28:40 +00:00
Justin Clark-Casey (justincc)
aab30f5e67
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-02-11 00:11:28 +00:00
Justin Clark-Casey (justincc)
e7fd732209
Make ScenePresence.MovementFlag a private only settable value to reduce complexity of code analysis
2012-02-11 00:10:59 +00:00
Melanie
5023cc86f0
Change parser to leave embedded quotes alone if the pattern is recognized
...
as an OptionSet long option
2012-02-10 23:58:39 +00:00
Justin Clark-Casey (justincc)
71e484516a
minor: Remove warning from RegionInfo due to repeated config.GetString() call where the first was unused.
2012-02-10 23:41:14 +00:00
Justin Clark-Casey (justincc)
38f878952c
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-02-10 23:39:59 +00:00
Justin Clark-Casey (justincc)
d80422eba7
Add line numbers to Util.PrintCallStack()
2012-02-10 23:39:32 +00:00
BlueWall
ee078f717a
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-02-10 16:28:11 -05:00
BlueWall
73f34de1f9
Merge branch 'master' of /home/opensim/var/repo/opensim
2012-02-10 16:27:14 -05:00
Justin Clark-Casey (justincc)
b3d152f3ba
Fix an npc delete race condition with LSL sensors where an initial presence check could succeed but then the npc removed before the subequent npc check.
...
The resulting null would cause an exception. We now check for null before looking at SenseAsAgent.
Hopefully fixes http://opensimulator.org/mantis/view.php?id=5872
2012-02-10 21:26:05 +00:00
PixelTomsen
a7dc7e636e
Fix: Covenant view fails after updates or cache-clean see mantis http://opensimulator.org/mantis/view.php?id=2879
...
Signed-off-by: BlueWall <jamesh@bluewallgroup.com >
2012-02-10 15:45:03 -05:00
Justin Clark-Casey (justincc)
44d84bc277
Fix bug where somebody taking a copy of an object they didn't own that was rezzed before the region was restarted would wrongly place the copy in the object owner's inventory.
...
Addresses http://opensimulator.org/mantis/view.php?id=5825
2012-02-10 19:58:34 +00:00
PixelTomsen
7273e05995
Fix: Unable to remove AV from friend list (sqldb-bug) http://opensimulator.org/mantis/view.php?id=3731
2012-02-10 02:30:55 +00:00
Justin Clark-Casey (justincc)
ddca5347c3
When an asset is uploaded (e.g. a mesh) set individual copy/move/transfer permissions, not PermissionMask.All
...
Setting PermissionMask.All will cause next permissions to replace current permissions when the object is rezzed, since bit 4 will be set.
This is not correct behaviour for a freshly uploaded mesh. Freshly rezzed in-world prims also do not have bit 4 set (don't yet know exactly what this is).
Should resolve http://opensimulator.org/mantis/view.php?id=5651
2012-02-10 02:13:15 +00:00
Justin Clark-Casey (justincc)
e8cc1bd329
Fix another Torture test build break on Windows.
2012-02-09 20:12:29 +00:00
Justin Clark-Casey (justincc)
9c84a8162f
If NPCModule.CreateNPC() fails to create the required ScenePresence (which should in theory never happen), don't add the NPC to the npc list but return UUID.Zero instead.
2012-02-09 01:17:59 +00:00
Justin Clark-Casey (justincc)
16c4636048
Add NPC torture tests for 100, 1000 and 2000 create and delete NPC calls.
2012-02-09 00:38:09 +00:00
Justin Clark-Casey (justincc)
dbe32a1f6d
minor: put in commented out logging statements for future reuse
2012-02-09 00:10:45 +00:00
Justin Clark-Casey (justincc)
3fa61c4a39
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-02-08 22:21:15 +00:00
Justin Clark-Casey (justincc)
dfa19e23f0
Stop a scene object from attempting to link with itself (which results in an exception and constant complaints in v3 viewers).
...
Aims to address http://opensimulator.org/mantis/view.php?id=5878
2012-02-08 22:19:34 +00:00
Robert Adams
d5c08c44bf
Add missing reference to prebuild.xml for torture tests
2012-02-07 16:40:09 -08:00
Justin Clark-Casey (justincc)
bef2a368f4
Make WebStats logging report consistently as WEB STATS MODULE instead of VC, VS and WEBSTATS
2012-02-07 23:38:53 +00:00
Justin Clark-Casey (justincc)
a4367e75d3
Set UseMeshiesPhysicsMesh = true in [Mesh] by default
...
This means that uploaded meshes will get a physics (collision) mesh if uploaded with that option via a viewer.
2012-02-07 23:15:23 +00:00
Justin Clark-Casey (justincc)
c87751a822
Add start GC memory and end GC memory to object stress test printouts.
...
This illustrates that references to Scene, SOG, etc. are not currently being released when a stress test ends (or at regression test end in general).
This means even the current stress tests take much more memory than they need, a problem that will have to be addressed.
2012-02-07 23:03:53 +00:00
Justin Clark-Casey (justincc)
1f402fdf5e
Add url to logging if SynchronousRestFormsRequester.MakRequest() throws an exception in service connectors
2012-02-07 21:40:28 +00:00
Justin Clark-Casey (justincc)
bd928218dd
Add TestAddTaskInventoryItem()
2012-02-07 21:00:47 +00:00
Justin Clark-Casey (justincc)
773994723a
Add warning about only uncommenting EstateConnectionString if you know what you're doing to GridCommon.ini.example (was already in StandaloneCommon.ini.example)
2012-02-07 20:35:04 +00:00
Justin Clark-Casey (justincc)
7583768b9e
Remove debug logging if physics actor is null in SOP.ApplyPhysics()
...
This is not valid in the case of BasicPhysics which can return a null PhysicsActor (though I think it should really return a do-nothing PhysicsActor).
2012-02-07 20:26:26 +00:00
Justin Clark-Casey (justincc)
c22970448f
Add TestCompileAndStart100Scripts() torture test.
2012-02-07 19:42:32 +00:00
Justin Clark-Casey (justincc)
038d1bf742
Add a regression test to compile and start a script. Remove Path.GetDirectoryName when getting assembly loading path in Compiler.CompileFromDotNetText().
...
The Path.GetDirectoryName call in Compiler.CompileFromDotNetText is unnecessary since AppDomain.CurrentDomain.BaseDirectory is always a directory.
Later path concatenation is already done by Path.Combine() which handles any trailing slash.
Removing Path.GetDirectoryName() will not affect the runtime but allows NUnit to work since it doesn't add a trailing slash to AppDomain.CurrentDomain.BaseDirectory.
2012-02-07 17:44:37 +00:00
Justin Clark-Casey (justincc)
8a36f54cf4
Merge branch 'master' into 0.7.3-post-fixes
2012-02-06 20:54:21 +00:00
Melanie
130b1c0665
Revert my two quick fixes for the lag issue and put in the real fix, which
...
is to only write to the database if data was changed. I was writing to the db
on every step of every avatar. Sure to give us lag, that.
2012-02-05 20:47:02 +00:00
Melanie
a5fcdde179
Revert "Remove checks on ban list expiry on every move. To be re-added on parcel"
...
This reverts commit 35f14a262d
2012-02-05 20:12:45 +00:00
Melanie
0904772a6f
Revert "Check ban list for a particular parcel only when an avatar moves into it."
...
This reverts commit 8923ad755d
2012-02-05 20:12:35 +00:00
BlueWall
4e11983c7c
Make configuration uniform
...
Pickup the max physical prim size in Scene to make it uniform since adding code to get default size from the OpenSim*.ini.
2012-02-05 12:38:20 -05:00
Melanie
8923ad755d
Check ban list for a particular parcel only when an avatar moves into it.
...
This restores functionality remove in the last commit without reintroducing
the performance penalty.
2012-02-05 04:03:32 +00:00
Melanie
35f14a262d
Remove checks on ban list expiry on every move. To be re-added on parcel
...
boundary crossing only as soon as I'm properly awake. This should fix
recent performance issues
2012-02-05 03:44:15 +00:00
BlueWall
13999dfc1d
Set PhysPrimMax default to 0 so ini files won't be overridden
2012-02-04 21:52:55 -05:00
nebadon
36ed0dcdaa
change NonPhysicalPrimMax to NonphysicalPrimMax in Scenes.cs to make the
...
variable in OpenSim.ini and Regions.ini match
2012-02-04 19:45:10 -07:00
nebadon
44badf452e
change NonPhysicalPrimMax to NonphysicalPrimMax to make this variable
...
work correctly, it was being ignored because of the case, this effects
OpenSim.ini.example and OpenSimDefaults.ini
2012-02-04 19:41:25 -07:00
BlueWall
df07b97abd
Make NonphysicalPrimMax setting work properly
...
RegionInfo setting will override only if it is > 0
2012-02-04 21:30:16 -05:00
BlueWall
43b4e4cfc3
Quiet the map module logging
2012-02-04 19:08:52 -05:00
BlueWall
6034e5d112
Add default value to TelehubObject
2012-02-04 00:28:22 -05:00
Justin Clark-Casey (justincc)
1a14e660d2
Merge branch 'master' into 0.7.3-post-fixes
2012-02-04 02:03:49 +00:00
Justin Clark-Casey (justincc)
8779ff3c8f
Supply correct parameters to detailed authentication login fail message
2012-02-04 02:00:35 +00:00
Justin Clark-Casey (justincc)
2502aae5db
Switch flavour to RC1. It will still be a while before RC1 is released.
2012-02-04 01:26:29 +00:00
Justin Clark-Casey (justincc)
edc11a1d39
Add missing RCERR_UNKNOWN and RCERR_SIM_PERF_LOW LSL constants that would eventually be used by llCastRay(), though OpenSim does not use these yet.
2012-02-04 01:04:00 +00:00
Justin Clark-Casey (justincc)
09d6521361
Correct RC_* LSL constants used by llCastRay().
...
Many thanks to WhiteStar for doing the research on this.
2012-02-04 01:00:11 +00:00
Justin Clark-Casey (justincc)
6c252a0fa1
Add TestRegionSettingsDeserialize
2012-02-04 00:55:03 +00:00
Justin Clark-Casey (justincc)
9b762a5a84
Only look for an uploaded transactional asset in Scene.UpdateTaskInventory if we have been passed a non-zero transaction ID.
...
This resolves the recent regression from deeb728deeb728http://opensimulator.org/mantis/view.php?id=5873
2012-02-04 00:20:27 +00:00
Justin Clark-Casey (justincc)
2b6c5fcb31
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-02-03 23:48:12 +00:00
Justin Clark-Casey (justincc)
312e1457dd
Change SceneObjectSerializer to use common ExternalRepresentationUtils.ExecuteReadProcessors() methods.
...
Adds ability to submit a customized exception message to match logging.
2012-02-03 23:47:01 +00:00
Snoopy Pfeffer
bd9d7484f0
Merge branch 'master' of ssh://snoopy@opensimulator.org/var/git/opensim
2012-02-04 00:39:58 +01:00
Dan Lake
4f8f44d9c3
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-02-03 15:21:37 -08:00
Dan Lake
ea19e50919
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
2012-02-03 15:21:07 -08:00
BlueWall
0742630d81
Merge branch 'master' of /home/opensim/src/opensim
2012-02-03 18:20:26 -05:00
Dan Lake
107cef2b0e
Check for null scene in ScheduleFullUpdate and ScheduleTerseUpdate before triggering events on a potentially null Scene
2012-02-03 15:18:48 -08:00
Justin Clark-Casey (justincc)
ce34b359ad
Extend m_avatars lock in NpcModule.CreateNPC over both creation of NPC scene presence and population of m_avatars.
...
This is required to stop a race where the SensorRepeat module can detect an NPC avatar before m_avatars is populated.
Extending the lock is the easiest to understand solution rather than getting complicated with null checks.
Hopefully resolves http://opensimulator.org/mantis/view.php?id=5872
2012-02-03 23:04:26 +00:00
PixelTomsen
5c545d1d2e
Fix: Covenant changed time not set http://opensimulator.org/mantis/view.php?id=5869
...
Signed-off-by: BlueWall <jamesh@bluewallgroup.com >
2012-02-03 18:02:51 -05:00
Snoopy Pfeffer
83ef13a79a
Changed save oar and save iar parameter -p|--profile to -h|--home, including corresponding RemoteAdmin parameter
2012-02-03 23:53:18 +01:00
Justin Clark-Casey (justincc)
6234264211
Refactor common deserialization processor code to generic method ExternalRepresentationUtils.ExecuteReadProcessors()
2012-02-03 22:45:50 +00:00
Justin Clark-Casey (justincc)
f17066b7bf
Change LandDataSerializer deserialization so that in the future it won't care about extra elements or element order.
...
This brings it into line with other deserializations such as object and will improve future backward compatibility.
2012-02-03 22:21:54 +00:00
Snoopy Pfeffer
1a18948935
Corrected console help texts for "save iar"
2012-02-03 23:04:18 +01:00
Dan Lake
61adf36339
Commenting out new event until I can fix OpenSim tests. Currently, testing objects does not create a Scene or EventManager so triggering events crashes some tests
2012-02-02 18:19:22 -08:00
Dan Lake
ed846f11f1
OpenSim tests do not always create an EventManager so calls to trigger events during tests must check for null EventManager
2012-02-02 18:06:34 -08:00
Dan Lake
3257dbe76d
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-02-02 17:44:11 -08:00
Dan Lake
146d78edfa
ObjectAddedToScene event should be fired when duplicating objects
2012-02-02 17:41:05 -08:00
Dan Lake
ee2b2aadc3
fix line endings
2012-02-02 17:39:05 -08:00
Melanie
76a658324c
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2012-02-03 00:07:23 +00:00
Melanie
574c240202
Fix test failure
2012-02-03 00:05:36 +00:00
Melanie
447a66d660
Replace ParcelAccessEntry with a new struct, LandAccessEntry, which more
...
accurately reflects the data sent by the viewer. Add times bans and the
expiration of timed bans.
Warning: Contains a Migration (and nuts)
2012-02-02 23:40:56 +00:00
Justin Clark-Casey (justincc)
54d473e200
D'oh - we want to call llGetLinkNumberOfSides() in the LSL_Stub, not llGetLinkNumber().
2012-02-02 23:35:16 +00:00
Justin Clark-Casey (justincc)
264c83aec4
Add llGetLinkNumberOfSides to LSL_Stub and ILSL_Api
...
It already existed in LSL_Api but it also needs to exist in these two other places for a script to be able to see it.
Hopefully resolves http://opensimulator.org/mantis/view.php?id=5489
2012-02-02 22:48:36 +00:00
Justin Clark-Casey (justincc)
17df4185ce
Add stress tests for simple object add of 100 prim objects. Add time taken to output (this is unreliable).
2012-02-02 18:42:27 +00:00
Diva Canto
dbf6381e34
OpenID: server connector had a copy-and-paste error that made identity queries fail.
2012-02-02 08:39:23 -08:00
Melanie
567f4c51f8
Improve reliability of script state saving by covering various saving
...
and loading scenarios which resulted in loss of continuity on item ids
2012-02-02 01:52:17 +00:00
Dan Lake
0ce9ad4a56
Add event RegionHeartbeatEnd for modules interested in coordinating activity with region heartbeats
2012-02-01 17:01:28 -08:00
Dan Lake
c10193c72b
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-02-01 16:25:35 -08:00
Melanie
003bd9f1b3
Small optimization to last commit
2012-02-01 10:05:04 +00:00
Melanie
cc1476fc36
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2012-02-01 09:45:42 +00:00
Melanie
241ddd031f
Fix copy/paste errors
2012-02-01 09:45:15 +00:00
Melanie
c08d6df7e1
Prevent a changed attachment that has been saved from being saved again.
2012-02-01 09:38:20 +00:00
Melanie
fcc1fa2c32
Straighten out some attachment mess. Don't save attachment states for HG
...
visitors at all. On Leaving a sim, save only the changed ones. Don't save
all scripted stuff when leaving a sim.
2012-02-01 09:36:14 +00:00
Diva Canto
3d7b5e5e93
HG: This hopefully fixes the HG teleports back home to OSGrid. Looks like Uri.ToString() drops the port when it's port 80.
2012-01-31 22:00:59 -08:00
Justin Clark-Casey (justincc)
99e71222f0
Lay out script status in property per row format, since getting too long for console lines.
2012-02-01 00:27:42 +00:00
Justin Clark-Casey (justincc)
e3680f216e
Add count of events queued for a particular script in "scripts show" console command
2012-02-01 00:17:02 +00:00
Justin Clark-Casey (justincc)
8b3da1bff4
Make script console commands only show for selected region.
2012-02-01 00:10:07 +00:00
Justin Clark-Casey (justincc)
437de6743c
Implement "xengine status" console command to show various xengine stats
2012-02-01 00:07:06 +00:00
Justin Clark-Casey (justincc)
f028dca711
Add "show part uuid" and "show part name" console commands.
...
These commands will display part/prim details for a given uuid or name
The "show object uuid" and "show object name" commands will now only display details for objects (i.e. not child parts in a linkset).
This is for consistency with the "delete object" commands which only delete objects, not parts.
2012-01-31 23:35:13 +00:00
Justin Clark-Casey (justincc)
996cc6097e
Implement "show object name <name>" console command to show details of an object with the given name
2012-01-31 23:21:02 +00:00
Justin Clark-Casey (justincc)
ac7cded080
Get rid of the "no objects found" feedback for now - this doesn't work well if a command is executed over multiple scenes.
2012-01-31 23:06:48 +00:00
Justin Clark-Casey (justincc)
ab89adfaef
Implement "show object uuid <uuid>" console command.
...
This will show details about a part with the given uuid if it's found.
2012-01-31 23:03:39 +00:00
Justin Clark-Casey (justincc)
647b326edc
Add more user feedback if an object isn't found for which delete was requested.
2012-01-31 22:27:05 +00:00
Justin Clark-Casey (justincc)
77b032549e
Add the name of a deleted object to the console output
2012-01-31 22:22:32 +00:00
Justin Clark-Casey (justincc)
e3e38e34c5
If a particular region is selected in the console, only try to delete objects in that region, rather than in every region on the simulator
...
The old wrong behaviour was in place before the command was extracted to a module.
2012-01-31 22:21:10 +00:00
Justin Clark-Casey (justincc)
9bd02b5da1
Move object delete commands into a commands region module, in preparation for adding similar show commands.
2012-01-31 21:57:45 +00:00
Justin Clark-Casey (justincc)
2f84d5397b
minor: remove mono compiler warning
2012-01-31 21:14:09 +00:00
Justin Clark-Casey (justincc)
1505c22995
Use Environment.TickCount & Int32.MaxValue; instead of Util.EnvironmentTickCount(); when producing the threads report to reduce wraparound.
...
This matches the tickcount masking in the thread watchdog.
For some reason, Util.EnvironmentTickCount() masks ticks by 0x3fffffff instead of 0xffffffff
2012-01-31 21:09:26 +00:00
Justin Clark-Casey (justincc)
10b9348071
Remove scene object null check on SceneGraph.AddSceneObject(). Complain explicitly if there's an attempt to add any object with a zero UUID.
...
Callers themselves need to check that they're not attempting to add a null scene object.
2012-01-31 20:30:30 +00:00
Justin Clark-Casey (justincc)
f3780b9eae
Add torture tests to test adding 10,000, 100,000 and 200,000 single prim scene objects.
...
These can be run using the "nant torture" target. They are not part of "nant test" due to their long-run future nature.
Such tests are designed to do some testing of extreme situations and give some feedback on memory usage, etc.
However, data can be inconsistent due to different machine circumstances and virtual machine actions.
This area is under development.
2012-01-31 19:56:37 +00:00
PixelTomsen
a98a146c50
Fix:llSetText - limited text to a maximum of 254 chars
...
mantis: http://opensimulator.org/mantis/view.php?id=5867
Signed-off-by: nebadon <michael@osgrid.org >
2012-01-31 10:17:38 -07:00
Melanie
d2dfa4cfe7
Make parcel sale overlays work. No auction support.
2012-01-31 03:09:44 +00:00
Melanie
fe0975dc24
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2012-01-30 21:39:36 +00:00
Melanie
2b84b6d8b1
Use the requested sim's map, not our own
2012-01-30 21:39:12 +00:00
Justin Clark-Casey (justincc)
dbc039783b
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-01-30 21:34:40 +00:00
Melanie
53c3faac5d
Patch in the rest of the maptile stuff
2012-01-30 21:24:21 +00:00
Melanie
c4cc626dff
Add the needed column in the regions table and a few tweaks.
...
Warning: Contains a Migration
Warning: Cannot guarantee nut free
2012-01-30 20:34:32 +00:00
Melanie
bde2ff5e78
Next step for world map overlays
2012-01-30 20:11:47 +00:00
Melanie
ea16c9f858
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
...
Conflicts:
OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
2012-01-30 19:49:12 +00:00
Melanie
df9c35bc0f
Some plumbing for map overlays
2012-01-30 19:46:55 +00:00
Justin Clark-Casey (justincc)
9d93c4808e
lock SceneObjectGroupsByFullID in SceneGraph.ForEachSOG() to stop failure if SceneObjectGroupsByFullID is updated elsewhere at the same time.
2012-01-30 19:21:58 +00:00
BlueWall
54e6b2402c
Revert "Pickup map overlay tile from RegionSettings.ParcelImageID"
...
This reverts commit 00d1c88c59
2012-01-30 12:39:08 -05:00
BlueWall
00d1c88c59
Pickup map overlay tile from RegionSettings.ParcelImageID
2012-01-30 11:49:22 -05:00
Melanie
3de534896e
Add ParcelImageID to RegionSettings so we can have that overlay.
...
Warning: Contains a Migration.
Warning: May contain nuts.
2012-01-30 16:22:21 +00:00
Garmin Kawaguichi
5e60afe5ed
Fix llEdgeOfWorld functionality - see mantis http://opensimulator.org/mantis/view.php?id=5865
...
Signed-off-by: nebadon <michael@osgrid.org >
2012-01-29 14:41:47 -07:00
PixelTomsen
e8b688b61f
Fix:Get embedded objects in notecard http://opensimulator.org/mantis/view.php?id=2607
...
Signed-off-by: nebadon <michael@osgrid.org >
2012-01-29 12:40:43 -07:00
BlueWall
f7c237c0e1
Merge branch 'master' of /home/opensim/var/repo/opensim into mapwork
2012-01-28 11:35:28 -05:00
BlueWall
ae057a7589
Adding our parcel's generated id to map packets
2012-01-28 10:36:39 -05:00
BlueWall
1a20b60d82
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-01-28 08:47:25 -05:00
Bo Iwu
2e31f12cf4
Send CHANGED_TELEPORT during local TP again - partially revert cf73afec35
...
Signed-off-by: BlueWall <jamesh@bluewallgroup.com >
2012-01-28 08:43:58 -05:00
Justin Clark-Casey (justincc)
2ef9fd05fa
Add an overloaded SceneObjectPart.UpdateTextureEntry(Primitive.TextureEntry texEntry) for region modules
2012-01-28 02:45:13 +00:00
Justin Clark-Casey (justincc)
154ba0124a
Add experimental --publish option to "save oar" so that OARs reloaded to the same grid don't have the publisher as owner.
2012-01-28 02:21:41 +00:00
Justin Clark-Casey (justincc)
088f1213b4
Remove accidental /user postfix from HomeURI in [HGInventoryAccessModule] in GridCommon.ini.example and from SRV_ProfileServerURI in [LoginService] in Robust.HG.ini.example
...
As per http://opensimulator.org/mantis/view.php?id=5852 , confirmed by diva via aiaustin
2012-01-28 01:01:19 +00:00
Justin Clark-Casey (justincc)
e391d6390c
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-01-28 00:44:11 +00:00
Justin Clark-Casey (justincc)
deeb7287a2
Comment out xfer section in Scene.UpdateTaskInventory() which was causing spurious errors and "script saved" messages when script properties were changed.
...
Viewers since at least Linden Lab 1.23 use the script upload capability to save script changes.
It's unknown whether the commented out code was working for very old viewers or not.
Code is commented out to reduce complexity and so that useful error messages don't need to be removed.
If there is a substantial population using extremely old viewers that can't upgrade to a newer version 1 viewer (e.g. 1.23) or similar TPV then this can be revisited.
2012-01-28 00:39:53 +00:00
Melanie
7352aea9ac
Remove IClientAPI from the money module. It was only used to pass in the
...
agent id anyway
2012-01-28 00:18:12 +00:00
Justin Clark-Casey (justincc)
7837c611fb
Add OS_NPC_SENSE_AS_AGENT option to osNpcCreate().
...
This allows NPCs to be sensed as agents by LSL sensors rather than as a specific NPC type (which is currently an OpenSimulator-only extension).
Wiki doc on this and other recent NPC functions will follow soon
2012-01-28 00:00:12 +00:00
Justin Clark-Casey (justincc)
31b87ff07b
Increment LPS script stat for OSSL functions that were not already doing this
2012-01-27 23:24:49 +00:00
Justin Clark-Casey (justincc)
7c1d075a5a
Implement osIsNpc(key npc):integer. This return TRUE if the given key belongs to an NPC in the region. FALSE if not or if the NPC module isn't present.
2012-01-27 23:17:13 +00:00
Justin Clark-Casey (justincc)
abf0dd4250
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-01-27 23:14:34 +00:00
Justin Clark-Casey (justincc)
9939f94f08
Implement osNpcGetOwner(key npc):key. This returns the owner for an 'owned' NPC, the npc's own key for an 'unowned' NPC and NULL_KEY is the input key was not an npc.
...
llGetOwnerKey() could also be extended but this does not allow one to distinguish between an unowned NPC and some other result (e.g. 'no such object' if NULL_KEY is the return.
Also, any future extensions to LSL functions by Linden Lab are unpredictable and OpenSim-specific extensions could clash.
2012-01-27 23:05:48 +00:00
Diva Canto
91ac21b9ec
HG Inventoty: Guard against items not found.
2012-01-26 17:00:58 -08:00
BlueWall
6da82d9805
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-01-26 16:29:39 -05:00
PixelTomsen
616373db16
llManageEstateAccess implementation http://wiki.secondlife.com/wiki/LlManageEstateAccess
...
Signed-off-by: BlueWall <jamesh@bluewallgroup.com >
2012-01-26 16:15:23 -05:00
Melanie
da720ce9be
Support rejecting a teleport if a user is banned in all parcels that have
...
spawn points
2012-01-26 10:21:45 +00:00
BlueWall
a6abecf5fa
Change references from sop to sog and add protection from null ref
...
I had code made additions to the map module that was based on the earlier work that I did before Melanie made improvements. Updating the new code to incorporate the same changes.
2012-01-26 00:33:34 -05:00
Justin Clark-Casey (justincc)
093469c33c
Add basic TestAddScript() regression test
2012-01-26 01:16:03 +00:00
Justin Clark-Casey (justincc)
13d9b64b1d
Re-enable error logging associated with assembly and script loading failure in ScriptInstance.
...
Swallowing exceptions just leads to more mysterious failures later on.
2012-01-26 00:28:51 +00:00
Justin Clark-Casey (justincc)
55c6cbabfd
refactor: change RezScriptFromAgentInventory(), RezNewScript() and AddInventoryItem() to accept an agent id rather than a full IClientAPI.
...
This stops some code having to make spurious client == null checks and reduces regression test complexity.
2012-01-26 00:10:37 +00:00
Justin Clark-Casey (justincc)
8e5502fdc2
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-01-25 23:24:44 +00:00
Justin Clark-Casey (justincc)
2de3a1b9da
refactor: decompose most of RezScript() into RezScriptFromAgentInventory(), RezNewScript() and rename one RezScript() to RezScriptFromPrim()
2012-01-25 23:22:07 +00:00
nebadon
d053625663
Update save oar and save iar help responses to reflect new -h|--home
...
switches which replace -p|--profile ie: "save oar
--home=http://hg.osgrid.org:80 region.oar"
2012-01-25 15:59:07 -07:00
Robert Adams
e9de7e7107
Update BulletSim.dll with some interface changes and tuning (see opensim-libs). Change BSScene to use new interface.
2012-01-25 14:40:38 -08:00
Justin Clark-Casey (justincc)
2e7c1bcfd9
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-01-25 21:26:34 +00:00
Pixel Tomsen
8f53c768f5
llGetParcelMusicURL implementation http://wiki.secondlife.com/wiki/LlGetParcelMusicURL
...
Signed-off-by: BlueWall <jamesh@bluewallgroup.com >
2012-01-25 15:48:38 -05:00
Justin Clark-Casey (justincc)
82c3d0cf89
minor: stop the WebStatsModule logging UPDATE or INSERT every time it updates bin/LocalUserStatistics.db
2012-01-25 20:36:51 +00:00
Justin Clark-Casey (justincc)
e20cf3789b
Serialize calls to ODE Collide() function across OdeScene instances to prevent ODE crashes on simulators running more than one region.
...
It turns out that calls to Collide() are not thread-safe even for objects in different ODE physics worlds due to ODE static caches.
For simulators running multiple regions, not serializing calls from different scene loops will sooner or later cause OpenSim to crash with a native stack trace referencing OBBCollider.
This affects the default OPCODE collider but not GIMPACT. However, GIMPACT fails for other reasons under some current simulator loads.
ODE provides a thread local storage option, but as of ODE r1755 (and r1840) DLLs compiled with this crash OpenSim immediately.
2012-01-25 19:31:50 +00:00
Melanie
7444f3bfad
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
...
Conflicts:
OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
2012-01-25 15:02:54 +00:00
Melanie
f84b69cad1
Change the WorldMapModule to use SOG rather than SOP for the telehub ans
...
cover a potential nullref
2012-01-25 15:00:06 +00:00
BlueWall
959bcfa7f8
Merge branch 'master' of /home/opensim/src/opensim
2012-01-24 21:35:12 -05:00
BlueWall
7c514fe155
Telehub map items displayed
2012-01-24 21:33:11 -05:00
Dan Lake
3d1f43046d
Removed unused delegates in SceneGraph: ObjectDuplicateDelegate, ObjectCreateDelegate, ObjectDeleteDelegate
2012-01-24 17:05:53 -08:00
Justin Clark-Casey (justincc)
2d0412d366
Make errors reported by OpenSim when it halts because it can't find certain config sections or files a bit more user friendly.
2012-01-24 22:35:55 +00:00
Justin Clark-Casey (justincc)
8e0eaa980f
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-01-24 22:16:45 +00:00
Justin Clark-Casey (justincc)
09baa3e679
Comment out asset statistics section from periodic stats as these have not been recorded for a very long time.
...
Some might make a comeback in the future but others are of dubious usefuless for health check purposes, or the complexity of collection outweighs their usefulness.
Some data is available via other means (e.g. "fcache status").
2012-01-24 22:14:21 +00:00
BlueWall
3ae6345f1b
Merge branch 'master' of /home/opensim/src/opensim
2012-01-24 17:14:08 -05:00
BlueWall
dc329202ef
Put Telehubs on the map
2012-01-24 17:11:35 -05:00
Justin Clark-Casey (justincc)
5e445aaf7b
Fix "Abnormal client thread terminations" stat in period CONNECTION STATISTICS to count the number of times clients are disconnected due to ack timeouts.
...
This has been broken for a long period and would only ever show 0.
2012-01-24 22:09:13 +00:00
Justin Clark-Casey (justincc)
ab8956d58f
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-01-24 22:04:28 +00:00
Justin Clark-Casey (justincc)
e8f1e7e96e
Comment out inventory statistics section from periodic stats, since this only contained the now uncollected and irrelevant inventory cache number.
2012-01-24 22:03:30 +00:00
Dan Lake
488fe0ae9c
Removed unused events in SceneGraph: OnObjectCreate, OnObjectRemove, OnObjectDuplicate
2012-01-24 13:41:26 -08:00
Justin Clark-Casey (justincc)
7e76397a26
minor: correct text and usage for "image queues show" reigon console command.
2012-01-24 20:54:35 +00:00
Justin Clark-Casey (justincc)
a704d444f2
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-01-24 20:36:16 +00:00
Justin Clark-Casey (justincc)
8b035dc3c7
Restrict accessible of ODECharacter Shell and Body. Add method doc and some error log lines.
2012-01-24 18:46:24 +00:00
Melanie
855d3a3ba5
Teleport routing, part 1
2012-01-24 04:06:37 +00:00
Melanie
a4977bbe19
Simplify and streamline telehub editing code. Verify rotations and fix
...
spwan point positioning on rotated telehubs.
2012-01-24 02:36:35 +00:00
Melanie
0d2e02efb1
Reverse the spawn point distance vector
2012-01-24 01:30:41 +00:00
Melanie
c0e1784e86
Correct a coordinate to make the viewer like it
2012-01-24 01:18:13 +00:00
Melanie
7bb01a17ee
Add a forgotten parameter
2012-01-24 00:38:00 +00:00
Melanie
87799c1f3d
Change Telehubs to store only the data that is really needed and not
...
additional redundant information.
2012-01-24 00:32:10 +00:00
Melanie
c36c916342
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2012-01-23 21:25:59 +00:00
Melanie
48379e6442
IMPORTANT!!!!! Please READ. DO NOT Use this version or any before it since the
...
Telehub commits! They will eat your babies and corrupt your database while
they munch. DO NOT use anything from the first Telehub commit to this one.
FIRST GOOD COMMIT is the one FOLLOWING this one. You have been warned.
2012-01-23 21:23:55 +00:00
BlueWall
8db64dc77f
Merge branch 'master' of /home/opensim/var/repo/opensim into telehub
2012-01-23 14:54:43 -05:00
BlueWall
6a85abbd14
Add update to Telehub position and rotation before adding SpawnPoints
2012-01-23 14:53:25 -05:00
BlueWall
c1f6478a37
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-01-23 11:10:56 -05:00
BlueWall
0037577814
Merge branch 'telehub'
2012-01-23 11:10:42 -05:00
BlueWall
9cfc43005d
Cleanup
2012-01-23 10:28:18 -05:00
BlueWall
39c9b656c8
Cleanup unused parts, add some error handling
2012-01-23 09:42:15 -05:00
Melanie
f7bd7c5901
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2012-01-22 23:21:35 +00:00
Melanie
7c404375c7
Fix up some parameter naming
2012-01-22 23:20:10 +00:00
BlueWall
d1ef7ee5ca
Add note about setting up test databases
2012-01-22 16:27:49 -05:00
BlueWall
74c1ed77a4
Finish connecting Telehub to database
2012-01-22 14:51:15 -05:00
BlueWall
1cd26ba85e
Hooking up new telehub data to the database
2012-01-22 11:46:16 -05:00
Melanie
24b20f6e4b
Change the key name I missed in last commit
2012-01-22 15:35:14 +00:00
Melanie
68365c20c0
Move Telehub tables and data from EstateSettings to RegionSettings.
...
This is damage control es EstateSettings is not the place this can be put.
EstateSettings is nt unique to a region and therefore would introduce
a hard limit of one telehub per estate, completely shutting off the
option of having SL style telehubs, e.g. one per region. Whole
estate teleport routing can still be implemented id desiresd, this
way all options are open while the other way most options get closed
off.
2012-01-22 11:36:04 +00:00
BlueWall
32d58d6e3e
Telehub Support:
...
Telehub settings now persist to the database and are saved across sim restarts. So-far this only works on MySQL. this is a work in progress, teleport routing is not yet implemented.
2012-01-21 23:26:27 -05:00
BlueWall
590f707c42
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-01-20 23:54:29 -05:00
BlueWall
b6f3de5028
Telehub Support:
...
Support for viewer side of telehub management. Can manupulate Telehubs and SpawnPoints from the viewer estate managemnt tools. This is a work in progress and does not yet persist or affect teleport routing.
2012-01-20 23:50:37 -05:00
Justin Clark-Casey (justincc)
a0fb1e1788
Revert "Change linux, windows and mac ODE libraries to use the GIMPACT collider rather than OPCODE."
...
This reverts commit 4eef6725f4
2012-01-20 17:51:12 +00:00
Justin Clark-Casey (justincc)
ea72428c9d
Allow a viewer UDP image request retry to trigger another asset fetch if an existing fetch hasn't responded before a timeout.
...
This is to stop a high priority image/texture request from blocking the entire download queue if its asset fetch got dropped for some reason.
2012-01-19 23:09:16 +00:00
Justin Clark-Casey (justincc)
d38e2c0c91
Add image not in database test for LLImageManager
2012-01-19 21:57:12 +00:00
Justin Clark-Casey (justincc)
503faaea62
refactor: separate out common parts of LLImageManagerTests
2012-01-19 21:23:40 +00:00
Justin Clark-Casey (justincc)
381f74276b
Add LLImageManager regression test for discard case
2012-01-19 21:14:09 +00:00
Justin Clark-Casey (justincc)
c92a9a6640
Add "image queues clear <first-name> <last-name>" console command
...
This allows a way to manually clear pending image queue requests for debug purposes
2012-01-19 19:49:06 +00:00
Justin Clark-Casey (justincc)
d75899f2d1
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-01-19 19:47:18 +00:00
BlueWall
8f871cca10
Add osGetGridHomeURI function
...
Add osGetHomeURI function to the family of osGetGrid* functions. Returns the SRV_HomeURI setting from the [LoginService] configuration.
2012-01-19 14:21:12 -05:00
Justin Clark-Casey (justincc)
9356963bd3
Add basic request and send image regression tests for LLImageManager
2012-01-19 19:00:11 +00:00
BlueWall
edb2e4c5b3
Change URI to lowercase to match existing
2012-01-19 13:55:53 -05:00
BlueWall
bf9ce4709f
Add fetching of SRV_HomeURI to "/json_grid_info"
...
Make SRV_HomeURI available on the GridInfoService through the "/json_grid_info" URI. This i s mainly to service OSSL, but can be seen externally via the URI.
2012-01-19 13:48:31 -05:00
Dan Lake
e41f23dead
Trigger event when prims are scheduled for an update. This gives modules early access to changed parameters.
2012-01-19 03:06:35 -08:00
Dan Lake
5ced49aaa8
Cleaned up Color and Text parameters in SOP and made LocalFlags public for module access.
2012-01-19 03:03:22 -08:00
Dan Lake
2c6272d11a
Add a version of GetGroupByPrim to Scene which accepts UUID instead of localID
2012-01-19 03:01:37 -08:00
Dan Lake
f8079bcd72
Fixed bugs in earlier commit on custom user parameters in Regions.ini
2012-01-19 02:52:05 -08:00
BlueWall
eea726d74e
RegionReady:
...
Back out some of the oar monitoring for the time being. Need to find a better way to get feedback. Will re-visit this soon.
2012-01-18 20:30:57 -05:00
BlueWall
e7619f7518
Merge branch 'master' of /home/opensim/src/opensim
2012-01-17 22:44:16 -05:00
BlueWall
ba7d8cedec
Add function osGetGridCustom
...
Add function osGetGridCustom to take an argument for the GridInfo kpv to retrieve from the GridInfoService
2012-01-17 22:38:36 -05:00
BlueWall
717656c453
Merge branch 'master' of /home/opensim/src/opensim
2012-01-17 22:10:47 -05:00
BlueWall
9ed9720861
Update osGetGrid**** functions
...
The osGetGrid**** functions will now get the grid settings from the GridInfoService. Set the GridInfoURI in your ./bin/config-include/GridCommon.ini [GridInfo] section.
2012-01-17 22:07:40 -05:00
BlueWall
939d60da59
Merge branch 'master' of /home/opensim/lib/osgrid/opensim
2012-01-17 21:10:31 -05:00
BlueWall
ef5575be1b
Add json handler for GridInfo
2012-01-17 21:09:46 -05:00
Justin Clark-Casey (justincc)
4eef6725f4
Change linux, windows and mac ODE libraries to use the GIMPACT collider rather than OPCODE.
...
As discussed on the opensim-dev mailing list, this is to avoid a demonstrated ODE collider segfault when stress-testing a simulator running more than one region using the bundled pCampbot.exe
As before, the ODE revision used is r1755 - only the collider has changed.
Tests so far reveal little performance change.
However, if noticeable issues do arise, please report on mantis and/or the opensim-dev mailing list.
The previous libraries are temporarily in bin/Physics-previous-ode-libs
These can be copied back to bin if one wants to compare behaviour with the previous libraries.
2012-01-17 20:49:20 +00:00
Melanie
e13a17cc0c
Allow retrival of multiple user records in one operation, analog to presence
2012-01-16 23:09:24 +00:00
Justin Clark-Casey (justincc)
59a0c50d48
Comment out noisy log lines I accidentally included in the nant build target adjustment commit.
...
Left in the method doc.
2012-01-16 23:04:08 +00:00
Justin Clark-Casey (justincc)
82ad9d4e04
Remove monocov and other obsolete nant build targets.
...
monocov was a code coverage attempt 3 years ago which no longer works.
other removed targets have been commented out or unused for a very long time
2012-01-16 22:58:58 +00:00
Mic Bowman
2e4fbe6b17
protect the region ready alerts for loading oarfiles if no post URI is set
2012-01-14 23:43:21 -08:00
nebadon
43173f1b0d
commented out redundant land owner checks for osTeleportAgent there is
...
no need for these checks just use Allow_osTeleportAgent = PARCEL_OWNER
also increased function to severe threat level to make it harder to
accidently enable it for everyone.
2012-01-14 18:36:46 -07:00
Melanie
ec299bfa87
Allow SmtpClients and other SSL users to work with our cert handler installed
2012-01-14 06:03:27 +00:00
Justin Clark-Casey (justincc)
82f0e19349
Extend scripts show command to accept a single item UUID parameter to display one script's status
...
Usage is now scripts show [<script-item-uuid>]
2012-01-14 00:44:19 +00:00
Justin Clark-Casey (justincc)
b5bb559cc0
Register the UrlModule for script engine events OnScriptRemoved and OnObjectRemoved just once in the UrlModule itself, rather than repeatedly for every script.
...
Doing this in every script is unnecessary since the event trigger is parameterized by the item id.
All that would happen is 2000 scripts would trigger 1999 unnecessary calls, and a large number of initialized scripts may eventually trigger a StackOverflowException.
Registration moved to UrlModule so that the handler is registered for all script engine implementations.
This required moving the OnScriptRemoved and OnObjectRemoved events (only used by UrlModule in core) from IScriptEngine to IScriptModule to avoid circular references.
2012-01-14 00:23:11 +00:00
Mic Bowman
a30a02e7ae
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-01-13 14:51:11 -08:00
Mic Bowman
e1a2c44ebe
Cleaned up the LookAt code in SOP and SOG. Added support for incrementally
...
rotating physical objects. This does not use physics. Currently the rate
of change is determined as 1 / (PI * Strength).
2012-01-13 14:48:56 -08:00
BlueWall
cde80125ad
Merge branch 'master' of /home/opensim/src/opensim
2012-01-13 17:16:20 -05:00
Bo Iwu
02d6b033d0
Fix improper code formatting introduced in 6214e6a217
...
Signed-off-by: BlueWall <jamesh@bluewallgroup.com >
2012-01-13 17:10:48 -05:00
Mic Bowman
adea92f8b7
Fix llRotLookAt and llLookAt for non-physical objects. Per conversation
...
with Melanie and Nebadon, SL behavior seems to be that non physical
objects snap to the request rotation.
2012-01-13 11:37:17 -08:00
BlueWall
57ba9ef5ad
Update RegionReadyModule
...
Fix triggering of alerts when rezzing first script to an empty region, add login disable when loading oars.
2012-01-13 11:35:44 -05:00
BlueWall
c5594e839e
Undo some prior work
...
Move some added fuctions out of core into the addon module to keep things clean
2012-01-12 21:19:31 -05:00
BlueWall
acbff305f5
Merge branch 'master' of /home/opensim/var/repo/opensim
2012-01-12 21:06:27 -05:00
BlueWall
d40ec1c346
Move some interfaces to a more apropriate place
2012-01-12 20:49:50 -05:00
Justin Clark-Casey (justincc)
3b59af2225
Change the default osNpcCreate() to create an 'owned' npc rather than an 'unowned' one.
...
An owned NPC is one that only the original creator can manipulate and delete.
An unowned NPC is one that anybody with access to the osNpc* methods and knowledge of the avatar id can manipulate.
This is to correct an oversight I made in the original reimplementation where I mistakenly assumed that avatar IDs could be treated as private.
I am not anticipating that many people were deliberately making use of unowned npcs due to their insecure nature.
If you do need an unowned NPC please call the new overloaded osCreateNpc() function with the option OS_NPC_NOT_OWNED.
2012-01-13 00:03:39 +00:00
Justin Clark-Casey (justincc)
6e7154d55c
Removing osNpcCreateOwned(). Please use osNpcCreate(string user, string name, vector position, string notecard, int options) instead with option OS_NPC_CREATOR_OWNED
...
Please note that correct option name is OS_NPC_CREATOR_OWNED not OS_NPC_CREATE_OWNED as mistakenly put in a previous commit.
2012-01-13 00:00:18 +00:00
Justin Clark-Casey (justincc)
47377f17c6
Add missing assert to confirm owner delete succeeded to the end of TestOsNpcRemoveOwned()
2012-01-12 23:46:43 +00:00
Justin Clark-Casey (justincc)
beab155434
Add api level test for removing an owned npc
2012-01-12 22:35:11 +00:00
Justin Clark-Casey (justincc)
caa207f59f
Add ossl level test for removing an unowned npc
2012-01-12 21:03:54 +00:00
Justin Clark-Casey (justincc)
1ac5aa6808
Add remove test for unowned avatars
2012-01-12 20:47:19 +00:00
Justin Clark-Casey (justincc)
c4972e7734
Add osNpcCreate(string firstname, string lastname, LSL_Vector position, string notecard, int options) variant.
...
This will be documented soon. Options can currently be
OS_NPC_CREATE_OWNED - creates a 'creator owned' avatar that will only respond to osNpc* functions made by scripts owned by the npc creator
OS_NPC_NOT_OWNED - creates an avatar which will respond to any osNpc* functions that a caller has permission to make (through the usual OSSL permission mechanisms).
options is being added to provide better scope for future extensibility without having to add more functions
The original non-options osNpcCreate() function will continue to exist.
2012-01-12 19:37:30 +00:00
Justin Clark-Casey (justincc)
d27dd3714f
Allow all NPCs to show up on sensors as all osNpc* script methods now check for ownership permission before executing.
...
As per #opensim-dev irc discussion.
2012-01-12 19:19:34 +00:00
Justin Clark-Casey (justincc)
ba3491c76e
Add permissions checks for owned avatars to all other osNpc* functions.
...
This is being done outside the npc module since the check is meaningless for region module callers, who can fake any id that they like.
2012-01-12 19:06:46 +00:00
Justin Clark-Casey (justincc)
0a1d61950b
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-01-12 19:03:26 +00:00
Diva Canto
cadd645076
Renamed one var and deleted commented code. No functional changes.
2012-01-12 10:22:52 -08:00
Justin Clark-Casey (justincc)
b47c0d7e51
refactor: Move existing npc owner checks to NPCModule.CheckPermissions() methods and expose on interface for external calls.
2012-01-12 18:14:19 +00:00
Diva Canto
8bdd80abfa
HG: normalize all externalized user ULRs to be the Home URL, i.e. the location of the user's UAS. This corrects an earlier design which had some cases pointing to the profile server. WARNING: CONFIGURATION CHANGES in both the sims (*Common.ini) and the Robust configs (Robust.HG.ini). Please check diff of the example files, but basically all vars that were pointing to profile should point to the UAS instead and should be called HomeURI.
2012-01-12 09:56:35 -08:00
Bo Iwu
6214e6a217
Allow update of stored entries within User Management Module-this is needed for proper work of HG friends.
...
See http://opensimulator.org/mantis/view.php?id=5847
2012-01-12 17:51:13 +00:00
Michelle Argus
34137ed4ea
Correcting ini.example were permissionmodules uses komma instead of space as separator
2012-01-12 12:27:41 -05:00
Justin Clark-Casey (justincc)
38db874755
If deserializing a scene object fails during IAR load then ignore the object rather than halting the IAR load with an exception.
2012-01-11 14:33:26 +00:00
Mic Bowman
5f7e392c7c
Add a check to see if an asset exists before recreating it while
...
loading an archive. This does add an extra roundtrip to the asset
server if loading new assets but it protects against overwriting
(and potentially corrupting) existing assets.
2012-01-10 16:26:01 -08:00
Justin Clark-Casey (justincc)
53fb20880c
minor: Fix wrong column length in image queues report
2012-01-10 22:02:35 +00:00
Justin Clark-Casey (justincc)
5002f06d24
rename "show image queue" to "show image queues" in line with other udp info commands.
...
Eliminate redundant one line methods
2012-01-10 21:36:35 +00:00
Justin Clark-Casey (justincc)
ef074deb52
Add "show image queue <first-name> <last-name>" region console command
...
This is so that we can inspect the image download queue (texture download via udp) for debugging purposes.
2012-01-10 21:30:12 +00:00
BlueWall
a2fe3e2081
Remove DEBUG option
...
Remove DEBUG option from OpenSim.ini.example as it is handled in the console now with "debug teleport"
2012-01-10 15:29:08 -05:00
Diva Canto
ce44f56af9
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-01-10 11:11:08 -08:00
Diva Canto
7b84942f86
HG landing points: this hopefully fixes some confusion that was making HG avies always land in 0,0
2012-01-10 11:10:47 -08:00
Justin Clark-Casey (justincc)
18497cef73
Add avatar names to appearance log messages
2012-01-10 18:54:20 +00:00
Justin Clark-Casey (justincc)
a3bb1a81de
correct very minor typo in "debug scene" help
2012-01-10 18:47:30 +00:00
BlueWall
66783398d0
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-01-10 13:43:42 -05:00
Justin Clark-Casey (justincc)
d67e9916b8
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-01-10 18:42:37 +00:00
BlueWall
3deb52d399
Teleport Debugging
...
Move setting from ini to existing facitilies - thanks justincc
toggle with console command: debug teleport
2012-01-10 13:41:35 -05:00
Justin Clark-Casey (justincc)
d67e8291c8
Add "app find <uuid-or-start-of-uuid>" command to find the appearance using a particular baked texture, if any.
...
This is for debugging to relate texture console entries back to particular users on the simulator end.
2012-01-10 18:41:07 +00:00
Diva Canto
a22d0dcab9
HG Friends: fixed bug introduced by 571efeddb2 (r/17672)
2012-01-10 09:58:53 -08:00
BlueWall
707c8c6f2b
Add some run-time debugging support
...
Add configuration option - DEBUG to enable debugging methods. This is temporary for helping users testing teleport routing be able to report back the data with the test cases. We can remove when finished with this, or leave it if it proves to be useful.
Users: set DEBUG = true in OpenSim.ini to get more information from teleport routing. The default is false. It presently prints the TeleportFlags value.
2012-01-09 18:19:55 -05:00
BlueWall
b3a12167d6
Use our TeleportFlags
...
Switch to our TeleportFlags enum instead of LibOMV because we need to define a type for HG Logins. Also moved some debugging in ScenePresence into a function to make it simpler to enable/disable.
2012-01-09 17:54:35 -05:00
BlueWall
95345521f0
TP Routing debug
...
Fix test to checking against bitfield instead of int
2012-01-09 17:04:34 -05:00
BlueWall
3640afdd95
Fix teleport routing for incoming HG+Owner
...
Incoming HG owner/estate manager, etc. is routed according to the rules defined for teleports within the local grid. Left some commented debugging code inside so we can test other cases. Will remove when tings are settled in.
2012-01-09 14:31:22 -05:00
BlueWall
43145c7f67
Debugging HG teleport routing
...
Add some temporary debugging to the teleport routing to get a better view of what happens when HG jumps are made.
2012-01-09 13:07:02 -05:00
BlueWall
34c42cdab0
Fix HG teleport routing
...
Needed to breakout the ViaHGLogin check to it's own section. For some reason it would not factor in when combined with the other teleport flag types.
2012-01-09 01:37:28 -05:00
Melanie
0e855fea7c
Fix a build break
2012-01-09 01:05:19 +00:00
Melanie
1ebd79e413
Add the HG case to landing point checks
2012-01-09 00:54:59 +00:00
Melanie
44cde8d5c6
Update teleport routing to match Avination
2012-01-08 23:36:49 +00:00
BlueWall
37fc19fae0
Update building instructions
...
a good place to trigger a test on the opensimulator site
2012-01-08 18:21:09 -05:00
BlueWall
fb16d49511
Merge branch 'master' of /home/opensim/src/opensim
2012-01-08 17:56:03 -05:00
BlueWall
266167f5a3
Fix teleport routing
...
Route non-owner avatars according to land settings
2012-01-08 17:41:47 -05:00
Melanie
32eb7ddc37
Fix threat level setting on osNpcPlayAnimation
2012-01-07 18:09:53 +00:00
Melanie
6f19e231b6
Don't try to save a NPCs attachment states on NPC delete
2012-01-07 18:09:45 +00:00
nebadon
58cb7cd084
fix a typo "osNpcCreated" to "osNpcCreate" in OSSL threat level check
2012-01-06 23:07:48 -07:00
Justin Clark-Casey (justincc)
f4231f0628
minor: remove mono compiler warning
2012-01-07 00:32:32 +00:00
Justin Clark-Casey (justincc)
ba163ab05b
Add method doc to SPA.Falling and use automatic private get property
2012-01-07 00:29:55 +00:00
Justin Clark-Casey (justincc)
c5c079f6aa
Fix bug where tapping home to stop falling would stop any avatar movement other than falling again.
...
Addresses http://opensimulator.org/mantis/view.php?id=5839
2012-01-07 00:17:40 +00:00
Melanie
679d155a39
Fix some syntax issues
2012-01-06 23:08:18 +00:00
Melanie
9668992493
Add osNpcPlayAnimation and osNpcStopAnimation which respect ownership as well
2012-01-06 22:59:50 +00:00
Melanie
1cffd8fa03
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2012-01-06 22:36:35 +00:00
Melanie
7518b075b7
Add osNpcCreateOwned to create an owned NPC. Those can be sensed only by the owner, can be destroyed only by the owner and only the owner can save their appearance. Added "NPC" as a flag to llSensor to sense NPCs and exclude them from "AGENT" results.
2012-01-06 22:35:06 +00:00
Justin Clark-Casey (justincc)
3073370d0e
Allow RemoteAdmin to deal with all the different kinds of region id parameter that have been used in different methods.
...
See http://opensimulator.org/mantis/view.php?id=5814
Thanks Michelle Argus!
2012-01-06 22:29:27 +00:00
Justin Clark-Casey (justincc)
9bab43b4d1
eliminate a few tabs from OpenSimDefaults.ini
2012-01-06 21:36:30 +00:00
Justin Clark-Casey (justincc)
5f682b51ec
Add disabled Cap_FetchInventory2 = "" reference to [ClientStack.LindenCaps] in line with all the other ones that are there
2012-01-06 21:29:18 +00:00
John Cochran
ff5a83d192
Fixed llAngleBetween() to allow denormal rotations
2012-01-06 21:14:42 +00:00
Justin Clark-Casey (justincc)
8c445dac67
Add script instruction count back to llRot2Euler. Other minor formatting/doc changes.
2012-01-06 21:12:22 +00:00
John Cochran
eb9bf71726
Replaced llRot2Euler function.
...
The original function suffered from unexpected results due to rounding
errors. An error of only 1 or 2 ulps would cause the code to not detect
a singularity at Y rotation +/- PI/2 and take the non-singularity code
path. The replacement code does not suffer from wildly inaccurate
results at the +/- PI/2 singularity. The check in the code for the
singularity isn't strictly needed, but gives more consistent results
At the singularity, the X and Z rotations add. The if check simply
forces the X rotation to be zero so the entirety of the X+Z rotation is
carried by Z.
Additionally, the test code has been updated to include test cases that
caused the old code to fail. The test algorithm is also updated to
perform a more meaningful test. The original code checked if the values
against expected values. This could fail at +/- PI rotations since a
rotation around an axis by PI causes the identical effect as a rotation
by -PI. The new test code checks that the returned angles can be used
to recreate a quaternion that causes the same rotation.
2012-01-06 21:08:54 +00:00
Justin Clark-Casey (justincc)
7661a0b2a9
Implement the FetchInventory2 capability. This accompanies the existing FetchInventoryDescendents2 capability.
...
Not yet enabled by default. You can enable this by setting Cap_FetchInventory2 = "localhost" in the [ClientStack.LindenCaps] section of OpenSim.ini
Enabling both FetchInventory2 and FetchInventoryDescendents2 improves the situation with properly fetching attachments and hud objects
Probably because viewers are never expecting the odd situation where FetchInventoryDescendents2 is present but not FetchInventory2
However, for some reason attachments and hud objects occasionally fail to appear, though their status is correct in inventory
For attachments, focussing on the avatar makes them appear. Hud objects have to be reattached.
2012-01-06 21:07:34 +00:00
Melanie
f8c15d38a6
If dragging a script that is no copy from prim inventory into agent
...
inventory, stop it first in scene. If deleting from prims, move to trash
rather then making it poof.
2012-01-06 17:43:35 +00:00
Melanie
fbb2a7e90d
Add ThreatLevel.NoAccess to OSSL. This allows to enable OSSL without enabling
...
any methods, even those without threat, automatically. It is for use with
setups wanting to allow only specific methods to specific users.
2012-01-06 17:37:22 +00:00
BlueWall
b06d878790
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-01-05 17:55:24 -05:00
BlueWall
f252161941
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-01-05 17:54:51 -05:00
Justin Clark-Casey (justincc)
b86e7715a8
Improve "j2k decode" command to tell us how many layers and components were decoded, instead of just success/failure
2012-01-05 22:54:33 +00:00
BlueWall
e393b47da8
Merge branch 'new_modules'
2012-01-05 17:54:05 -05:00
BlueWall
2b4edd659f
Adding empty ISearchModule interface
2012-01-05 17:53:03 -05:00
Justin Clark-Casey (justincc)
5ea9740f1b
Add a "j2k decode" region console command that allows a manual request for a JPEG2000 decode of an asset
...
For debugging purposes.
2012-01-05 22:40:49 +00:00
Justin Clark-Casey (justincc)
da0fc3c8f5
Make "show asset" command available simulator side. Actually make the service command be "show asset" instead of "show digest" this time.
...
Last time I accidnetally just changed the usage message.
2012-01-05 21:11:32 +00:00
Justin Clark-Casey (justincc)
f06acc0a85
Add size and temporary information to "show asset" command
2012-01-05 21:05:10 +00:00
Justin Clark-Casey (justincc)
5b160f5b7b
Rename 'show digest' console command to 'show asset'
2012-01-05 20:56:29 +00:00
Justin Clark-Casey (justincc)
7319ba62dd
Move simulator asset info commands to an optional module from the connector. Make them conform with service side commands.
...
This stops them appearing twice when Hypergrid is enabled.
2012-01-05 20:51:49 +00:00
Justin Clark-Casey (justincc)
f2ff6d5186
Move asset commands from AssetService to AssetServerConnector so that we can harmonise the same commands on the simulator side.
...
No functional change.
2012-01-05 20:33:44 +00:00
Justin Clark-Casey (justincc)
50e459d265
recomment log messages I accidentally left uncommented
2012-01-05 19:44:06 +00:00
Justin Clark-Casey (justincc)
c201b54b85
Improve "app rebake" command to return a better message if no uploaded texture ids were available for the rebake request
2012-01-05 19:40:54 +00:00
Justin Clark-Casey (justincc)
da6c816204
Commenting out DataSnapShot message "Registering service discovery capability" for now.
...
Please uncomment if/when needed.
2012-01-05 17:10:38 +00:00
Melanie
2c401b7359
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2012-01-05 08:12:34 +00:00
Melanie
97ba3c9346
Small fix to GetWorldPosition to get closer to Avination sit behavior
2012-01-05 08:11:52 +00:00
Justin Clark-Casey (justincc)
8fb70a2058
Add "appearance rebake" command to ask a specific viewer to rebake textures from the server end.
...
This is not as useful as it sounds, since you can only request rebakes for texture IDs already received.
In other words, if the viewer has never sent the server this information (which happens quite often) then it will have no effect.
Nonetheless, this is useful for diagnostic/debugging purposes.
2012-01-04 22:45:07 +00:00
Justin Clark-Casey (justincc)
0634c38505
Separate out rebake request code from cache validation code AvatarFactoryModule.
...
This allows some logic simplification and allows an external caller to manually request rebakes even if textures are uploaded (future command).
2012-01-04 22:22:46 +00:00
Justin Clark-Casey (justincc)
7e6c84c334
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-01-04 21:41:28 +00:00
Justin Clark-Casey (justincc)
3a64522267
Minor formatting changes and commented out log lines for future debugging of image manager (udp texture fetch). No significant functional changes.
2012-01-04 21:40:15 +00:00
Dan Lake
3a2ac0e2ee
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-01-04 12:01:32 -08:00
Dan Lake
fc391d4b10
Added EventManager.OnRegionStarted which is triggered when Heartbeat is started.
2012-01-04 12:01:18 -08:00
Justin Clark-Casey (justincc)
aa625da6a6
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-01-04 19:53:48 +00:00
Justin Clark-Casey (justincc)
82df5de5cf
Remove the pointless LLClientView.m_imageManager null check.
...
Despite the code comments we never actually null it.
2012-01-04 16:15:05 +00:00
Dan Lake
ecf9824b63
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-01-03 16:52:53 -08:00
Dan Lake
0ab2289cdc
Access to these static methods to serialize objects are useful outside of serializer
2012-01-03 16:52:08 -08:00
Justin Clark-Casey (justincc)
6166a40440
Update C5.dll to version 1.1.1 from 1.1.0
...
C5 is a collections library and can be found at http://www.itu.dk/research/c5/
This is used in the UDP texture (image) sending code.
2012-01-03 20:22:15 +00:00
Justin Clark-Casey (justincc)
983b49c0c8
commented out "Prevented flyoff" log message for now as this becomes problematic with bot testing.
...
Please uncomment if still needed.
2012-01-03 18:25:31 +00:00
Justin Clark-Casey (justincc)
01eacd3a31
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-01-03 18:22:14 +00:00
BlueWall
e78a3913e0
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-01-03 12:22:13 -05:00
BlueWall
2c8e72217e
Merge branch 'new_modules'
2012-01-03 12:20:49 -05:00
BlueWall
6941058824
Profile Updates
...
Update basic profile to use the replaceable interface, making configuration less error-prone. Add support to query avatar's home user account and profile service for regions usng the updated OpenProfileModule with Hypergrid.
2012-01-03 11:10:23 -05:00
Justin Clark-Casey (justincc)
fa79588a20
minor: add missing newlines to pCampbot usage statement
2012-01-03 15:42:36 +00:00
Justin Clark-Casey (justincc)
fac8c25851
Reduce accessibility of some J2KImage/LLImageManager properties and methods to reduce potential code complexity and make code reading easier.
2012-01-02 21:31:42 +00:00
Justin Clark-Casey (justincc)
014a86c26b
Adding commented out log messages and some minor formatting for future bug hunting. No functional changes.
2012-01-02 19:46:30 +00:00
BlueWall
87374274b9
Fix for failed http request status
...
Thanks "sendapatch" for fixes to llHTTPRequest status reporting.
2012-01-01 23:44:46 -05:00
Diva Canto
56dbcae402
Bug fix in map tiles in standalone: the map has been blank since commit 01ae916bad r/17324 (Nov.18, justincc). But the root cause comes from commit 02e54c57c4 Author: Oren Hurvitz Date: 7/22/2011
...
This is a nasty situation. The map tile UUID is, in principle, stored authoritatively in RegionSettings. However, it also needs to be stored in the Grid Service because that's how other sims can retrieve it to send it in Map Blocks to non-V3 viewers. So every time the tile image changes, that change needs to propagate to the Grid Service, and this is done via RegisterRegion (ugh!). Interestingly, this problem didn't affect grids because by default AllowRemoteDelete is false, so the prior images aren't being deleted from the asset servers -- but they were not being correctly updated in the map either, the map was stuck with old images.
2011-12-30 21:32:28 -08:00
Diva Canto
5d8ed077bc
Bring back the Hyperlinker to the Robust console. Moved the config to [GridService]. Changed all HG-related .inis, including HyperSimianGrid. No changes in user-facing inis.
2011-12-30 19:17:35 -08:00
Diva Canto
5aad1f7afe
Default LocalToGrid to true. Fixes minor bug introduced yesterday where old robust UserAccount service would result is LocalToGrid at the sim being false.
2011-12-30 10:40:57 -08:00
Mic Bowman
967ea51980
Set the local grid flag in the user account through the simian connector
...
This should make bi-directional hypergrid work.
2011-12-29 16:37:16 -08:00
Diva Canto
571efeddb2
Added UserManagementModule.IsLocalGridUser(UUID) to be used throughout region Scenes and Modules. Changed existing modules to use it instead of assuming that foreign = null account.
2011-12-29 16:12:06 -08:00
Diva Canto
42f5394677
Added field LocalToGrid in UserAccount. Context: make HG work in Simian.
2011-12-29 15:39:12 -08:00
Diva Canto
98ab3dffa3
Deleted two obsolete files in Inventory modules.
2011-12-29 15:33:04 -08:00
Diva Canto
ef4d989f37
Deleted unused methods from HGAssetBroker
2011-12-29 15:21:56 -08:00
Diva Canto
6974596e83
Fixed mix-up in UserAccount fields when passing UserAccounts remotely.
2011-12-29 12:34:57 -08:00
Diva Canto
b756077269
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-12-29 12:18:22 -08:00
Diva Canto
70e36ee2b4
HG: more adjustments for making HG Simian work. Added server_uri as new key on get_agent_home in UAS.
2011-12-29 12:17:58 -08:00
Melanie
5b52440e61
Introduce a LightShare kill packet ans send it when needed. Currently only
...
understood by AVN v0.3
2011-12-28 09:24:02 +00:00
BlueWall
f36fe45fa7
Add Copy task to Prebuild.exe (vsxxxx targets)
...
<Files>
<Match pattern="*.cs" recurse="true"/>
<Match pattern="../bin/MyConfig.xml" buildAction="Copy" recurse="false" destination="$(OutputPath)" />
</Files>
2011-12-25 00:04:42 -05:00
Diva Canto
b6cfe15c7c
HG: more / love for Xmas
2011-12-24 07:44:26 -08:00
Diva Canto
f9a1fd5748
HG: one more adjustment with trailing /s
2011-12-23 15:08:13 -08:00
Diva Canto
d38b8caf2b
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-12-23 10:58:55 -08:00
Diva Canto
26bb95fe3d
HG: AAdded a few missing /'s at the end of URLs
2011-12-23 10:58:30 -08:00
Mic Bowman
c6ce464dbc
remove the old region crossing handler
2011-12-23 10:13:32 -08:00
Mic Bowman
456c89a7a3
Fixes some problems with objects that attempt to cross a region boundary
...
into a region that does not exist. This is particularly problematic for
physical objects where the velocity continues to move them out of the
region causing an infinite number of failed region crossings. The patch
forces an object that fails a crossing to be non-physical and moves it
back into the starting region.
2011-12-22 16:59:51 -08:00
Mic Bowman
f394cb2e8f
fix the UsesPhysics flag to reference the physics flag rather than the temponrez flag
2011-12-22 16:21:32 -08:00
Mic Bowman
6b08c051a3
Enables processing of hypergrid links through simiangrid services. Thanks
...
otakup0pe
2011-12-22 15:31:51 -08:00
Justin Clark-Casey (justincc)
790ca65c84
Align default ODE_STEPSIZE with that already used through OpenSimDefaults.ini
2011-12-22 20:22:15 +00:00
Justin Clark-Casey (justincc)
7ccd8f8f1d
rename Scene.m_physicalPrim to PhysicalPrims since its public and access external as a property
2011-12-22 19:57:50 +00:00
Justin Clark-Casey (justincc)
f7dbdba447
Remove unused m_physicalPrim parameter from SOG.ApplyPhysics()
2011-12-22 19:52:09 +00:00
Justin Clark-Casey (justincc)
48113f0fc8
Make it possible to force all prims to be phantom via the collidable_prim boolean setting in the OpenSim.ini config [Startup] section.
...
Naturally, default is true.
When set to false, "phantom" flags on prims can be set as usual but all prims remain phantom.
This setting is for test purposes.
This switch does not affect the collision of avatars with the terrain.
2011-12-22 19:44:52 +00:00
Diva Canto
469955889e
Region crossings redone: (1) removed WaitForCallback. Now that we are passing the entire agent with attachs in one big message we don't necessarily need to wait for confirmation. The callback sometimes is problematic and it adds delay to the process. (2) Z velocity sent to the viewer = 0. This is an heuristic; the Z velocity usually is negative, and it makes the viewer move the avie down. This only matters while the agent is in transit and therefore not being physically simulated by neither region. As soon as the receiving region receives CompleteMovement from the viewer, the position and velocity get corrected.
2011-12-22 09:30:06 -08:00
Melanie
7f527814d5
And a typo fix
2011-12-22 16:57:49 +00:00
Melanie
6412349dec
Add a few comments, correct a merge artefact
2011-12-22 16:51:51 +00:00
Melanie
2347593dac
Harmonizing SP with Avination
2011-12-22 16:48:52 +00:00
Diva Canto
219ec7ef20
Fixing a bug introduced yesterday. This put the precondition test inside CheckForBorderCrossing the right way.
2011-12-22 08:18:03 -08:00
Diva Canto
bb0c6a498b
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-12-21 15:17:44 -08:00
Diva Canto
ddff2f246c
Moved an external test into the method that uses those preconditions.
2011-12-21 15:17:26 -08:00
Diva Canto
651f9f47d0
HG: Verify that the user is local
2011-12-21 14:56:38 -08:00
Dan Lake
7693e6a3a8
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-12-20 14:46:44 -08:00
Dan Lake
41b02a7208
Remove unused SetAcceleration and add set on Acceleration parameter
2011-12-20 14:45:32 -08:00
Dan Lake
a1dc4e830d
Remove unused SetAcceleration and add set on Acceleration parameter
2011-12-20 13:40:24 -08:00
Justin Clark-Casey (justincc)
fa0a71253f
Though the viewer warns about receiving this, not sending appears to break baked texture caching when crossing region boundaries.
...
Needs further investigation.
Revert "Stop sending the viewer its own AvatarAppearance packet."
This reverts commit 92039f295d
2011-12-20 18:54:15 +00:00
Diva Canto
dd69c9fd20
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-12-20 09:53:05 -08:00
Diva Canto
25cbba9bca
Fixed bug of avie going under the terrain when crossing regions in certain directions. This was a 1-off bug: the terrain was being placed in 127, 127 resulting in a bounding box if -2, 256. I placed it in 128, 128 resulting in a bounding box of -1, 257.
2011-12-20 09:43:39 -08:00
Justin Clark-Casey (justincc)
87a2d8d51b
Move HandleObjectGroupUpdate() from GroupsModule to Scene.PacketHandlers.cs as this is updating SOG/SOP.GroupID, which is arguably generic.
2011-12-19 23:03:45 +00:00
Justin Clark-Casey (justincc)
92039f295d
Stop sending the viewer its own AvatarAppearance packet.
...
The viewer warns in the log if it receives this.
Stopping this doesn't appear to have adverse effects on viewer 1 or viewer 3 - the viewer gets its own appearance from body parts/clothes and self-baked textures.
2011-12-19 20:13:48 +00:00
Justin Clark-Casey (justincc)
2899de1a5c
Stop unnecessarily sending the TextureEntry in client avatar updates.
...
As far as I know, viewers don't use this mechanism to recieve new TextureEntry data for avatars. This is done via the AvatarAppearance packet instead.
Tested this back to viewer 1.23.
Replacing with Utils.EmptyBytes since converting the texture entry to bytes on each AvatarUpdate (or which there are many) is not cost-free.
2011-12-19 19:19:05 +00:00
Justin Clark-Casey (justincc)
e8fbeeba5f
Fix race condition where the appearance update timer could be stopped just after another thread had started it on QueueAppearanceSave() or *Send()
...
However, the window for this race is very small, and the next queued appearance save or send would restart the timer anyway.
2011-12-19 19:08:24 +00:00
Justin Clark-Casey (justincc)
fc9400db07
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-12-19 19:07:35 +00:00
Justin Clark-Casey (justincc)
0b91ec8dd2
Migrate detailed "appearance show" report generation up to AvatarFactoryModule from AppearanceInfoModule so that it can be used in debug (inactive).
...
Further filters "debug packet <level>" to exclused [Request]ObjectPropertiesFamily if level is below 25.
Adjust some method doc
Minor changes to some logging messages.
2011-12-19 18:58:05 +00:00
nebadon
6baee2e10b
addresses mantis #5827
...
RAdmin - admin_save_oar fails if noassets parameter missing
thanks Michelle Argus
2011-12-19 11:51:03 -07:00
Justin Clark-Casey (justincc)
4d065f0453
Provide user feedback on execution of "backup" region console command
2011-12-17 02:42:43 +00:00
Justin Clark-Casey (justincc)
684482352c
Fix bug where objects couldn't be set back to the "none" group.
...
This is handled by treating UUID.Zero as a special case.
Currently, asking for the "none" group returns nothing because XMLRPC groups, at least, is not properly handling this case.
It may be better in the future to have GroupsModule return an appropriate GroupsData structure instead or require the underlying services to behave appropriately.
This is a further component of http://opensimulator.org/mantis/view.php?id=5588
2011-12-17 02:35:08 +00:00
Justin Clark-Casey (justincc)
f9137c923b
Fix bug where objects could not be set to a new group if the group had been created in that client session, or if no other action has been performed on the object.
...
There were two problems here:
1) On object group update, we looked for the group is the IClientAPI group cache rather than in the groups service. This fails to groups created newly in that session
2) On object group update, we weren't setting the HasGroupChanged flag. This meant that the change was not persisted unless some other action set this flag.
This commit fixes these issues and hopefully addresses http://opensimulator.org/mantis/view.php?id=5588
This commit also moves HandleObjectGroupUpdate() to the GroupsModule from the Scene.PacketHandlers.cs file
2011-12-17 02:23:24 +00:00
Diva Canto
964ec57ffe
Changed the async approach on close child agents. This may improve crossings a little bit.
2011-12-16 17:24:50 -08:00
Diva Canto
99623894c7
Commented a couple of verbose debug messages.
2011-12-16 17:23:30 -08:00
Justin Clark-Casey (justincc)
9b56cc69c1
Add Garmin Kawaguichi to CONTRIBUTORS.txt
2011-12-17 00:29:42 +00:00
Justin Clark-Casey (justincc)
7f019cc196
If a startup simulator script is present, run it after the normal region selection code rather than before.
...
This allows the script to change the selected region without having it immediately undone.
Thanks to Garmin Kawaguichi for this patch.
2011-12-17 00:27:19 +00:00
Justin Clark-Casey (justincc)
4f628849f3
Add more documentation to EstateConnectorString in StandaloneCommon.ini.example
2011-12-17 00:14:48 +00:00
Justin Clark-Casey (justincc)
1bf05fbb1f
refactor: simplify methods in Scene.PacketHandlers.cs by using GetGroupByPrim() rather than retrieving GetEntities() and inspecting the entire list
2011-12-17 00:11:17 +00:00
Justin Clark-Casey (justincc)
a3a17e929e
Stop generating client flags when we send out full object updates.
...
These were entirely unused.
2011-12-16 23:20:12 +00:00
Justin Clark-Casey (justincc)
5c4056660f
Don't pass on ChaneWaterHeight event from EventManager is new water height is less than 0
...
This is to stop bad values and subsequent viewer crashes.
Thanks to Michelle Argus for this patch.
2011-12-16 21:16:01 +00:00
Justin Clark-Casey (justincc)
5d79f857b0
Comment out accidentally left in "Adding physics prim" log message
2011-12-16 20:54:28 +00:00
Justin Clark-Casey (justincc)
a9b39d6e5d
Tunnel [GroupsModule] DebugEnabled setting down into XmlRpcGroupsServicesConnectorModule so that we can record cache misses
2011-12-16 20:53:50 +00:00
Diva Canto
8300bb651e
Sends the consistent child agent position upon creation of the child agent in other regions, as opposed to <128, 128, 70>
2011-12-16 09:33:22 -08:00
Diva Canto
3bf699ad36
No functional changes. Changed the prefix of that log message [CONNECTION BEGIN] to [SCENE] because that's where the message happens.
...
Also changed the instantiation of a vector object to be done only once instead of every time we receive a position update.
2011-12-16 08:59:33 -08:00
Diva Canto
7e4a2d69d5
HG minor bug fix and marked one method obsolete in UAS.
2011-12-16 08:48:29 -08:00
Justin Clark-Casey (justincc)
8013c0d2f5
Stop pointlessly setting the m_colliderarr[] to false in the ODECharacter constructor
2011-12-15 22:33:14 +00:00
Justin Clark-Casey (justincc)
c0ba99e5ad
Stop having to call SetHeight again in ScenePresence.AddToPhysicalScene() when we've already passed size information to the avatar at PhysicsScene.AddAvatar()
...
Eliminate some copypasta for height setting in OdeCharacter
2011-12-15 22:29:36 +00:00
Justin Clark-Casey (justincc)
99570d8ebb
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-12-15 21:59:01 +00:00
Justin Clark-Casey (justincc)
937c06db54
Code cleanup related to ScenePresence.PhysicsActor and OdeScene/OdeCharacter
...
Stop hiding RemoveAvatar failure, add log messages when characters are removed through defects or re-added unexpectedly.
Add commented out log lines for future use.
Use automatic property for PhysicsActor for better code readability and simplicity
2011-12-15 21:57:22 +00:00
nebadon
58ba81ae4e
minor fix to MegaRegions, typo spotted by Ubit!
2011-12-15 10:49:15 -07:00
Justin Clark-Casey (justincc)
6f2d80cc93
minor: add some currently commented log lines for use in debugging
2011-12-14 21:27:47 +00:00
Justin Clark-Casey (justincc)
e830a77860
Simplify some manipulation of _taintedActors in OdeScene
2011-12-14 18:33:44 +00:00
Justin Clark-Casey (justincc)
a110a7bd6a
Eliminate _taintedPrimsH and _taintedPrimsL (and _taintedPrimLock) in favour of just a _taintedPrims HashSet.
...
There's no point maintaining a list because any pending taint operations are all carried out in the same call anyway.
2011-12-14 18:03:25 +00:00
Justin Clark-Casey (justincc)
cec88872ae
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-12-14 17:59:55 +00:00
Justin Clark-Casey (justincc)
84023c8162
Fix off by one bug in objects GrabbingBehaviour of pCampBot.exe
...
Also fix usage message.
2011-12-14 16:43:49 +00:00
Dan Lake
f43e5f92fd
Just adding a comment to SendFullUpdatToClient
2011-12-13 23:34:59 -08:00
Dan Lake
39736e52d8
Reorder clearing of upate schedule on SOP to before sending updates. Fix potential race condition.
2011-12-13 21:37:17 -08:00
Justin Clark-Casey (justincc)
b242ceda1e
In AvatarFactoryModule.SetApperance(), perform ValidateBakedTextureCache() in the same thread rather than on another one.
...
The caller is already an async thread from LLClientView so this doesn't hold up the client.
However, launching on a separate thread does remove the effect of m_setAppearanceLock
This was potentially allowing two different SetAppearance threads to interfere with each other, though this probably rarely happens, if at all.
2011-12-13 20:42:39 +00:00
Justin Clark-Casey (justincc)
3a06640730
Get rid of the 'lolcat' library asset.
...
This was both unused and an invalid jpeg2000 texture from way back in 2008
2011-12-12 21:17:01 +00:00
Justin Clark-Casey (justincc)
4dfd2c7d47
minor: remove pointless comment from OdeScene.cs
2011-12-12 19:31:50 +00:00
Justin Clark-Casey (justincc)
e9b59e7627
Remove long unused libdb_dotNET43.dll
2011-12-12 19:31:12 +00:00
Dan Lake
c34ab0ee66
Cleaned up ScenePresence parameters for Flying, WasFlying, FlyingOld and IsColliding
2011-12-12 02:43:38 -08:00
Dan Lake
3c55d2e776
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-12-12 00:41:53 -08:00
Dan Lake
db8fd1eb9f
Added an option for extra settings within region ini file. Any non-hardcoded key-value string pair can be added per-region and referenced by any part of OpenSim with access to the RegionInfo
2011-12-12 00:21:19 -08:00
nebadon
8ae824ff09
Mantis 5816: osParseJSON Decoding Problems
...
osParseJSON uses hand-crafted decoding that has two issues
* does not seem to handle top-level JSON lists
* does not seem to handle unicode text
thanks otakup0pe!
2011-12-11 23:25:12 -07:00
Melanie
3a91085ac2
Implement handler for TeleportCancel inbound packet
2011-12-10 15:17:34 +00:00
Justin Clark-Casey (justincc)
e88ad5aab9
minor: remove a mono compiler warning
2011-12-09 23:55:54 +00:00
Justin Clark-Casey (justincc)
5f276c3212
Print out one log message for every missing baked texture, rather than two.
2011-12-09 23:54:39 +00:00
Justin Clark-Casey (justincc)
0daa5d8b4d
minor: comment out "unpacked appearance" log mesasge for now
2011-12-09 23:44:34 +00:00
Justin Clark-Casey (justincc)
f24898d049
Comment out ChildAgentDataUpdate.Pack() "Pack data" message for now.
2011-12-09 23:24:52 +00:00
Justin Clark-Casey (justincc)
13b1c8c173
Do some clean up Scene.cs log messages.
...
This prints out both exception message and stacktrace (Exception.ToString()) isn't enough on Windows.
This also uses m_log.*Format() which is more efficient than string concat.
2011-12-09 23:21:54 +00:00
Justin Clark-Casey (justincc)
af3cd00048
Get rid of IScene.PresenceChildStatus() which always had to execute a lookup in favour of IClientAPI.ISceneAgent.IsChildAgent instead.
2011-12-09 23:07:53 +00:00
Justin Clark-Casey (justincc)
fc27806e90
remove some unused fields in ScenePresence
2011-12-09 22:52:54 +00:00
Justin Clark-Casey (justincc)
cb0da425d5
Fix "fix-phantoms" help message. Thanks Garmin Kawaguichi.
2011-12-09 22:41:39 +00:00
Justin Clark-Casey (justincc)
94c242f792
Move client id check in Scene.Inventory.cs:UpdateInventoryItemAsset so that it doesn't trigger an exception if the item hasn't been found.
...
In this situation we will now put out a slightly more meaningful log error message instead.
2011-12-09 22:36:51 +00:00
Justin Clark-Casey (justincc)
4e9f50b878
Add commented log lines to FetchInventoryDescendents2 path for future use.
...
Haven't been able to resolve issue where attachments are removed by the viewer on relog on a localhost
2011-12-09 22:32:28 +00:00
Justin Clark-Casey (justincc)
63fe673af1
Revert "Revert "Stop performing the asset save part of baked texture uploading on the UploadBakedTexture cap asynchronously.""
...
This turned out not to be the upload texture issue.
This reverts commit 8721841fc3
2011-12-08 23:45:53 +00:00
Justin Clark-Casey (justincc)
50eebb5cba
Don't reply with an ack packet if the client is not authorized.
2011-12-08 22:00:59 +00:00
Justin Clark-Casey (justincc)
32d0ef89c6
Extend TestAddClient() to check that the first packet received is an ack packet
2011-12-08 21:45:02 +00:00
Justin Clark-Casey (justincc)
14e407aff3
Add OpenSim.Region.ClientStack.LindenUDP.Tests.dll back into the test suite
2011-12-08 20:55:38 +00:00
Justin Clark-Casey (justincc)
bc13855e64
Reactivate BasicCircuitTests.TestAddClient()
...
This checks that the initial UseCircuitCode packet is handled correctly for a normal client login.
2011-12-08 20:52:34 +00:00
Justin Clark-Casey (justincc)
0e265889dd
Remove unnecessary AgentCircuitData null check from Scene.AddNewClient().
...
The only caller is the LLUDP stack and this has to validate the UDP circuit itself, so we know that it exists.
This allows us to eliminate another null check elsewhere and simplifies the method contract
2011-12-08 19:25:24 +00:00
Justin Clark-Casey (justincc)
55de189752
minor: remove some mono compiler warnings
2011-12-08 18:56:07 +00:00
Justin Clark-Casey (justincc)
54360dd20e
When a client connects to a scene, send other avatar appearance data asynchronously to reduce hold up in the IN UDP packet processing loop.
...
This is already being done for the initial object data send.
2011-12-08 18:39:56 +00:00
Justin Clark-Casey (justincc)
f61e54892f
On a new client circuit, send the initial reply ack to let the client know it's live before sending other data.
...
This means that avatar/appearance data of other avatars and scene objects for a client will be sent after the ack rather than possibly before.
This may stop some avatars appearing grey on login.
This introduces a new OpenSim.Framework.ISceneAgent to accompany the existing OpenSim.Framework.ISceneObject and ISceneEntity
This allows IClientAPI to handle this as it can't reference OpenSim.Region.Framework.Interfaces
2011-12-08 18:34:23 +00:00
Justin Clark-Casey (justincc)
355cde464a
Simplify Scene.AddNewClient()
...
If sp becomes null right after we've checked or created it, then behaviour down the line is going to be wrong anyway.
So instead retain the check/create ScenePresence reference and use this.
2011-12-08 16:10:47 +00:00
Melanie
43732794dd
Remove a left over log output
2011-12-08 05:46:59 +00:00
Justin Clark-Casey (justincc)
dae58e0937
Remove warning in admin_save_oar xmlrpc method where noassets == true was comparing against an object rather than a string
2011-12-07 22:42:05 +00:00
Justin Clark-Casey (justincc)
2b4de8f881
Have admin_load_heighmap and admin_save_heightmap xmlrpcadmin methods return success = true on success rather than false
2011-12-07 22:40:23 +00:00
Justin Clark-Casey (justincc)
fb2f4f158c
Refactor RemoteAdminPlugin so that every xmlrpc method calls a common block of code to do password checks, etc., instead of copy/pasting this code into every method
2011-12-07 22:39:12 +00:00
Justin Clark-Casey (justincc)
eda770e978
Remove unused SceneManager.TryGetAvatarsScene()
...
It makes far more sense anyway to use TryGetRootScenePresence().Scene, in common with the rest of the code
This method could also return any scene for child or root agents, depending in which order the scenes happened to lie in the list
2011-12-07 21:17:13 +00:00
Justin Clark-Casey (justincc)
3d95015686
On an Exception in Scene.RemoveClient(), always remove the client (and SP) structure so that logout on unexpired packets isn't retriggered, causing the same exception
2011-12-07 18:43:48 +00:00
Justin Clark-Casey (justincc)
2b02d3dc84
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-12-07 17:33:06 +00:00
Justin Clark-Casey (justincc)
415b7b7ec4
Implement XMLRPCAdmin command admin_teleport_agent.
...
This allows someone with access to this command on the XMLRPCAdmin interface to teleport an avatar to an arbitrary region and/or position.
2011-12-07 17:31:57 +00:00
BlueWall
33c6067098
Trigger a Jenkins build
2011-12-07 11:21:50 -05:00
BlueWall
0fcd55aff3
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-12-07 10:39:25 -05:00
BlueWall
fd023b317a
Update libomv to 0.9.1
2011-12-07 09:56:15 -05:00
Justin Clark-Casey (justincc)
a8ed185c00
properly lock CapsHandlers.m_capsHandlers
2011-12-07 14:55:01 +00:00
BlueWall
6ec59ee892
Merge branch 'master' of /home/opensim/var/repo/opensim
2011-12-07 07:52:24 -05:00
Justin Clark-Casey (justincc)
e6272b8d56
Stop also adding an ordinary http handler when we set up a poll http handler.
...
It appears that this is entirely unnecessary since the poll http handlers are dealt with on a separate code path.
2011-12-07 12:28:42 +00:00
Justin Clark-Casey (justincc)
8e542cfa03
Stop accidentally setting up the UploadTexture caps handler with the same url for all users
...
This meant that if a user exited the region, the UploadTexture handler would be effectively removed for everyone, causing subsequent failures.
This hopefully resolves the recent UploadTexture LLSD problems
This was a regression in 5640f2e (Thu Dec 1 23:24:15 2011 +0000)
2011-12-06 21:42:56 +00:00
Justin Clark-Casey (justincc)
8721841fc3
Revert "Stop performing the asset save part of baked texture uploading on the UploadBakedTexture cap asynchronously."
...
This is a possible cause of the dramatic upswing in "Unable to upload... No handler registered for LLSD requests..."
Needs more investigation.
This reverts commit 1854c52ea3
2011-12-06 18:37:13 +00:00
Justin Clark-Casey (justincc)
136a6a6e0f
Make "show appearance" a synonym for "appearance show"
2011-12-06 18:36:11 +00:00
Justin Clark-Casey (justincc)
b9a461c5ad
In "appearance show", if a particular avatar is specified, print out texture UUID for each bake type and whether the simulator can find it.
2011-12-06 18:32:27 +00:00
Justin Clark-Casey (justincc)
ec4f217af8
Actually send the avatar data if an individual avatar is specified, rather than accidentally doing nothing
2011-12-06 18:06:29 +00:00
Justin Clark-Casey (justincc)
1b9eb52850
Allow "appearance show" command to take an optional avatar name
2011-12-06 18:03:16 +00:00
Justin Clark-Casey (justincc)
4be85eeaa5
Make it possible to manually send appearance information via the "appearance send" command for a chosen avatar as well as all
2011-12-06 16:42:44 +00:00
Justin Clark-Casey (justincc)
d33d12ba83
Provide feedback as to which avatars are resending appearance informion on "appearance send" console command
2011-12-06 16:07:24 +00:00
Justin Clark-Casey (justincc)
319507f521
Add test for not found response from GetTexture cap handler.
...
Add OpenSim.Region.Capabilities.Handlers.Tests.dll into test suite
2011-12-05 21:04:17 +00:00
Justin Clark-Casey (justincc)
af9ccfa15c
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-12-05 20:50:44 +00:00
Justin Clark-Casey (justincc)
4567555c49
Implement IOSHttpRequest and IOSHttpResponse http interfaces and use instead of OSHttpRequest/OSHttpResponse.
...
This is required for the substitution of different HTTP servers or the newer HttpServer.dll without having to commit to a particular implementation.
This is also required to write regression tests that involve the HTTP layer.
If you need to recompile, all you need to do is replace OSHttpRequest/OSHttpResponse references with IOSHttpRequest/IOSHttpResponse.
2011-12-05 20:44:20 +00:00
BlueWall
2d3dda6db3
Merge branch 'master' of /home/opensim/var/repo/opensim
2011-12-05 15:29:00 -05:00
Melanie
e7cb63fcf7
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2011-12-05 19:01:35 +00:00
Melanie
66f4ce354f
Fix CHANGED_TEXTURE and CHANGED_COLOR.
2011-12-05 19:01:14 +00:00
Justin Clark-Casey (justincc)
37889eb3fa
For the GetTexture capability, if a data range is requested that covers the whole asset length, return HTTP PartialContent instead of NotFound
...
NotFound is obviously wrong, and this change stops viewer 3.2.2 (and v probably earlier) complaining in the log about missing textures that are actually present.
We still return PartialContent even if the range requested is a superset of the data range as per httpd's behaviour
https://issues.apache.org/bugzilla/show_bug.cgi?id=51878
Viewer 3.2.2 and very probably earlier appear happy with this.
Whether fixing this NotFound bug has any practical effect apart from resolve viewer log messages is unknown.
2011-12-05 18:35:03 +00:00
Diva Canto
a2d98c7293
HG: Added HEAD method to Helo service. This is the preferred method, but its wide use will have to wait a few releases. So the sims are still calling GET for now.
2011-12-04 10:10:09 -08:00
Diva Canto
080dfcc9c9
HG: Renamed one method
2011-12-04 08:24:16 -08:00
Justin Clark-Casey (justincc)
a82aea53f8
Split up test SceneHelpers to provide an AddChildScenePresence() call
2011-12-03 19:32:59 +00:00
Justin Clark-Casey (justincc)
a4d82895be
Remove T012_TestAddNeighbourRegion() and T013_TestRemoveNeighbourRegion() since they don't do anything useful.
2011-12-03 19:14:37 +00:00
Justin Clark-Casey (justincc)
3852f05e6e
Extend TestCreateChildScenePresence to make assertions both at CreateAgent stage and then at Scene.AddClient()
2011-12-03 19:10:32 +00:00
Justin Clark-Casey (justincc)
4919c60560
Add beginning of ScenePresenceAgentTests.TestCreateChildScenePresence()
...
This required an option to be added to NullRegionData via ConnectionString for it to act as a non-static instance, so that regression tests (which only load this class once) don't get hopeless confused and complex to compensate.
Normal standalone operation unaffected.
2011-12-03 18:59:54 +00:00
Justin Clark-Casey (justincc)
ced820bd5e
Improve locking in AgentCircuitManager
2011-12-03 16:19:11 +00:00
Justin Clark-Casey (justincc)
c934901a05
Use GetAgentCircuits() to receive a copy of the AgentCircuitsByUUID dictionary rather than AgentCircuitManager.AgentCircuits directly in "show circuits" to avoid enumeration exceptions
2011-12-03 16:11:47 +00:00
Justin Clark-Casey (justincc)
aac3f2d04e
Add agent circuit number checks to TestCloseAgent()
2011-12-03 16:04:11 +00:00
Justin Clark-Casey (justincc)
aba42d8543
Correct SOP.GetNumberOfSides() to return 8 for meshes rather than 7
...
We are returning the actual number of 'sides', not the maximum index number.
Also minor format corrections.
2011-12-03 15:54:06 +00:00
marc
e75bcd4c59
Workaround for mesh to correct the number of faces in GetNumberOfSides(). Meshs are handeled as sculpts but can have up to 8 faces (SL restriction the collada format can handle even more). The patch enables all LSL function that adressing faces to behave correct. Like llGetNumberOfSides(); llSetLinkPrimitiveParamsFast(); llSetPrimitiveParams(); llSetColor();
...
Signed-off-by: marc <mare@sounddog.net >
2011-12-03 15:49:19 +00:00
BlueWall
6541fc08d4
Merge branch 'master' of /home/opensim/var/repo/opensim
2011-12-02 22:46:37 -05:00
Justin Clark-Casey (justincc)
585fc5e79d
Update SP.PhysicsCollisionUpdate() doc.
...
It might be inefficient, but there are collisions every frame if the avatar is walking/standing on the ground or a prim surface
2011-12-03 02:51:17 +00:00
Justin Clark-Casey (justincc)
e26ef8aeca
change misleading login = http://127.0.0.1:9000/ in GridInfoService in Robust.ini.example to 8002
2011-12-03 02:48:16 +00:00
Justin Clark-Casey (justincc)
b66fe3e9ff
Add method doc to SP.PhysicsCollisionUpdate() to make it clear that it's called continuously even where there are no collisions
2011-12-03 02:45:02 +00:00
Justin Clark-Casey (justincc)
a009871827
Add basic TestFlyingAnimation() regression test
2011-12-03 02:39:21 +00:00
Justin Clark-Casey (justincc)
feef1dd732
Stop calling Animator.UpdateMovementAnimations() at the end of HandleAgentUpdate().
...
There's no point doing this if it's being called via PhysicsCollisionUpdate
2011-12-03 02:05:11 +00:00
BlueWall
f144baa9a8
Merge branch 'master' of /home/opensim/var/repo/opensim
2011-12-02 20:53:35 -05:00
Justin Clark-Casey (justincc)
f08aad8a40
For now, disable mechanism to limit avatar animation updates since this causes avatars to never reach the correct animation after some actions.
...
This reverts to situation where animation updates are made each frame on SP.PhysicsCollisionUpdate (though a packet is only sent if the anim actually changes).
m_updateCount was not being update on various avatar state changes, causing the correct animations to never be sent.
Always setting in HandleAgentUpdate() is not enough since the avatar is continually sending AgentUpdate packets.
One would need to identify all the conditions under which animations need to play out and set m_updateCount appropriately in SP.HandleAgentUpdate()
2011-12-03 01:47:12 +00:00
BlueWall
b94ab10922
Merge branch 'master' of /home/opensim/var/repo/opensim
2011-12-02 20:21:35 -05:00
Justin Clark-Casey (justincc)
0ca8491bbe
refactor: Use just ScenePresenceAnimator.CurrentMovementAnimation rather than duplicating it with m_movementAnimation
2011-12-03 00:40:08 +00:00
Justin Clark-Casey (justincc)
5bbfb082dd
Use agent.Animator.CurrentMovementAnimation in llGetAgentInfo() rather than asking for a new determination
2011-12-03 00:33:24 +00:00
Justin Clark-Casey (justincc)
8185ce8b4a
Do a cagent.Anims != null check in SP.CopyFrom()
2011-12-03 00:30:13 +00:00
Justin Clark-Casey (justincc)
5ba8ca5662
Rename ScenePresenceAnimator.GetMovementAnimation() -> DetermineMovementAnimation() for better code readability
2011-12-03 00:27:21 +00:00
Justin Clark-Casey (justincc)
96c191f4fd
Stop SP.HandleAgentUpdate() and PhysicsCollisionUpdate() from being processed if we're dealing with a child ScenePresence.
...
Neither of these can have any effect on child agents
Now leaving warning about trying to set animation on a child agent active. Might temporarily pop up now and again.
2011-12-03 00:09:18 +00:00
BlueWall
21f4ee8a3d
Merge branch 'master' of /home/opensim/var/repo/opensim
2011-12-02 18:57:57 -05:00
Justin Clark-Casey (justincc)
054ebe8878
Stop some places where we're trying to reset animations in child agents where such requests are ignored.
2011-12-02 23:56:01 +00:00
Justin Clark-Casey (justincc)
2a6597f61e
Remove pointless Animator.TrySetMovementAnimation("STAND") in ScenePresnece constructor.
...
Comment was right - it is indeed useless since SP always starts off as child and TrySetMovementAnimation screens out child SP
2011-12-02 22:14:47 +00:00
Justin Clark-Casey (justincc)
1854c52ea3
Stop performing the asset save part of baked texture uploading on the UploadBakedTexture cap asynchronously.
...
This prevents a possible race condition where the client would be told all baked textures had updated before they were in the asset service.
The client would then trigger a set appearance which, after a delay, would send the avatar appearance out to other clients.
The race condition seems unlikely because of this delay but it's still possible.
Might help with grey avatar appearances.
2011-12-01 23:38:25 +00:00
Justin Clark-Casey (justincc)
5460f2e035
refactor: Separate the upload baked texture handler out from BunchOfCaps
2011-12-01 23:24:15 +00:00
BlueWall
e7930b1d0f
Make fix to Nini for null references in some cases.
2011-11-29 22:25:03 -05:00
Justin Clark-Casey (justincc)
2a9c9ae340
Provide more user feedback when "debug http" is set
2011-11-29 21:53:15 +00:00
Justin Clark-Casey (justincc)
fa63054c4f
On "show caps", stop excluding the seed cap but do exclude it elsewhere
2011-11-29 20:37:03 +00:00
Justin Clark-Casey (justincc)
679a5f6c0b
With "debug http 1", show the path with the query string instead of just the path.
...
Also simplifies debug levels to just 0 and 1
2011-11-29 17:26:45 +00:00
Justin Clark-Casey (justincc)
658d02b5e9
Improve some of the debug help messages
2011-11-29 16:56:31 +00:00
Justin Clark-Casey (justincc)
a17f93ff44
minor: remove mono compile warning, a Vector3 can never be null since it's a struct
2011-11-29 16:31:10 +00:00
Justin Clark-Casey (justincc)
d3a46b03bf
tabulate "show caps" output for easier readability
2011-11-29 16:29:11 +00:00
Justin Clark-Casey (justincc)
ff0d020007
Correct mistake in "debug eq" help
2011-11-29 16:18:14 +00:00
Justin Clark-Casey (justincc)
b6b0bc7b32
Add "debug http" command for currently simple extra debug logging of non-event queue inbound http requests to a simulator
2011-11-29 16:15:52 +00:00
BlueWall
19c10c892a
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-11-26 17:20:20 -05:00
BlueWall
ea0fc7b12c
Add missing property to llGetLinkPrimitiveParams
2011-11-26 17:06:28 -05:00
Justin Clark-Casey (justincc)
4efd9a3b7b
When removing an LSL sensor for a script (e.g. through llResetScript() or state change), don't also remove sensors for other scripts in the same prim.
...
Hopefully fixes http://opensimulator.org/mantis/view.php?id=4448 and http://opensimulator.org/mantis/view.php?id=4452
2011-11-26 01:55:36 +00:00
Justin Clark-Casey (justincc)
86cc00aaa8
minor: formatting changes in Scene.PacketHandlers.cs
2011-11-26 01:52:12 +00:00
Justin Clark-Casey (justincc)
46e1bcb6b6
minor: remove mono compiler warning
2011-11-26 01:40:46 +00:00
Justin Clark-Casey (justincc)
bafea2282a
Rip out unused Scene.HandleFetchInventoryDescendentsCAPS().
...
This has been handled by WebFetchInvDescHandler.Fetch() for some time.
2011-11-26 01:39:23 +00:00
Justin Clark-Casey (justincc)
11c19b0d2e
Use the same web fetch handler for every request from every avatar, since it contains no instance code
2011-11-26 00:29:01 +00:00
Justin Clark-Casey (justincc)
c5b636469d
Stop locking the requests coming in to WebFetchInvDecHandler.
...
There's no technical reason for this as the methods are thread safe. However, it might have served to slow down requests.
2011-11-26 00:13:04 +00:00
Justin Clark-Casey (justincc)
95a686dbf5
Fix config so that you can have both WebFetchInventoryDescendents and FetchInvnetoryDescendents2 caps active at once
2011-11-25 23:45:29 +00:00
Justin Clark-Casey (justincc)
5b4fe23f7f
Resolve error where an unknown asset type would cause the fetch inventory descendents cap to fail.
...
Introduced just a few commits ago in 0688861
2011-11-25 23:43:57 +00:00
Justin Clark-Casey (justincc)
676d32974a
Implement the FetchInventoryDescendents2 capability using the same code as WebFetchInventoryDescendents.
...
Enabling this by setting Cap_FetchInventoryDescendents2 = "localhost" in the [ClientStack.LindenCaps] section of OpenSim.ini downloads inventory via http rather than udp in later viewers.
2011-11-25 22:46:42 +00:00
Justin Clark-Casey (justincc)
b785f204ce
remove some mono compiler warnings
2011-11-25 22:19:57 +00:00
Justin Clark-Casey (justincc)
0688861aa7
Use the more extensive Utils.AssetTypeToString()/InventoryTypeToString() conversion rather than the arrays in TaskInventoryItem
2011-11-25 22:15:29 +00:00
Justin Clark-Casey (justincc)
8c82ff16ad
Fix WebFetchInventoryDescendents cap to use Utils.AssetTypeTostring/InventoryTypeToString to convert types to strings
...
These cover a wider range of types.
2011-11-25 21:54:31 +00:00
Justin Clark-Casey (justincc)
0a0aa77cfd
Adding missing CrossBehaviour.cs file to fix build
2011-11-24 22:46:43 +00:00
Justin Clark-Casey (justincc)
8e32ce85a7
Remove bizarre call to PhysicsScene.Simulate(0) in Scene.GetNearestAllowedPosition()
...
At least on ODE, this wasn't doing any harm but there wasn't any point to it either
2011-11-24 22:45:29 +00:00
Justin Clark-Casey (justincc)
2ae5b40ca6
On pCampBot, add bot as a property on behaviours instead of passing it in every time
2011-11-24 22:36:45 +00:00
Justin Clark-Casey (justincc)
cbbd992df4
minor: remove mono compiler warning
2011-11-24 22:11:54 +00:00
Justin Clark-Casey (justincc)
a58f5b2f66
When setting packet level logging via "debug packet", apply to all clients, not just root ones.
...
Also adds scene name and client type (root|child) to logged information.
2011-11-24 22:08:34 +00:00
Justin Clark-Casey (justincc)
0a60e9537f
comment out a noisy log line I accidentally left in from the last commit
2011-11-24 21:30:40 +00:00
Justin Clark-Casey (justincc)
63c137820b
Stop passing a request handler to the initial caps.RegisterHandler in EventQueueGetModule since this is immediatley replaced by a poll server handler.
...
This allows us to comment out a bunch of code and simplify the codebase and readability.
2011-11-24 21:27:35 +00:00
Justin Clark-Casey (justincc)
0174e326e3
Add a "debug eq" console command for debugging.
...
This will log outgoing event queue message names if turned on.
2011-11-24 20:27:11 +00:00
Justin Clark-Casey (justincc)
decabe1181
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-11-24 20:22:17 +00:00
Justin Clark-Casey (justincc)
bdcfd6afee
Add disabled CrossBehaviour to pCampBot, which is designed to cross test bots between neighbouring regions.
...
Not yet enabled since there is a bug where the initial cross will work but all subsequent movements on the receiving simulator appear to fail.
2011-11-24 17:35:33 +00:00
Dan Lake
89b2fb2ff4
Append asset ID to URL for storage requests to allow caching proxies to work with Simian
2011-11-23 16:41:30 -08:00
Dan Lake
5485e3da46
Merge branch 'master' of git://opensimulator.org/git/opensim
2011-11-23 16:11:17 -08:00
Dan Lake
0cb33a5398
Line endings
2011-11-23 16:09:11 -08:00
Justin Clark-Casey (justincc)
ed7ddeecf2
Print out what behaviours are active when pCampBot starts up
2011-11-23 22:18:10 +00:00
Justin Clark-Casey (justincc)
d145750e87
Add teleport behaviour to pCampBot
...
This teleports the bot to any other regions +/- 5 on the x or y axis.
Quite aggressive at the moment since teleports keep occuring at a 1-10secs random interval.
No checking yet to see if teleport was successful.
2011-11-23 22:05:11 +00:00
Justin Clark-Casey (justincc)
1126efdcd0
In pCampbot, change "show status" command to "show bots"
2011-11-23 21:33:54 +00:00
Justin Clark-Casey (justincc)
9ae0641871
Rename Bot.BotManager to Manager
2011-11-23 21:33:10 +00:00
Justin Clark-Casey (justincc)
e9f2a9bddb
get pCampBot to extract nearby and store nearby region information
2011-11-23 21:19:10 +00:00
Justin Clark-Casey (justincc)
617f139aac
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-11-23 21:10:50 +00:00
Justin Clark-Casey (justincc)
e394f83df0
Change random number generator property name in pCampbot
2011-11-23 18:00:41 +00:00
BlueWall
0738fc43e4
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-11-23 10:50:29 -05:00
BlueWall
d4e3a7fe81
Shell Environment Variables in config
...
Adding updated Nini and support to use shell environment variables in OpenSimulator configuration.
Nini @ https://github.com/BlueWall/Nini-Dev
2011-11-23 10:11:47 -05:00
Justin Clark-Casey (justincc)
b56410285b
Log error if we attempt to add/remove an OdeCharacter from the _characters list inappropriately
2011-11-22 22:46:25 +00:00
Justin Clark-Casey (justincc)
ace4324e75
Stop removing actor from the hash maps in OdeScene.RemoveCharacter() since this is now being down in OdeCharacter.DestroyOdeStructures()
2011-11-22 22:37:06 +00:00
Justin Clark-Casey (justincc)
af90b52731
Comment out uncalled OdeScene.UnCombine()
2011-11-22 22:28:46 +00:00
Justin Clark-Casey (justincc)
fcb066cb5f
Comment out unimplemented and uncalled RegionCombinerModule.UnCombineRegion()
2011-11-22 22:23:52 +00:00
Justin Clark-Casey (justincc)
d639f7fdf3
minor: remove mono compiler warning
2011-11-22 22:16:09 +00:00
Justin Clark-Casey (justincc)
b0fe0464af
Stop an exception being thrown and a teleport/border cross failing if the desintation sim has no active script engines.
...
This involves getting IScene.RequestModuleInterfaces() to return an empty array (as was stated in the method doc) rather than an array containing one null entry.
Callers adjusted to stop checking for the list reference being null (which never happened anyway)
2011-11-22 22:13:57 +00:00
Justin Clark-Casey (justincc)
daf99f8c0a
slightly simplify OdeScene.Simulate() by removing bool processtaints, since we can inspect count of taint lists instead.
...
also groups OdeCharacter.CreateOdeStructures() and DestroyOdeStructures() together
2011-11-22 21:51:00 +00:00
Justin Clark-Casey (justincc)
b89c48b1be
Improve the error messages returned if the HelloNeighbour call fails.
...
This is the message a region sends to its neighbours when it comes up
2011-11-21 22:06:43 +00:00
Justin Clark-Casey (justincc)
c4e4a29478
Slightly improve "Unable to space collide" logging message, though I don't think I've ever seen this.
2011-11-21 21:31:26 +00:00
Justin Clark-Casey (justincc)
4ddff7eb0f
Get rid of OdeCharacter != null checks since OdeScene._characters can never contain a null character.
...
Ignoring the ancient code glyphs not to do this....
2011-11-21 21:29:56 +00:00
Justin Clark-Casey (justincc)
82dc7886fc
remove unnecessary OdeScene._activeprims locking. Code is single-threaded
2011-11-21 21:15:15 +00:00
Justin Clark-Casey (justincc)
7480f2fd0e
Restore defects list. In hindsight, the reason for this is becuase we can't remove the character whilst iterating over the list.
...
This commit also removes locking on OdeScene._characters since code is single threaded
2011-11-21 21:04:24 +00:00
Justin Clark-Casey (justincc)
546259b2ff
simplify operation of OdeScene._perloopContact
2011-11-21 20:30:37 +00:00
Justin Clark-Casey (justincc)
25d9001de1
don't bother locking OdeScene._perloopContact in single threaded code
2011-11-21 20:17:36 +00:00
Justin Clark-Casey (justincc)
e33b0fa35b
don't lock OdeScene.contacts since only ever accessed by a single thread
2011-11-21 20:12:04 +00:00
Justin Clark-Casey (justincc)
e67ba0ad06
rename ODECharacter.AvatarGeomAndBodyCreation() -> CreateOdeStructures() to match existing DestroyOdeStructures()
2011-11-21 20:01:34 +00:00
Justin Clark-Casey (justincc)
063f0f5d97
refactor: Eliminate one line ODECharacter.doForce() method for code clarity
2011-11-21 19:58:37 +00:00
Justin Clark-Casey (justincc)
225b925f4e
Comment out calls to OdeScene.waitForSpaceUnlock() since that method does nothing right now
2011-11-21 19:48:31 +00:00
Justin Clark-Casey (justincc)
54789706f4
Reduce complexity of OdeScene.Simulate() by fully removing bad characters at point of detection rather than later on.
2011-11-21 19:45:22 +00:00
Justin Clark-Casey (justincc)
3becda919e
move geom/actor map maintenance into DestroyODEStructures()/AvatarGeomAndBodyCreation().
...
This saves us having to do it separately when a character capsule size is changed
2011-11-21 19:31:29 +00:00
Justin Clark-Casey (justincc)
4faac1f090
When changing avatar size in ODE, remove the old actor from the name and actor maps
2011-11-21 19:06:53 +00:00
Justin Clark-Casey (justincc)
898904d83d
When an ODECharacter is removed (e.g. when an avatar leaves a scene), remove the actor reference in OdeScene.actor_name_map rather than leaving it dangling.
...
This also largely centralizes adds/removes in OdeScene.AddCharacter()/RemoveCharacter()
2011-11-21 18:27:41 +00:00
Justin Clark-Casey (justincc)
cead87005b
Have ODECharacter and ODEPrim both use PhysicsActor.Name instead of maintaining their own properties
2011-11-21 18:06:04 +00:00
Justin Clark-Casey (justincc)
4fdcfd79e4
Actually remove PhysicsActor.SOPDescription this time
2011-11-21 17:55:54 +00:00
Justin Clark-Casey (justincc)
39c1ae2408
Chain SOP constructors together rather than having copy/paste code
2011-11-21 17:55:10 +00:00
Justin Clark-Casey (justincc)
58a1147870
refactor: Make SOP.Description an automatic property
2011-11-21 17:51:38 +00:00
Justin Clark-Casey (justincc)
e0887944a0
Remove unused PhysicsActor.SOPDescription
2011-11-21 17:47:30 +00:00
Justin Clark-Casey (justincc)
4485007fce
Instead of generating a new list for bad characters on every physics pass, keep reusing the same list.
2011-11-21 17:04:54 +00:00
Justin Clark-Casey (justincc)
a94ce3f1df
Move DeleteScriptsOnStartup switch from [Startup] to [XEngine] in OpenSim.ini.example.
...
If anybody was changing this and wondering why there was no effect, this is why.
2011-11-21 15:30:00 +00:00
Justin Clark-Casey (justincc)
2206e2fc96
Remove the "[LOCAL SIMULATION CONNECTOR]: Did not find region {0} for SendCreateChildAgent" message
...
This is misleading since a simulator will call this method before successfully trying remote regions.
Also comments out spammy "[SIMULATION]: Stream handler called" AgentHandlers messages for now.
2011-11-19 01:32:21 +00:00
Justin Clark-Casey (justincc)
726ca72c47
minor: Make HelloNeighbour messages more informative
2011-11-19 01:27:06 +00:00
Justin Clark-Casey (justincc)
10a23a823e
Get rid of the spurious [WEB UTIL] couldn't decode <OpenSim agent 57956c4b-ff2e-4fc1-9995-613c6256cc98>: Invalid character 'O' in input string messages
...
These are just the result of an attempt to canonicalize received messages - it's not important that we constantly log them.
Also finally get the deregister grid service message working properly
2011-11-19 01:16:07 +00:00
Justin Clark-Casey (justincc)
21353de9b7
Enable v2/v3 map tile url setting on robust as default in config
...
This is necessary to see map tiles on v2/v3 viewers and appears to work fine
2011-11-19 00:34:56 +00:00
Justin Clark-Casey (justincc)
b89534ad0a
Remove mono compiler warnings. Fix problem with co-ordinate given in deregister region message
2011-11-19 00:34:13 +00:00
Justin Clark-Casey (justincc)
d05d065d85
Improve some grid region log messages to express regions at co-ordinate (e.g. 1000, 1000) rather than meter positions (256000, 256000)
2011-11-19 00:29:52 +00:00
Justin Clark-Casey (justincc)
7a18078177
improve region deregistration log message
2011-11-19 00:10:29 +00:00
Justin Clark-Casey (justincc)
01ae916bad
Don't register a region twice on both official registration and maptile regeneration.
...
Maptile storage appears orthogonal to region registration
2011-11-19 00:07:34 +00:00
justincc
f72c4bdba5
Replace HttpServer_OpenSim.dll with Oren Hurvitz's patch applied.
...
This will hopefully address mantis 5471, 5694 and 5718.
This code is now in opensim-libs, along with Diva's slightly older patches (which were already applied to the DLLs in the opensim tree).
Thanks Oren!
2011-11-18 22:52:59 +00:00
Justin Clark-Casey (justincc)
9d458fdd7f
Turn the [RegionReady] module on by default and login_disable = true while scripts are loading.
...
From field experience, we know that simulators can be unstable if a user logs in before the scripts have finished loading.
This commit turns login_disable = true in [RegionReady] on by default which prevents this from happening.
If you want the old behaviour, please copy these section from OpenSimDefaults.ini into OpenSim.ini and set login_disable = false
2011-11-18 21:31:23 +00:00
Justin Clark-Casey (justincc)
169387b390
Turn SellEnabled in the [EconomyModule] on by default.
...
This only provides enough functionality to allow operations for no money (e.g. sell for $0).
2011-11-17 23:53:25 +00:00
justincc
6dbe793112
Fix Windows build break
2011-11-17 23:10:58 +00:00
Justin Clark-Casey (justincc)
9c928e9dc6
For TerrainModule.SaveToFile(), don't bother throwing the exception onwards after printing out the error, since this method is invoked by users.
...
Still throwing the exception on the stream method since this invoked programatically
2011-11-17 22:15:46 +00:00
Justin Clark-Casey (justincc)
352672eaf2
Make "terrain save" more friendly by telling the user if we have saved and putting out a useful complaint message if we haven't for some reason
2011-11-17 22:13:32 +00:00
Justin Clark-Casey (justincc)
cacc028835
If the entire simulator is shutting down then don't bother to unload the scripts from the appdomain in XEngine.
...
All the other actions (script state save, etc.) still occur.
This makes shutdown where there are many scripts vastly quicker.
2011-11-17 21:03:08 +00:00
Justin Clark-Casey (justincc)
b6d83e9c0f
Stop OdePrim and OdeCharacter insanely overriding set LocalID to set their own private m_localID property but leaving get to return the then unset PhysicsActor.LocalId!
...
Instead, just have both subclasses use the PhysicsActor.LocalID property.
This restores collision functionality that fell away in 45c7789
2011-11-16 23:01:59 +00:00
Dan Lake
bd01c4a5cb
Call public ForEach instead of using m_entities directly. No semantic changes, just cleanup
2011-11-16 02:33:56 -08:00
Dan Lake
baa65d4a15
In AddNewClient, iterator over copy of entities rather than copying under read lock
2011-11-15 17:09:17 -08:00
Justin Clark-Casey (justincc)
e21949deaf
Comment out the vebose logging on HGFriendsModule.
...
Recent issues in http://opensimulator.org/mantis/view.php?id=5794 were not related to HG friends
2011-11-16 00:26:54 +00:00
Justin Clark-Casey (justincc)
9488b235d1
Fix the build break
2011-11-16 00:10:55 +00:00
Justin Clark-Casey (justincc)
33b1e385ec
Look up a homeURL only when it's not null, in addition to not being string.Empty
2011-11-16 00:01:21 +00:00
Justin Clark-Casey (justincc)
92dff85afb
Enable log message to tell us what type of url is being requested from a user's homeurl
2011-11-15 23:38:24 +00:00
Justin Clark-Casey (justincc)
31ffd5450b
Make tracked per scene thread names conform to the majorirty format.
...
This is <thread-name> (<region-name>)
2011-11-15 23:34:28 +00:00
Justin Clark-Casey (justincc)
aea547cd11
fix build break on UserManagementModule.
...
This also adds time since started to "show threads". Unfortunately these two changes got mixed in.
2011-11-15 23:24:51 +00:00
Justin Clark-Casey (justincc)
5b9fe4497d
Do proper locking of UserManagementModule.m_UserCache when getting.
...
This might help with
[USER AGENT CONNECTOR]: new connector to ()
[USER AGENT CONNECTOR]: Unable to contact remote server for GetServerURLs
[USER AGENT CONNECTOR]: Malformed Uri : Argument cannot be null.
Parameter name: uriString
2011-11-15 23:12:41 +00:00
Justin Clark-Casey (justincc)
29eb3b2eb5
improve formatting of "show threads"
2011-11-15 22:51:12 +00:00
Justin Clark-Casey (justincc)
ccae787d03
send a watchdog heartbeat for a poll worker thread when it's actually run
2011-11-15 22:20:44 +00:00
Justin Clark-Casey (justincc)
122304317c
temporarily increasing logging in HGFriendsModule for debugging
2011-11-15 22:14:31 +00:00
Justin Clark-Casey (justincc)
e11b9dddb6
distinguish between FriendsSimConnector and FriendsServiceConnector in log
2011-11-15 21:51:45 +00:00
Justin Clark-Casey (justincc)
7db38a351c
Add number of milliseconds since last update to "show threads"
2011-11-15 21:49:13 +00:00
Justin Clark-Casey (justincc)
94b1c16398
Dont' bother with a userAgentService != null check right after we've constructed it
2011-11-15 20:37:49 +00:00
Justin Clark-Casey (justincc)
828e4a5b09
Add comments about trying to avoid synchronous work off the EventManager.OnMakeRootAgent event since this is on the critical path for transfer of avatars from one region to another.
2011-11-15 20:26:42 +00:00
Justin Clark-Casey (justincc)
e16d7fe1da
Instead of having scene add/remove collision events directly to the OdeScene collision event dictionary, marshall them via a change dictionary first.
...
This is to avoid a complicated tri-thread deadlock on region crossing for avatars with attachments, where
1) XEngine starting up scripts can lock XEngine.m_Scripts and then try to lock OdeScene._collisionEventPrim while starting up a script due to avatar border crossing
2) An existing collision event will lock OdeScene._collisionEventPrim and then try to lock SP.m_attachments while trying to send the collision event to attachments
3) The avatar still entering the region will lock SP.m_attachments and then try to lock m_Scripts to start more attachment scripts.
2011-11-15 20:02:09 +00:00
Justin Clark-Casey (justincc)
45c7789b54
use a more efficient dictionary in OdeScene._collisionEventPrim rather than a list
2011-11-15 19:42:33 +00:00
Justin Clark-Casey (justincc)
a3c5f76942
Removed unused and mostly commented out SceneCommunicationService methods
...
As far as I can see, the SCS is only now used for informing neighbours of up/down status and possibly sending child agent updates and close requests
2011-11-15 18:16:43 +00:00
Justin Clark-Casey (justincc)
affec18625
Remove prebuild reference to now gone PumaCode.SvnDotNet.dll
2011-11-15 17:40:13 +00:00
Justin Clark-Casey (justincc)
20f26eeb17
Remove unused RegionCommsListener/IRegionCommsListener.
...
All this is now being handled through IEntityTransferModule and SimulationService instead, and has been for some time.
2011-11-15 17:38:55 +00:00
Justin Clark-Casey (justincc)
64784bc0cf
remove SceneCommunicationService.OnAvatarCrossingIntoRegion. This stuff is not being used any more - it's now IEntityTransferModule and SimulationService instead
2011-11-15 17:30:58 +00:00
Justin Clark-Casey (justincc)
430821d837
Rename FetchFriendslist() -> CacheFriends() and RefetchFriends() -> RecacheFriends() to reflect their intended function
2011-11-15 16:12:35 +00:00
Justin Clark-Casey (justincc)
2b5b4ac167
refactor: rename m_NeedsListOfFriends => m_NeedsListOfOnlineFriends to better reflect its actual function
2011-11-15 16:05:08 +00:00
Justin Clark-Casey (justincc)
50803dfe2c
For clients that are entering a simulator from initial login, stop executing FriendsModule.FetchFriendslist() asychronously.
...
Executing this asynchronously allows a race condition where subsequent friends fetches hit a cache that FetchFriendsList() had not yet populated.
Changing this to synchronous may improve issues where a user does not see friends as online even though they are.
I don't believe synchronous is a problem here, but if it is, then a more complicated signalling mechanism is required. Locking the cache isn't sufficient.
2011-11-15 15:57:53 +00:00
Justin Clark-Casey (justincc)
8d0aaa359f
refactor: Don't create a new UUID for passing uuids to client - UUIDs are structs are so not passed by reference (and they're immutable!)
2011-11-15 15:05:10 +00:00
Justin Clark-Casey (justincc)
89632f3ea8
Add test for removing a friendship.
2011-11-14 20:56:56 +00:00
Dan Lake
ed19284d85
Merge branch 'remove-scene-viewer'
2011-11-14 12:37:48 -08:00
Justin Clark-Casey (justincc)
e5ff7f389b
Improved method doc for AddFriend() - it actually does set up a two-way relationship.
...
Rename IFriendsModule.AddFriend() to AddFriendship()
2011-11-14 20:31:16 +00:00
Justin Clark-Casey (justincc)
a64def8b73
minor: remove some mono compiler warnings
2011-11-14 18:16:14 +00:00
Justin Clark-Casey (justincc)
348d15707d
Add test for adding a friend whilst online
2011-11-14 18:08:02 +00:00
Justin Clark-Casey (justincc)
de895ee54a
Add very simple FriendsModuleTests.TestNoFriends()
2011-11-14 17:18:51 +00:00
Justin Clark-Casey (justincc)
ff36a1bc7b
If a friends identifier which is too short is given to HGFriendsModule.GetOnlineFriends() then spit out a warning rather than failing on the String.Substring().
...
This is to progress http://opensimulator.org/mantis/view.php?id=5789
2011-11-14 16:06:06 +00:00
Justin Clark-Casey (justincc)
49ec85ae15
Do a ScenePresence null check in HGMessageTransferModule.SendIMToScene() to stop a NullReferenceException being thrown if an HG IM is sent to a simulator running multiple regions
...
This is an attempt to address http://opensimulator.org/mantis/view.php?id=5791
2011-11-14 15:24:02 +00:00
Dan Lake
5fd1749150
Remove SceneViewer from ScenePresence to reduce quadruple queueing of
...
prim update to only triple queuing. Existing method was:
1. Schedule prim for update, adding to scene update list
2. Update on SOGs during heartbeat queues update onto each SceneViewer
3. Update on SPs during heartbeat queues update onto each IClientAPI
4. ProcessEntityUpdates queues updates into UDP send stack
Now the SceneViewer has been eliminated so updates are scheduled at any
time and then put onto the IClientAPI priority queues immediately during
SceneGraph.UpdateObjectGroups.
2011-11-11 17:16:52 -08:00
Justin Clark-Casey (justincc)
e61ea79c72
doh - correct build break
2011-11-12 00:27:43 +00:00
Justin Clark-Casey (justincc)
f130e1a86f
Add threads to the watchdog thread list before we start them.
...
Hopefully this wil make "WATCHDOG: Asked to update thread ## which is not being monitored" messages." go away.
2011-11-12 00:24:45 +00:00
Justin Clark-Casey (justincc)
25c32061e4
Make log messages on authentication failure more explicit
2011-11-11 23:45:08 +00:00
Justin Clark-Casey (justincc)
6adaf1be74
extract common ScenePresence setup code into Init() method for ScenePresenceSitTests
2011-11-11 23:36:35 +00:00
Justin Clark-Casey (justincc)
84ad23234b
add SP.PhysicsActor checks to other sit/stand tests
2011-11-11 23:33:55 +00:00
Justin Clark-Casey (justincc)
acaf6937c5
add sit and stand on ground test
2011-11-11 23:32:43 +00:00
Justin Clark-Casey (justincc)
a3052e40ad
extract ground sit code into SP.HandleAgentSitOnGround() for consistency with other sitting code.
2011-11-11 23:28:32 +00:00
Justin Clark-Casey (justincc)
6ce3daff94
Pick up the intended ConsolePrompt from [Startup] instead of console_prompt.
...
Addresses http://opensimulator.org/mantis/view.php?id=5786
2011-11-11 23:15:53 +00:00
Justin Clark-Casey (justincc)
2a2cdaa211
As with prim sitting avatars, make an avatar phantom when it sits on the ground and solid again when it stands.
...
This is to avoid http://opensimulator.org/mantis/view.php?id=5783 when a collision with a ground sitting avatar causes that avatar to automatically stand and sometimes not be able to move
A better solution may be to keep gound sitting avatars solid but remove their collision status. However, this requires some physics code work.
2011-11-11 23:10:43 +00:00
Justin Clark-Casey (justincc)
ce8441132e
Restore sending of OutPacket() for object kills removed in commit c7dd7b1.
...
OutPacket() must be called within the m_killRecord lock. Otherwise the following event sequence is possible
1) LLClientView.ProcessEntityUpdates() passes the kill record check for a particular part suspends before OutPacket()
2) Another thread calls LLClientView.SendKillObject() to delete the same part and modifies the kill record
3) The same thread places the kill packet on the Task queue.
4) The earlier thread resumes and places the update packet on the Task queue after the kill packet.
This results in a ghost part in the sim that only goes away after client relog.
This commit also removes the unnecessary m_entityUpdates.SyncRoot locking in SendKillObject.
2011-11-11 22:37:57 +00:00
Justin Clark-Casey (justincc)
2a7f4e0602
remove unncessary IClientAPI parameter from SP.SendSitResponse()
2011-11-11 21:53:00 +00:00
Justin Clark-Casey (justincc)
b1cb4f5b04
As per mailing list last week, remove facility that would automatically move the avatar if prim with no sit target was out of sitting range.
...
Now, no movement occurs.
Note that you can still sit on a prim with an explicit sit target from any distance, as was the case before.
2011-11-11 21:42:58 +00:00
Justin Clark-Casey (justincc)
a658bddbcd
Bump warp sit distance up to 10 meters, as discussed on opensim-dev mailing list last week.
...
This means that if the avatar is within 10 meters of the selected target, it sits on it immediately without walking.
Existing autopilot outside this range will be disabled in a later commit
2011-11-11 19:59:12 +00:00
Justin Clark-Casey (justincc)
01518de0bf
update minimum mono version
2011-11-11 19:43:42 +00:00
Justin Clark-Casey (justincc)
8f4955f6a9
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-11-11 19:40:31 +00:00
Justin Clark-Casey (justincc)
dc200d7bb5
Add new ScenePresenceSitTests with a single sit/stand test
2011-11-11 19:38:36 +00:00
nebadon
ad28238ece
one more jenkins test!
2011-11-10 21:40:11 -07:00
nebadon
84ce0b487b
one more test of jenkins!
2011-11-10 21:31:06 -07:00
nebadon
53528b0372
one more round with leeeeeeeeeeroy jaaaaaaenkins!
2011-11-10 21:22:07 -07:00
nebadon
de24e93a1f
take two on jenkins testing!
2011-11-10 20:58:38 -07:00
nebadon
621fb9aba0
test push to see if sir jenkins responds!
2011-11-10 20:54:33 -07:00
Dan Lake
10e664eedc
Fix compile error from an earlier commit
2011-11-10 17:37:33 -08:00
Dan Lake
7432ca6daf
Merge branch 'master' of git://opensimulator.org/git/opensim
2011-11-10 17:21:49 -08:00
Dan Lake
96c59156a7
In SOP, replaced many references to private members with the public properties
2011-11-10 17:21:37 -08:00
Melanie
a5838cf0a6
Prevent linking objects while they are deeded. On unlinking deeded objects,
...
set LastOwnerID properly so the parts cannot be transferred, circumventing
no trans perms
2011-11-11 00:28:12 +00:00
Melanie
2bd4eaeb19
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2011-11-10 23:43:29 +00:00
Melanie
0daece6f2b
Fix turn left and turn right properly. Works for both built-ins and LSL AOs
2011-11-10 23:42:48 +00:00
Dan Lake
8fbaa10ade
Merge branch 'master' of git://opensimulator.org/git/opensim
2011-11-10 15:23:16 -08:00
Dan Lake
9359293b11
Cleaned UpdatePermissions calls on SOP and SOG to eliminate redundant properties packet sends and so one part is not telling a different part what to do. That should be up to the SOG to manage permissions on its parts and notify clients when one of them changes.
2011-11-10 15:20:21 -08:00
Melanie
f5abae5ac6
Implement nudging support for strafing motion
2011-11-10 23:03:05 +00:00
Justin Clark-Casey (justincc)
c0d280d948
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-11-10 22:58:24 +00:00
Justin Clark-Casey (justincc)
2d4ac6288d
Alter commit 3758306 to allow region name to be substituted within a region console prompt
...
This is to allow broader subsitution in the future. Currently, the only substitions are \R (for region name) and \\ (for a single backslash)
e.g. "Region (\R) " is the current and continuing default prompt
This renames custom_prompt in [Startup] to ConsolePrompt
2011-11-10 22:56:13 +00:00
Dan Lake
f3fea81936
Merge branch 'master' of git://opensimulator.org/git/opensim
2011-11-10 14:09:53 -08:00
Dan Lake
18c625bda6
When updating SOG, a physics taint should not override a full update with a terse update
2011-11-10 14:09:35 -08:00
Justin Clark-Casey (justincc)
b990914ec4
convert tabs from commit 3758306 to spaces
2011-11-10 21:04:12 +00:00
Melanie
444b345cdf
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2011-11-10 20:54:44 +00:00
Melanie
48d2300b8a
Fix misaligned sit animation on scripted sit caused by the default sit
...
animation being run after the scripted one.
2011-11-10 20:54:15 +00:00
Justin Clark-Casey (justincc)
9cba179dff
launch pCampbot shutdown console comand asynchronously
2011-11-10 20:03:36 +00:00
Justin Clark-Casey (justincc)
f31a58bd99
Remove unused index parameter from BotManager.startupBot(). Rename startupBot() => StartBot()
2011-11-10 19:40:45 +00:00
BlueWall
ce4560bf8f
Add GuduleLapointe to list of contributors
...
Thanks for the patches!
2011-11-10 07:26:16 -05:00
GuduleLapointe
37583063ee
Allow custom setting for the console prompt
...
Signed-off-by: BlueWall <jamesh@bluewallgroup.com >
2011-11-10 06:56:32 -05:00
Justin Clark-Casey (justincc)
4f6915bad5
minor: Correct misleading method doc on SOG.UpdateRootRotation()
2011-11-09 21:49:08 +00:00
Justin Clark-Casey (justincc)
bbab7b6b4d
Use IsConnected status to determine whether all pCampBots have disconnected, rather than maintaining a separate count
...
Checking IsConnected is more reliable.
2011-11-09 21:23:23 +00:00
Justin Clark-Casey (justincc)
674b521fdd
In pCampBot, don't try and pull down Primitive faces or sculpts set to null
2011-11-09 20:21:48 +00:00
nebadon
d9b0d7e752
one final attempt and then im giving up on panda!!!!!
2011-11-07 19:03:09 -07:00
nebadon
4f7fe58af8
yet another feeble attempt at understanding panda shmanda!
2011-11-07 18:15:21 -07:00
nebadon
554d2ddc03
another shot at making panda use mono 2.4.3!!
2011-11-07 17:49:05 -07:00
nebadon
5d8205f170
another panda test for good measure!
2011-11-07 17:39:08 -07:00
nebadon
c081d7b7dd
This is a test to make sure new mono is being used with panda!
2011-11-07 17:09:32 -07:00
Justin Clark-Casey (justincc)
7e488cd635
Remove unused avariable in PollServiceRequestManager
2011-11-07 23:24:13 +00:00
Justin Clark-Casey (justincc)
39b967e214
Correct test failure in sit position check of TestSitAndStandWithNoTarget()
...
Curiously, a Vector3.ToString() will not display the last two places of the float. In this case, the failure of
the assertion would confusingly report Expected: <0, 0, 0.8454993> But was: <0, 0, 0.8454993> when actual Z figure is 0.845499337
Should fully address http://opensimulator.org/mantis/view.php?id=5779
2011-11-07 22:53:52 +00:00
Melanie
6d92d65140
That such a trivial change can be so difficult to get right. Fix it this time.
2011-11-07 02:40:35 +00:00
Melanie
e775b3fc47
Fix build break
2011-11-07 02:03:17 +00:00
Melanie
67780b00f0
Fix up failing test to compensate for changed sit target offset
2011-11-06 21:47:12 +00:00
Melanie
559e6e52f5
Make the AsyncSceneObjectDeleter send a list of kills. This will make large
...
marquee-selected deletions of single prims or small link sets nearly
instantaneous
2011-11-06 20:43:49 +00:00
Melanie
c7dd7b13a2
Convert SendKillObject to take a list of uint rather than sending one
...
packet per prim. More to come as we change to make use of this.
2011-11-06 20:38:07 +00:00
Melanie
fa992a020c
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2011-11-06 20:00:47 +00:00
Melanie
0bf757e42b
Allow HG and other scene presences not linked to a user account to function.
2011-11-06 20:00:03 +00:00
Snoopy Pfeffer
927561383e
HUD attachments: Removes some more messages sent to wrong clients.
2011-11-06 17:43:39 +01:00
Snoopy Pfeffer
dfbfc9826a
Damaged assets, especially appearance textures, could crash the region server with a fatal exception.
...
Now, such excpetions are caught by an exception handler and just an error message is shown.
This was the kind of exception causing these fatal server crashes:
APPLICATION EXCEPTION DETECTED: System.UnhandledExceptionEventArgs^M
^M
Exception: System.ArgumentOutOfRangeException: Argument is out of range.
Parameter name: offset exceeds the size of buffer
at System.Net.Sockets.NetworkStream.BeginRead (System.Byte[] buffer, Int32 offset, Int32 size, System.AsyncCallback callback, System.Object state) [0x00000] in <filename unknown>:0
at HttpServer.HttpClientContext.OnReceive (IAsyncResult ar) [0x00000] in <filename unknown>:0 ^M
^M
Application is terminating: True^M
2011-11-06 15:05:19 +01:00
Melanie
bd10d14bbd
Fix build break
2011-11-05 23:12:00 +00:00
Melanie
bbbcdaa462
Remove spammy autopilot debug
2011-11-05 22:54:47 +00:00
Melanie
01b6a4b62e
Remove some left over debug and reverse experimental reordering of ifs
2011-11-05 22:46:45 +00:00
Melanie
4d3926694d
Remove enableprejump config option and associated code as this is now
...
fully functional and cannot be disabled because that would break timings.
2011-11-05 22:43:45 +00:00
Melanie
71388fc02a
Porting the ScenePresenceAnimator from Avination. Jump and fall anims now work
...
properly.
2011-11-05 22:41:00 +00:00
Melanie
ac3254a5f5
Change puvlic m_ variable to a getter property
2011-11-05 21:43:35 +00:00
Melanie
2dc452b4a7
ScenePresence part of the Avination animator fixes.
2011-11-05 21:41:16 +00:00
Melanie
b6df9e9fe4
Chnaging the sit target adjustment to a more precise approximation of SL. Some small
...
fixes ported from Avination. Some white space fixes.
2011-11-05 21:24:36 +00:00
nebadon
e8a8e462ed
add myself to the contributors.txt
2011-11-05 03:03:57 -07:00
nebadon
e182cc198d
Fix avatar height, removes the hip offset hack
...
Author: Mana Janus <mana@mjm-labs.com >
2011-11-05 02:56:52 -07:00
nebadon
4797ed6edd
Multiple lines in welcome message use '\n' in the welcome message to
...
start a new line.
2011-11-05 02:42:21 -07:00
nebadon
f0d2fcfbe9
add Mana Janus and SpotOn3D to contributors.txt last patch was courtesy
...
of Mana Janus I failed to mention that, sorry!
2011-11-05 02:35:19 -07:00
nebadon
e3885625a0
Don't rotate child prims, if only the root prim is rotated.
2011-11-05 02:26:25 -07:00
Justin Clark-Casey (justincc)
cfce2529ad
refactor: In sit code, compare against Vector3.Zero and Quaternion.Identity instead of individual components of a vector/quat
2011-11-05 02:04:48 +00:00
Justin Clark-Casey (justincc)
8105794121
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-11-05 01:42:20 +00:00
Justin Clark-Casey (justincc)
28c4dc9be4
Fix NPC sitting for prims without a sit target.
...
This is to partially address http://opensimulator.org/mantis/view.php?id=5769
We don't need to call SP.HandleAgentSit() again if we are within 10m since the autopilot won't trigger.
By calling it twice, the position of the sitting NPC was wrongly adjusted, ending up near <0,0,0>.
However, this change does mean that NPCs further than 10m away will not attempt to autopilot to the prim, though this code was broken anyway (is actually a different mechanism to normal NPC movmeent).
Hopefully this can be addressed soon.
2011-11-05 01:38:42 +00:00
Melanie
b199aad037
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2011-11-05 00:11:10 +00:00
Melanie
c803ed28c3
Replacing te linking code with the code from Avination. Link sets prims are now
...
numbered properly even when sets are linked to sets.
2011-11-05 00:09:37 +00:00
Justin Clark-Casey (justincc)
f7b8c54c24
Add comment for experimental effect of removing the Thread.Sleep(20) in ODEPrim.changevelocity()
2011-11-04 23:43:17 +00:00
Justin Clark-Casey (justincc)
d7815ace4a
On standup, trigger the changed link script event after the avatar has been fully changed.
...
This was meant to help with the script in http://opensimulator.org/mantis/view.php?id=5772 but it doesn't work.
Probably the event is fired before the physics actor has been set up again for the stood avatar.
Fixing that would be much more complicated, but processing the event last of all seems like a good idea in any case.
2011-11-04 23:24:22 +00:00
Justin Clark-Casey (justincc)
ccca6ba935
Stop llPushObject() from causing problems by adding force via a taint rather than directly.
...
This isn't a perfect solution since there can be a race between the taint processing and taint setting, as force needs to be reset after processing.
Needs careful locking in the future.
2011-11-04 23:12:01 +00:00
Dan Lake
b8d50b10fb
Rename ForEachAvatar back to ForEachScenePresence. The other changes
...
from previous commit which sort out which iterator is used are left
intact. A discussion is needed as to what constitutes an avatar vs a
ScenePresence.
2011-11-03 17:53:51 -07:00
Dan Lake
94dc7d07eb
Renamed ForEachRootScenePresence to ForEachAvatar. Cleaned up calls to
...
the 3 iteration functions so more of them are using the correct
iteration for the action they are performing. The 3 iterators that seem
to fit all actions within OpenSim at this time are:
ForEachAvatar: Perform an action on all avatars (root presences)
ForEachClient: Perform an action on all clients (root or child clients)
ForEachRootClient: Perform an action on all clients that have an avatar
There are still a dozen places or so calling the old
ForEachScenePresence that will take a little more refactoring to
eliminate.
2011-11-03 17:06:08 -07:00
Justin Clark-Casey (justincc)
69a4057135
remove the pointless check of the face texture struct against null in Bot.Objects_NewPrim()
2011-11-03 22:52:14 +00:00
Justin Clark-Casey (justincc)
e4bdf1e78f
actually remove the sleep from PhysicsBehaviour that I shifted to Bot a couple of commits ago
2011-11-03 22:50:40 +00:00
Justin Clark-Casey (justincc)
f26fdbd8da
Rename PhysicsBot => Bot since it doesn't just exercise physics anymore
2011-11-03 22:39:06 +00:00
Justin Clark-Casey (justincc)
ca2c25ece2
Move one of the old physics sleeps out into the main bot loop, so leaving out PhysicsBehaviour doesn't result in continuous other behaviours
2011-11-03 22:35:21 +00:00
Justin Clark-Casey (justincc)
5a67940acc
Add click/grab behaviour to pCampbot, which gets bots to randomly click things.
...
This can be specified on pCampbot.exe by using g in the list of behaviours for the new -behaviours,-b switch
e.g. -b p,g to get both existing physics and grabbing behaviours.
grabbing is primitive, it attempts grabs on random prims whether they're actually signalled as clickable or not.
behaviour is currently primitive overall, behaviours are just executed in a list
2011-11-03 22:31:31 +00:00
Justin Clark-Casey (justincc)
3ea379e4cd
Move PhysicsBehaviour into a spearate behaviours folder
2011-11-03 21:25:27 +00:00
Justin Clark-Casey (justincc)
66c60c56a0
Separate out physics testing actions into a separate PhysicsBehaviour class
2011-11-03 21:16:24 +00:00
Justin Clark-Casey (justincc)
a62ccb5c4c
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-11-03 20:12:10 +00:00
Mic Bowman
40a1eddfd1
Drop the CopyTo parameter from Int32.MaxValue to 4096. This is a buffer size
...
not a target size. Mono 2.10 appears to try to allocate the full buffer which
immediately crashes. Tested on mono 2.6.7 and 2.10.5
2011-11-02 18:55:54 -07:00
Melanie
6b4ae4f30c
Revert "fix CopyTo call that was breaking under mono 2.10"
...
This reverts commit d30971fdc2
2011-11-03 00:23:32 +00:00
Mic Bowman
99a347ee11
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-11-02 17:11:10 -07:00
Mic Bowman
d30971fdc2
fix CopyTo call that was breaking under mono 2.10
2011-11-02 17:10:59 -07:00
Melanie
e746840226
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2011-11-02 23:51:48 +00:00
Melanie
08fcf958c2
Port the Avination offline messaging system to Core
2011-11-02 23:50:47 +00:00
Dan Lake
a724ebacd7
Merge branch 'master' of git://opensimulator.org/git/opensim
2011-11-02 14:59:34 -07:00
Dan Lake
e2c51a977d
Changes UpdateFlag in SOP to an enumeration of NONE, TERSE and FULL.
...
UpdateFlag is now referenced/used only within SOP and SOG. Outsiders are
using ScheduleFullUpdate, ScheduleTerseUpdate or ClearUpdateSchedule on
SOP consistently now. Also started working toward eliminating those
calls to ScheduleFullUpdate, ScheduleTerseUpdate or ClearUpdateSchedule
from outside SOP in favor of just setting properties on SOP and let SOP
decide if an update should be scheduled. This consolidates the update
policy within SOP and the client rather than everywhere that makes
changes to SOP. Some places forget to call update while others call it
multiple times, "just to be sure".
UpdateFlag and Schedule*Update will both be made private shortly.
UpdateFlag is intended to be transient and internal to SOP so it has
been removed from XML serializer for SOPs.
2011-11-02 14:59:00 -07:00
Justin Clark-Casey (justincc)
59232a6ea8
Change default say distance to 20m from 30m, the same as on the big grid. This is to improve the migration of scripts that expect a 20m say distance.
...
If you want to keep a 30m say distance then please set this as the say_distance parameter in the [Chat] section of OpenSim.ini.
2011-11-02 20:05:31 +00:00
Justin Clark-Casey (justincc)
72923134e9
Get some hopefully more useful exception information when OpenJPEG.EncodeFromImage() fails in VectorRender and DynamicTexture modules
2011-11-02 18:40:49 +00:00
Justin Clark-Casey (justincc)
03993d0b14
Fix race condition that would sometimes send or save appearance for the wrong avatar.
...
In AvatarFactoryModule.HandleAppearanceUpdateTimer(), we loop through appearance save and send requests and dispatch via a FireAndForget thread.
If there was more than one request in the save or send queue, then this led to a subtle race condition where the foreach loop would load in the next KeyValuePair before the thread was dispatched.
This gave the thread the wrong avatar ID, leaving some avatar appearance cloudy since appearance data was never sent.
This change loads the fields into local references so that this doesn't happen.
2011-11-02 18:25:03 +00:00
Justin Clark-Casey (justincc)
b6873a7b5d
Catch any exceptions exiting the top of the robust console, as we already do for the main simulator.
...
This prevents issues such as transient mono console problems from crashing the server.
2011-11-02 13:16:02 +00:00
Melanie
c5fb39e21f
Restore the recursive calling of PRIM_LINK_TARGET because the version I made
...
breaks LINK_SET et al.
2011-11-02 12:09:18 +00:00
Melanie
1b9ae3fb51
Some positioning fixes from AVN trunk
2011-11-02 12:02:44 +00:00
Melanie
b9e700b60d
Streamline PRIM_LINK_TARGET, eliminating a recursion and a failure scenario
2011-11-02 11:43:16 +00:00
Dan Lake
7c8bfac11b
Removed redundant SceneContents property from Scene. It's the same as SceneGraph property.
2011-11-01 17:20:12 -07:00
Dan Lake
3bead3eb50
Part 2 of see_into_this_sim_from_neighbor configuration option removal
2011-11-01 17:11:43 -07:00
Dan Lake
4b58d4ff95
Removed see_into_this_sim_from_neighbor configuration option.
2011-11-01 16:51:14 -07:00
Justin Clark-Casey (justincc)
9456a540c5
Add "appearance send" command to allow manual sending of appearance.
2011-11-01 23:23:45 +00:00
Justin Clark-Casey (justincc)
8e2e4c47d9
Add "show status" command to pCambot
2011-11-01 22:09:21 +00:00
Justin Clark-Casey (justincc)
40750b44a0
Listen only for non SimShutdown Network.Disconnect firing so that we don't quite the program before all bots have actually logged off.
2011-11-01 21:47:14 +00:00
Justin Clark-Casey (justincc)
53f3b76a84
get rid of unused m_verbose field
2011-11-01 21:18:28 +00:00
Justin Clark-Casey (justincc)
12bd0ebd34
stop recording the threads on which we happen to start bots. These are pointless since they terminate quickly
2011-11-01 21:15:47 +00:00
Justin Clark-Casey (justincc)
9ef5107157
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-11-01 21:02:03 +00:00
Justin Clark-Casey (justincc)
87ec8a4ecb
Retain a reference to an action thread rather than starting an infinite loop via a timer, so that we can actually abort the action thread on shutdown
2011-11-01 18:36:29 +00:00
Dan Lake
9d214d4903
Merge branch 'master' of git://opensimulator.org/git/opensim
2011-10-31 16:42:50 -07:00
Dan Lake
3c55f3015f
Removed unused show commands from Scene.cs and SceneBase.cs. The show modules command in OpenSim.cs now shows both shared modules and region modules.
2011-10-31 16:42:28 -07:00
Justin Clark-Casey (justincc)
b951c7fb1e
Make bots share a cache so that asset downloads attempts are only made once instead of once for each bot
2011-10-31 23:22:55 +00:00
Justin Clark-Casey (justincc)
210868a832
Remove OpenSim.TestSuite
...
Hasn't been touched since 2009 and wasn't more than another copy of pCampBot
2011-10-31 23:10:10 +00:00
Justin Clark-Casey (justincc)
d366a08ebb
Stop individual bots attempting to download the same asset more than once
2011-10-31 22:52:49 +00:00
Justin Clark-Casey (justincc)
0c6509098a
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-10-31 22:27:35 +00:00
Justin Clark-Casey (justincc)
43e07efbc8
Fix bot disconnection
2011-10-31 22:27:12 +00:00
Dan Lake
3a2dcc7298
Merge branch 'master' of git://opensimulator.org/git/opensim
2011-10-31 15:21:39 -07:00
Dan Lake
d3153f47fa
Adding green dots to map response should be for root agents only
2011-10-31 15:20:57 -07:00
Justin Clark-Casey (justincc)
b1647f6d04
adjust pCampbot so it starts up bots with the name format "<firstname> <lastname>_<bot-number>"
...
e.g. starting up two bots called "Ima Bot" will give them the names "Ima Bot_0" and "Ima Bot_1"
This is necessary since bots with random names can no longer be created, as there's no easy way to turn off account authentication
2011-10-31 22:14:49 +00:00
Justin Clark-Casey (justincc)
74cc834fec
Remove unused PumaCode.SvnDotNet library
2011-10-31 21:37:35 +00:00
Justin Clark-Casey (justincc)
e3f51df3c2
Stop pCampbot from firing connected event twice, which results in double counting.
2011-10-31 21:33:25 +00:00
Melanie
a9a24062a5
Plug a security hole in the inventory service
2011-10-31 11:11:36 +00:00
Dan Lake
14646f2524
Fix line endings
2011-10-30 23:43:17 -07:00
Dan Lake
a85ff884d9
Experimental reorder of Heartbeat loop now simulates physics and sends updates to clients prior to sleep. Existing behavior was to sleep BEFORE sending updates. We found this patch reduced latency to clients by 1-2 heartbeat periods.
2011-10-30 23:39:39 -07:00
Justin Clark-Casey (justincc)
9bdf118e0d
Add missing max_listens_per_region to [LL_Functions] config section in OpenSimDefaults.ini + explanation.
...
This setting controls the maximum number of listeners in a region
2011-10-29 02:45:50 +01:00
Justin Clark-Casey (justincc)
6d97545b6b
Remove the SyncRoot locking from Scene which was only being done around the main physics loop and ScenePresence position and velocity setting
...
This is no longer necessary with ODECharacter taints (ODEPrim was already not taking part in this). BSCharacter was already tainting.
2011-10-29 02:42:53 +01:00
Justin Clark-Casey (justincc)
9fdd1753fa
Add taint target velocity for ODECharacters as is already done for ODECharacter position and position and velocity for ODEPrims.
...
This is to help stop surprises if the velocity is set in the middle of physics calculations, though this probably isn't a huge problem.
It's more for consistency and for the next step of removing some scene locks
2011-10-29 02:30:33 +01:00
Justin Clark-Casey (justincc)
ef8370fb8e
tidy up OdeCharacter so that we just use OpenMetaverse.Vector3 assignment directly where possible, instead of transferring X, Y and Z components separately
...
some of this is probably a hold over from using ODE.Vector3, which is still necessary in some places.
2011-10-29 02:07:28 +01:00
Justin Clark-Casey (justincc)
a5ea9f8830
Move position set from taint to logically better position at top of ODECharacter.ProcessTaints() though this makes no practical difference
2011-10-29 01:46:22 +01:00
Justin Clark-Casey (justincc)
5ae8de3c00
Stop setting _position as well as m_taint_position in ODECharacter.Position
...
setting position at the same time as taint appears to undermine the whole purpose of taint
testing doesn't reveal any obvious regressions in doing this
2011-10-29 01:39:48 +01:00
Justin Clark-Casey (justincc)
61e97ee4c8
Remove completely unused SOG.Rotation parameter
...
We always use SOP.Rotation instead
2011-10-29 00:39:01 +01:00
Justin Clark-Casey (justincc)
c2da1c4580
set grp.RootPart.GroupPosition for code consistency (and readability) rather than calling SOP.OffsetForNewRegion
2011-10-28 23:43:31 +01:00
Justin Clark-Casey (justincc)
9bf8c3e7b7
Add missing doc to rotation/position methods in SOG
2011-10-28 23:38:57 +01:00
Justin Clark-Casey (justincc)
0fe756e42c
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-10-28 23:16:46 +01:00
Justin Clark-Casey (justincc)
7b46506822
fetch SOP.RotationOffset once in UpdateRotation() and compare rather than fetch four separate times.
...
No functional change.
2011-10-28 23:15:51 +01:00
Dan Lake
272bf71279
Removed use of 'is' operator and casting to find the root ScenePresence in MessageTransfer modules and Groups module.
2011-10-27 02:26:37 -07:00
Dan Lake
06577d7299
Continuation of previous checkin. Found more places where ForEachScenePresence can be changed to ForEachRootScenePresence.
2011-10-27 01:25:12 -07:00
Dan Lake
b98613091c
Added new ForEachRootScenePresence to Scene since almost every delegate passed to ForEachScenePresence checks for !IsChildAgent first. It consolidates child and root handling for coming refactors.
2011-10-27 00:42:21 -07:00
Justin Clark-Casey (justincc)
40bee97015
For now, comment out error message on new script engine console commands.
...
This causes false positives if a simulator has more than 1 region and the current region is 'root' since this sends the command separately to each region and each region has its own XEngine
2011-10-27 03:01:27 +01:00
Justin Clark-Casey (justincc)
76c50d23f2
Comment out inventory folder bulk update code on InventoryAccepted message introduced in commit db91044 on Aug 22 2011
...
This should be unecessary since the folder update is already made at the time of the offer (and moved to trash if not accepted).
This code was also not taking into account the situation where an item was accepted.
Needs more fixing if this results in an aggression elsewhere.
2011-10-27 02:56:08 +01:00
Justin Clark-Casey (justincc)
e210d95821
Don't blow our brains out if LLClientView.BulkInventoryUpdate() is wrongly passed a null node reference.
...
Addresses worst aspect of http://opensimulator.org/mantis/view.php?id=5752
2011-10-27 02:50:58 +01:00
Justin Clark-Casey (justincc)
2db6a8ce8f
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-10-27 02:06:59 +01:00
Justin Clark-Casey (justincc)
820242bc49
Fix a bug I introduced yesterday in ODE physics where prim scripts would only receive the very first collision.
2011-10-27 02:05:59 +01:00
BlueWall
4a472b74c7
Merge branch 'master' of /home/opensim/var/repo/opensim
2011-10-26 10:38:21 -04:00
Michelle Argus
41395d5443
Added optional owner classes to existing OSSL agent Permissions
...
PARCEL_GROUP, PARCEL_OWNER, ESTATE_MANAGER and REGION_OWNER can be combined with the existing agent uuid option to limit ossl functions to agents and owner classes.
Signed-off-by: BlueWall <jamesh@bluewallgroup.com >
2011-10-26 10:35:50 -04:00
BlueWall
ae8786ea6b
Merge branch 'master' of /home/opensim/src/OpenSim
2011-10-26 08:48:46 -04:00
SignpostMarv Martin
9a28e7a4e0
Implementation of PRIM_OMEGA, but only for setting
...
Signed-off-by: BlueWall <jamesh@bluewallgroup.com >
2011-10-26 08:41:07 -04:00
BlueWall
66bdd20628
Add some things to .gitignore to make the status cleaner
2011-10-26 08:33:17 -04:00
SignpostMarv Martin
059f4b6a3a
Implementing PRIM_LINK_TARGET, but only for setting params
...
Signed-off-by: BlueWall <jamesh@bluewallgroup.com >
2011-10-26 07:47:44 -04:00
Justin Clark-Casey (justincc)
c275c22928
Restart the event queue worker threads that I accidentally disabled earlier today in 8a0a78c.
...
Also adds these to the watchdogs with very large timeouts (should really be infinite)
2011-10-25 23:26:21 +01:00
Justin Clark-Casey (justincc)
182908d216
In Watchdog, add ability to specific timeout for a thread.
...
This also changes the point of registration to the StartThread() call rather than the first Update()
2011-10-25 23:16:01 +01:00
Justin Clark-Casey (justincc)
e549f2f443
Add m_threads dictionary locking to Watchdog.GetThreads()
2011-10-25 22:51:23 +01:00
Justin Clark-Casey (justincc)
6a74a4c12b
Clear OdeCharacter CollisionEventUpdate when we subscribe or unsubscribe from collision events
2011-10-25 22:46:42 +01:00
Justin Clark-Casey (justincc)
0f83f87233
Remove unused fields from CollisionEventUpdate
2011-10-25 22:39:08 +01:00
Justin Clark-Casey (justincc)
c825c9a945
Get rid of the pointless null checks on collision listeners. Add warning about synchronicity for PhysicsActor.OnCollisionUpdate event doc
2011-10-25 22:35:00 +01:00
Justin Clark-Casey (justincc)
b9f106f484
When sending object collision updates, don't null out and recreate the CollisionEventUpdate() if the number of collisions falls to zero. Reuse the existing one instead.
2011-10-25 22:28:40 +01:00
Justin Clark-Casey (justincc)
5d37f0471e
For ScenePresence collision events, instead of creating a new CollisionEventsThisFrame every time we need to send some new ones, reuse the existing one instead.
...
This assumes that the listener is using the data synchronously, which is currently the case.
2011-10-25 22:19:17 +01:00
Justin Clark-Casey (justincc)
7b6b36cee9
Fix bug where collision event listeners were not removed once the listener had gone away.
...
This was causing continuous use of temporary memory even when all avatars had left the scene.
Memory does leak but it does cause more calls to the garbage collector, which would pause the scene thread for a very short while during collection.
2011-10-25 21:40:51 +01:00
Justin Clark-Casey (justincc)
1fbb379536
minor: rename a parameter in OdeScene.Simulate() from actor -> prim since it's an OdePrim
2011-10-25 21:15:37 +01:00
Justin Clark-Casey (justincc)
ee4c4e5058
Add new LindenCaps test dll to panda run as well as "nant test"
2011-10-25 21:03:41 +01:00
Justin Clark-Casey (justincc)
a4d4f54848
minor: add "threads show" as synonym for "show threads" for consistency
2011-10-25 20:59:27 +01:00
Justin Clark-Casey (justincc)
968cae6c17
Add "threads abort <thread-id>" simulator console command that allows us to abort a watchdog managed thread.
...
This is for diagnostic purposes.
2011-10-25 20:49:46 +01:00
Justin Clark-Casey (justincc)
8a0a78cbcc
Make OpenSim.Framework.Servers.HttpServer rely on OpenSim.Framework instead of the other way around.
...
This is necessary so that code in HttpServer can use framework facilities such as the thread watchdog for monitoring purposes.
Doing this shuffle meant that MainServer was moved into OpenSim/Framework/Servers
Also had to make OpenSim.Framework.Console rely on OpenSim.Framework rather than the other way around since it in turn relies on HttpServer
MainConsole and some new interfaces had to be moved into OpenSim/Framework to allow this. This can be reverted if parts of OpenSim.Framework stop relying on console presence (cheifly RegionInfo)
2011-10-25 20:24:21 +01:00
Justin Clark-Casey (justincc)
e14cb45b9b
Drop some unnecessary ContainsKey() checking before Remove() in BaseHttpServer()
...
Remove() presumably does this check anyway since it just returns false if the key is not in the collection.
2011-10-24 23:26:41 +01:00
Justin Clark-Casey (justincc)
9ec672c70b
Fix bugs in EventQueueGetModule.ClientClosed() and BaseHttpServer.RemovePollServerHTTPHandler() that stopped existing code in ClientClosed() from actually tearing down the poll handler
...
Actually doing the tear down appear to have no ill effects with region crossing and teleport.
2011-10-24 23:16:03 +01:00
Justin Clark-Casey (justincc)
79d5bc9beb
separate out future common setup code from EventQueueTests.AddForClient()
2011-10-24 22:29:13 +01:00
Justin Clark-Casey (justincc)
48295793b0
re-enable running linden udp tests in local.include, though no tests are currently active there
2011-10-24 22:25:38 +01:00
Justin Clark-Casey (justincc)
e28e2d24c7
Add new EventQueueTests with basic test to check that adding a client registers an http poll
2011-10-24 22:23:41 +01:00
Justin Clark-Casey (justincc)
4c9400e646
Add optional getauthinfo and setauthinfo authentication service calls.
...
These are disabled by default, as before. Please only turn these on in secure grids, since they allow the same facilities as the existing SetPassword call (also disabled by default)
These facilities can be helpful when integrating external systems, in addition to the existing option of adapting an IAuthenticationService or using WebLoginKey
2011-10-24 21:40:36 +01:00
Justin Clark-Casey (justincc)
b868328d51
Comment out the uuid gatherer lines that I accidentally left in.
2011-10-23 03:14:32 +01:00
Pixel Tomsen
c2272a755f
Fix missing Busy-Mode Response
...
http://opensimulator.org/mantis/view.php?id=5748
2011-10-22 13:17:07 -04:00
BlueWall
3fc47275cf
Add case to Lightshare/Windlight
...
Thanks thomax for a patch to add handling for Sun/Moon pos.
2011-10-22 13:06:34 -04:00
Justin Clark-Casey (justincc)
655aee44c4
Rename some of the example commented out server names to mygridserver.com like all the others.
...
This is to make it easier to change all these names at once, where all grids services are running from the same location.
Also rearranges some lines in [Modules] so that StandaloneCommon.ini.example and GridCommon.ini.exmaple are consistent.
2011-10-22 02:51:41 +01:00
Justin Clark-Casey (justincc)
229ca09b79
Make config comments about choosing assetcache modules clearer.
...
OpenSim needs an asset cache. Running without one will cause problems.
Thanks to Ai Austin for the suggestions in http://opensimulator.org/mantis/view.php?id=4850
2011-10-22 02:47:53 +01:00
Justin Clark-Casey (justincc)
ffdf59a57c
Get UUIDGatherer to scan notecards in the graph for asset uuids.
...
This is to support npc baked texture saving in oars and iars.
May address http://opensimulator.org/mantis/view.php?id=5743
2011-10-22 02:16:46 +01:00
Justin Clark-Casey (justincc)
30320505fa
redirect UserInventoryHelpers to use a different CreateNotecardAsset() so we can comment out some inconsistency
2011-10-22 00:58:56 +01:00
Justin Clark-Casey (justincc)
bc2da4eaad
correct misleading method doc on CreateNotecardAsset()
2011-10-22 00:55:50 +01:00
Justin Clark-Casey (justincc)
c4f8da7359
in AssetHelpers, store the actual text passed in to the method, not the string "data"
2011-10-22 00:45:47 +01:00
Justin Clark-Casey (justincc)
5d7eaedbeb
encode notecard assets in proper format for tests, rather than just using whatever string is given
2011-10-22 00:21:45 +01:00
Justin Clark-Casey (justincc)
9b3bbedeea
refactor: rename some AssetHelpers.CreateAsset() methods to CreateNotecardAsset()
2011-10-22 00:13:46 +01:00
Michelle Argus
a1f05a289d
RemoteAdmin - Added optional terrain loading on region create using parameter heightmap_file to specify the terrain file to be loaded
2011-10-21 23:12:01 +01:00
Justin Clark-Casey (justincc)
4241ee5dfa
very minor removal of old commented out line of code in OdeScene
2011-10-21 00:04:36 +01:00
Justin Clark-Casey (justincc)
30fe66d3ab
remove unnecessary null check on _collisionEventPrim
2011-10-20 20:58:29 +01:00
Justin Clark-Casey (justincc)
9c43020876
Get OdeScene to use passed in time step rather than hard-coded 0.089
...
However, I still don't recommend changing MinFrameTime from 0.089, high values do not work well and lower values don't seem to make much difference
2011-10-20 20:48:51 +01:00
Justin Clark-Casey (justincc)
6837e44d07
Pass PhysicsScene.Simulate() only the MinFrameTime rather than the useless Math.Max(SinceLastFrame.TotalSeconds, MinFrameTime)
...
SinceLastFrame was calculating the interval between any sleep that had occurred to pad out the frame time and the start of the next frame.
This would usually be below MinFrameTime but occasionally if the sleep was long it would be above, often due to the time required to update the watchdog.
This doesn't appear to play much practical role right now.
ODE was actually ignoring it entirely. Bullet might be helped slightly by receiving a non-varying value.
2011-10-20 19:44:59 +01:00
Justin Clark-Casey (justincc)
b63ec987b0
For now, stop passing timeStep into methods where it's not actually used.
2011-10-20 17:54:32 +01:00
Justin Clark-Casey (justincc)
f16d125027
Change wording on asset requests.
...
Not all 'notified missing' assets are a problem. Some are invalid references which happen to be buried in other text.
2011-10-19 23:56:17 +01:00
Dan Lake
9ab2943abf
Removed redundant NotInTransit function from ScenePresence. IsInTransit=false does the same thing and NotInTransit was not used anywhere.
2011-10-19 15:50:09 -07:00
Dan Lake
eac29396d9
Moved HaveNeighbor utility function from ScenePresence to Scene. Fixed line endings from previous commit.
2011-10-19 15:38:25 -07:00
Dan Lake
8b20faf06c
Merge branch 'master' of git://opensimulator.org/git/opensim
2011-10-19 14:43:16 -07:00
Dan Lake
da794f34a5
Renamed and rearranged AvatarFactoryModule to eliminate redundant lookups of scene presence by client ID.
2011-10-19 14:41:44 -07:00
Justin Clark-Casey (justincc)
601dabb1b7
Extend scripts stop/start/suspend/resume console commands to allow action on a single script by giving the script item id (which can be found via scripts show).
...
Not an ideal way to do this on a region with many scripts. Needs refinement later.
2011-10-19 22:30:31 +01:00
Justin Clark-Casey (justincc)
32c3faedd6
Add "scripts stop" and "scripts start" console commands.
...
These will stop all running scripts and start all stopped scripts respectively.
A stopped script does not save any events for later processing.
2011-10-19 21:40:28 +01:00
Justin Clark-Casey (justincc)
f836710af5
minor: improve command help on scripts suspend/resume
2011-10-19 21:34:55 +01:00
Justin Clark-Casey (justincc)
5607fd3af8
Fix resume scripts.
...
On resume, we need to place requeue the script for event processing if there are any events on the queue.
Also need to do this under m_Script lock in order to avoid a race
2011-10-19 21:30:37 +01:00
Justin Clark-Casey (justincc)
3cf7fb4eca
Add "scripts suspend" and "scripts resume" commands.
...
These aim currently to suspend and resume all scripts.
However, resume isn't currently working due to what looks like a bug in resume functionality itself.
2011-10-19 20:53:24 +01:00
Justin Clark-Casey (justincc)
b45219065c
on log and "show scripts" messages, show script item UUID rather than asset UUID
...
The item ID is the one required for any script manipulation on the command line, so I think it's somewhat more useful to show this bearing in mind the limited space available
2011-10-19 20:26:05 +01:00
Justin Clark-Casey (justincc)
116fbe8258
add current script status to "scripts show" command (running, suspended, etc.)
2011-10-19 20:24:07 +01:00
Justin Clark-Casey (justincc)
ecad9f9fd5
Add "show scripts" command to show all scripts currently known to the script engine in the current region.
...
Also added synonym of "scripts show"
2011-10-19 20:09:02 +01:00
Justin Clark-Casey (justincc)
d9184eceab
Add option to allow remote http calls to setpassword in the AuthenticationService.
...
This is switched on by setting AllowSetPassword = true in the [AuthenticationService] section of Robust.ini or Robust.HG.ini
Default is false as before.
2011-10-19 19:03:17 +01:00
Justin Clark-Casey (justincc)
fe484ab331
Slightly change log message in LoadRegionsPlugin
2011-10-19 01:22:07 +01:00
Pixel Tomsen
178b8d0926
Region-UUID - can not be zero-uuid
...
http://opensimulator.org/mantis/view.php?id=3426
2011-10-19 01:19:21 +01:00
Justin Clark-Casey (justincc)
4cffdf15ba
Make ScopeID optional for http GetAccount and GetAccounts
...
If not specified then it assumes UUID.Zero. as occurs elsewhere in the codebase
2011-10-19 00:34:54 +01:00
Justin Clark-Casey (justincc)
9f171041c9
Make PrincipalID a synonym for UserID in GetUserAccount
2011-10-19 00:23:06 +01:00
Justin Clark-Casey (justincc)
97c66f8eac
Get new NewUser and SetUserAccount calls to accept PrincipalID instead of UserID for consistency with output
2011-10-19 00:16:53 +01:00
Justin Clark-Casey (justincc)
9d59b285bb
Allow an http call to set account details if AllowSetAccount = true in [UserAccountService].
...
As before, default is false to not allow these calls.
2011-10-19 00:06:40 +01:00
Justin Clark-Casey (justincc)
c85a780583
Provide an option to allow remote calls to the CreateUser method on the UserAccountService
...
Default is false, as before.
Enabling AllowCreateUser in [UserAccountService] for ROBUST allows avatars to be created via an http call, with viewer 2 appropriate bits and pieces.
Only Ruths can be created at present.
Please don't rely on the config since at some point CreateUser will be moved to a separate co-ordinating service.
2011-10-18 22:51:40 +01:00
Justin Clark-Casey (justincc)
581885da75
Temporarily put in log lines to record time taken to set terrain in OdeScene.
2011-10-18 21:21:15 +01:00
Justin Clark-Casey (justincc)
03202ada29
Store scene identifier passed in to OdeScene for later debug messages
2011-10-18 21:11:13 +01:00
Justin Clark-Casey (justincc)
1d4cd76e8a
Don't bother taking OdeLock during OdeScene construction, since there can be no contention until the object is constructed.
2011-10-18 21:03:41 +01:00
Justin Clark-Casey (justincc)
f10a824e47
Remove unnecessary lock of OdeLock in OdePrim.changeadd()
...
This taint can only ever be processed from the OdeScene.Simulate() loop, which already locks OdeLock.
2011-10-18 20:58:59 +01:00
Justin Clark-Casey (justincc)
5515c45e3b
minor: method doc to explain a lock of OdeLock
2011-10-18 20:56:11 +01:00
Justin Clark-Casey (justincc)
71d221cdc0
Remove the unused CollisionLocker from ODE
...
Despite its name, this wasn't actually being used in any collision checking
2011-10-18 17:35:58 +01:00
Justin Clark-Casey (justincc)
352002fd0b
Set enable_adaptive_throttles = true in OpenSimDefaults.ini
...
As discussed in http://lists.berlios.de/pipermail/opensim-dev/2011-October/010599.html and the preceeding thread mails,
the aim of this setting is to avoid overloading the viewer UDP connection where the client is failing to ack packets.
Please mantis any anomalous viewer connection behaviour which wasn't there before.
2011-10-17 22:11:56 +01:00
Justin Clark-Casey (justincc)
aeb4ff0274
Allow an avatar to be explicitly named to the "debug packet" command
2011-10-17 20:58:23 +01:00
Justin Clark-Casey (justincc)
120114e96b
refactor: Make IClientAPI.DebugPacketFormat a property rather than a setter without a getter
2011-10-17 20:50:29 +01:00
Justin Clark-Casey (justincc)
96ff2c63ed
Add avatar names to debug packet output
2011-10-17 20:37:01 +01:00
Justin Clark-Casey (justincc)
62a63f834b
refactor: Use SOP.SitTargetAvatar instead of calling a special GetAvatarOnSitTarget() which returned exactly the same thing
2011-10-17 02:04:20 +01:00
