Commit Graph

16548 Commits (68c8633ba18f0a11cfc0ed04d1d0c7c59e6cec76)

Author SHA1 Message Date
Justin Clark-Casey (justincc) 7fb458b055 minor: log an error rather than info if a connector fails to load. 2013-03-15 22:08:11 +00:00
Justin Clark-Casey (justincc) 3a7d9f740e minor: Make logged message in ServerUtils more consistent. 2013-03-15 22:05:18 +00:00
Justin Clark-Casey (justincc) 8cc3adb585 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2013-03-15 21:57:25 +00:00
Justin Clark-Casey (justincc) 924d6e892a Make it possible to chain another asset service underneath the de-duplicating XAssetService.
This makes it possible to use the dedupliicating service without needing to migrate all the existing asset data beforehand.
Currently controlled by a ChainedServiceModule setting in [AssetService] (e.g. ChainedServiceModule = "OpenSim.Services.AssetService.dll:AssetService")
Not yet ready for use.
2013-03-15 21:53:39 +00:00
Vegaslon 78b25094dc BulletSim: Tweak vertical angular attraction to remove double VehicleOrientation application fixing the problem with the vertical attractor pushing vehicles nose first into ground when tilted on side.
Signed-off-by: Robert Adams <Robert.Adams@intel.com>
2013-03-15 14:05:38 -07:00
Robert Adams c10c43d6f6 Fix server statistics always reporting zero for total network bytes in/out.
Clean up some parameter code in Statistics.Binary.
2013-03-15 13:59:34 -07:00
Justin Clark-Casey (justincc) d3e76730bd Add example code to DOExampleModule to pull data from that previously saved by DAExampleModule when instantiating a dynamc object. 2013-03-15 00:49:35 +00:00
Justin Clark-Casey (justincc) cb74186888 Add ParentGroup.HasGroupChanged = true setting to DAExampleModule as this is necessary to get attributes to save (though this probably happens anyway due to the prim move) 2013-03-15 00:27:06 +00:00
Justin Clark-Casey (justincc) e25ba116a3 refactor: make llGetLinkName() and llGetLinkKey() use a common GetLinkEntity() method 2013-03-15 00:06:42 +00:00
Justin Clark-Casey (justincc) 081271e1d7 minor: remove mono compiler warnings in LSL_Api.cs 2013-03-14 23:44:16 +00:00
Justin Clark-Casey (justincc) 12900ea84e Log same environment information to Robust log as is already done for simulator logs, for debug purposes 2013-03-14 23:39:15 +00:00
Justin Clark-Casey (justincc) 2fbc08d7dd refactor: minor cleanup in osGetAvatarList() 2013-03-14 23:19:18 +00:00
Justin Clark-Casey (justincc) 0ea0f8aa83 Fix bug in osCauseHealing() if called with an avatar ID for an avatar that is not in the scene. 2013-03-14 23:16:39 +00:00
Justin Clark-Casey (justincc) 56b333f301 minor: Use more compact libomv primitive constructors in osNpcGetPos() and osNpcGetRot() 2013-03-14 23:12:58 +00:00
Justin Clark-Casey (justincc) 55204ccde6 Fix minor race conditions in OSSL_Api functions where a parcel could be misidentified for moving prims. 2013-03-14 23:09:59 +00:00
Justin Clark-Casey (justincc) f8dab4f93f refactor: Use LSL_Vector(Vector3) constructor in llCastRay() 2013-03-14 23:06:54 +00:00
Justin Clark-Casey (justincc) ca99f418d8 refactor: Use ILandChannel.GetLandObject(Vector3) in LSL_Api rather than having to continually take intermediate Vector3s to avoid race conditions 2013-03-14 23:05:21 +00:00
Justin Clark-Casey (justincc) c1115e4c2e Add ILandChannel.GetLandObject(Vector3 position) as this is a very common input to GetLandObject()
This conforms to the existing ILandChannel.ParcelsNearPoint() method
2013-03-14 22:56:26 +00:00
Justin Clark-Casey (justincc) c09f4ff483 Fix minor race condition in llGetCameraRot() where inconsistent information could be returned for a rotating camera 2013-03-14 22:49:08 +00:00
Justin Clark-Casey (justincc) 114fd042de Fix minor race condition in llGetCameraPos() where an inconsistent post could be returned for a moving camera 2013-03-14 22:46:27 +00:00
Justin Clark-Casey (justincc) d4b109b4c4 Fix minor race condition in llParcelMediaCommandList() where a parcel could be misidentified for a moving prim 2013-03-14 22:45:00 +00:00
Justin Clark-Casey (justincc) 2a81eb8d45 Fix minor race conditions in LSL_Api.GetPrimParams() for PRIM_POSITION, PRIM_SIZE and PRIM_ROT_LOCAL
This function is used by all the various ll*Params() and os*Params() functions
2013-03-14 22:42:11 +00:00
Justin Clark-Casey (justincc) b23009e480 Fix minor race condition in llGetGeometricCenter() if this was changing whilst the function was called. 2013-03-14 22:35:41 +00:00
Justin Clark-Casey (justincc) a6f8638174 refactor: use LSL_Rotation(Quaternion) constructor in lLGetRootRotation() 2013-03-14 22:34:48 +00:00
Justin Clark-Casey (justincc) dd6f1fc637 Fix minor race condition in llGetRootPosition() where inconsistent results could be returned for moving prims 2013-03-14 22:33:44 +00:00
Justin Clark-Casey (justincc) e7603f98b7 Fix minor race conditions in detecting current parcel for llAddToLandPassList(), llSetParcelMusicURL() and llGetParcelMusicURL() for moving prims 2013-03-14 22:31:07 +00:00
Justin Clark-Casey (justincc) e6eb914675 refactor: use LSL_Vector(Vector3) constructor in llGroundNormal() 2013-03-14 22:29:09 +00:00
Justin Clark-Casey (justincc) f8c24b2a61 minor: Reuse ground LSL_Vector in llGroundSlope() rather than creating a new one. 2013-03-14 22:26:37 +00:00
Justin Clark-Casey (justincc) 3c9bea1e3f Fix minor race conditions in llTeleportAgent(), llTeleportAgentGlobalCoords(), llEjectFromLand() and llOverMyLand() where the wrong parcel could be identified for very fast moving avatars. 2013-03-14 22:22:10 +00:00
Justin Clark-Casey (justincc) 7b85279dba refactor: Use LSL_Vector(Vector3) constructor in llGetCenterOfMass() 2013-03-14 22:14:32 +00:00
Justin Clark-Casey (justincc) ff6a16b46e Fix a minor race condition in llInstantMessage() where slightly wrong origin co-ordinates could be given for a fast moving prim 2013-03-14 22:09:05 +00:00
Justin Clark-Casey (justincc) 895aa7346f Fix minor race condition in llGetOmega() where inconsistent results could be returned (accidentally stated that commit 1774c631 was this fix).
Commit 1774c631 was actually a fix for a similar minor race condition in llGetAccel()
2013-03-14 22:07:07 +00:00
Justin Clark-Casey (justincc) 1774c631cb Fix minor race condition in llGetOmega() where a call whilst a prim was changing angular velocity could return inconsistent results 2013-03-14 22:04:11 +00:00
Justin Clark-Casey (justincc) 04e806036f refactor: Use LSL_Vector(Vector3) constructor in llGetVel() 2013-03-14 22:02:43 +00:00
Justin Clark-Casey (justincc) ffbbe29229 refactor: Use LSL_Vector(Vector3) constructor in llGetTorque() 2013-03-14 22:01:24 +00:00
Justin Clark-Casey (justincc) c3e081a5ca Fix minor race condition in llGetLocalRot() where inconsistent results could be returned if the prim was rotating during the call 2013-03-14 22:00:04 +00:00
Justin Clark-Casey (justincc) f840728273 refactor: use cleaner LSL_Rotation quaternion constructor in LSL_Api.GetPartRot() 2013-03-14 21:57:43 +00:00
Justin Clark-Casey (justincc) ad9bd3fe93 Fix sensors, llGetRootRotation(), llGet*Param() and other functions to use the world rotation if the avatar to which they are attached is sitting 2013-03-14 21:46:29 +00:00
Justin Clark-Casey (justincc) e9c394fb4e Make llGetObjectDetails() return the correct world rotation for a sitting avatar
This addresses http://opensimulator.org/mantis/view.php?id=6567
This creates a ScenePresence.GetWorldRotation() with the same semantics as SOP.GetWorldRotation()
SP.Rotation can't be used since it's relative to the sat upon prim if the avatar is sitting.
2013-03-14 21:23:48 +00:00
Justin Clark-Casey (justincc) 43220afda2 Improve DAExampleModule to show current necessary locking to avoid race conditions with a serialization thread. 2013-03-13 23:42:14 +00:00
Justin Clark-Casey (justincc) 48d41ef307 Remove unnecessary instation of DOMap() in SOP from commit 5c53660 since this is being done lazily 2013-03-13 23:25:56 +00:00
Justin Clark-Casey (justincc) 39a0928052 minor: Remove some mono compiler warnings in OpenSim.Framework.dll 2013-03-13 23:17:27 +00:00
Justin Clark-Casey (justincc) 5c53660a7f Add prototype dynamic objects map for scene object parts
This allows region modules to add dynamic objects to SOPs rather than having to continually push and pull OSD dynamic attributes.
This is to explore the original MOAP use case for dynamic attributes where it could be very awkward and possibly time-consuming to keep reconstructing MediaEntrys from stored DynamicAttributes.
This commit adds a DOExampleModule to demonstrate/evolve this code.
Dynamic objects involve no storage or persistence changes - the 'backing store' for any data that does need to be saved will remain the DAMap.
DOExampleModule in this commit only attaches a fresh dynamic object.  Actually constructing this from stored dynamic attributes and handling persistence is left for later.
These changes should affect no existing functionality, though it may or may not reveal necessary changes in DAMap down the road.
2013-03-13 22:59:06 +00:00
Justin Clark-Casey (justincc) b7216f4daf minor: save some commented out log lines which will be useful again in future debugging of VectorRenderModule 2013-03-13 00:46:17 +00:00
Justin Clark-Casey (justincc) f8a4d95bdd minor: Remove mono compiler warning in LLClientView 2013-03-13 00:22:07 +00:00
Justin Clark-Casey (justincc) 0d25be3f81 Make C# scripts return correct error line and column numbers instead of failing because they have no linemap.
Adapted fix from http://opensimulator.org/mantis/view.php?id=6571
Thanks Nickel Briand
2013-03-13 00:19:37 +00:00
Justin Clark-Casey (justincc) fb1211ad5e Add DisableInterRegionTeleportCancellation option in [EntityTransfer] section of OpenSim.ini. False by default.
This option allows the simulator to specify that the cancel button on inter-region teleports should never appear.
This exists because sometimes cancellation will result in a stuck avatar requiring relog.
It may be hard to prevent this due to the protocol design (the LL grid has the same issue)
In small controlled grids where teleport failure is practically impossible it can be better to disable teleport cancellation entirely.
2013-03-12 23:01:27 +00:00
Justin Clark-Casey (justincc) c43d4b5572 Improve teleport cancellation in some circumstances, though cancelling teleports is still not recommended.
Previously, hitting the cancel button on a teleport would cancel on the client side but the request was ignored on the server side.
Cancel would still work if the teleport failed in the early stages (e.g. because the destination never replied to early CreateAgent and UpdateAgent messages).
But if the teleport still completed after a delay here or later on, the viewer would become confused (usual symptom appears to be avatar being unable to move/reteleport).
This commit makes OpenSimulator obey cancellations which are received before it sends the TeleportFinish event queue message and does proper cleanup.
But cancellations received after this (which can happen even though the cancel button is removed as this messages comes on a different thread) can still result in a frozen avatar.
This looks extremely difficult and impossible to fix.
I can replicate the same problem on the Linden Lab grid by hitting cancel immediately after a teleport starts (a teleport which would otherwise quickly succeed).
2013-03-12 22:16:09 +00:00
Justin Clark-Casey (justincc) 0c6268fe56 minor: remove mono compiler warning in SceneObjectUndoRedoTests 2013-03-11 23:15:13 +00:00
Justin Clark-Casey (justincc) be686f80a3 minor: Remove mono compiler warnings from LSL_ApiHttpTests 2013-03-11 23:01:07 +00:00
Justin Clark-Casey (justincc) e898a5fec5 minor: Remove mono compiler warnings in EventQueueTests 2013-03-11 22:42:27 +00:00
Robert Adams 1120bcf123 BulletSim: remove the ability for avatars to fly off the edge of
regions when there are no region neighbors.
Add some terrain location processing routines to support above.
2013-03-09 14:15:14 -08:00
teravus 5097437e11 * Apparently, sometimes texture entries come in from the wire with no default texture defined.. so apply better fallback protection against that. The net result is clients will have their selected textures set when they would have previously had an ignored exception. 2013-03-08 19:32:47 -05:00
teravus 33dab49d22 * Just another one of those new packet blocks causing a null ref. Defaulting to zero length array..... 2013-03-07 19:19:36 -05:00
Justin Clark-Casey (justincc) 6706e189d5 minor: remove some completely unused string local vars added recently in commit 984faf2 2013-03-06 23:11:32 +00:00
Justin Clark-Casey (justincc) 2fe938d11d Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2013-03-06 23:07:04 +00:00
Justin Clark-Casey (justincc) 5751ecde52 Add code for testing event queue messages recevied on region cross.
This is currently disabled pending an improvement in the test code to properly add avatars when an event queue module is present.
2013-03-06 23:06:00 +00:00
Justin Clark-Casey (justincc) 8960418e7d Add regression test for presence crossing between regions on the same simulator.
Unlike a much earlier commented out version of this test, this is done in synchronous mode.
2013-03-06 21:37:53 +00:00
Mic Bowman 9875e840f7 Per discussions with justincc... split the JsonStore type
functions into one for node type and one for value type.
Define and export constants for both nodes and values.
2013-03-05 20:33:17 -08:00
Mic Bowman 30e06b0742 Convert doubles passed back through the MOD interface into LSL_Floats 2013-03-05 20:32:06 -08:00
Justin Clark-Casey (justincc) a9f380d124 Fix bug in osGetPrimitiveParams() so that it works for prims with the same owner as the script and not ones with different owners.
Addresses http://opensimulator.org/mantis/view.php?id=6560
2013-03-06 00:22:58 +00:00
Justin Clark-Casey (justincc) b272b91317 minor: Fix mono compiler warning in MonitorModule 2013-03-05 23:59:39 +00:00
Justin Clark-Casey (justincc) 5cd38d680a Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2013-03-05 23:52:52 +00:00
Justin Clark-Casey (justincc) ccd6f443e1 Get attachment script state before taking sp.AttachmentsSyncLock() to avoid race conditions between closing agents and scripts that may be doing attachment manipulation.
This is in an effort to resolve http://opensimulator.org/mantis/view.php?id=6557
2013-03-05 23:47:36 +00:00
BlueWall f676408e2a Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2013-03-05 15:30:54 -05:00
teravus 69fbcdf14c * Add a Max Payload size property to the Websocket Server Handler. If you would like to restrict the maximum packet size, (and therefore protect against Memory DOSing) then you should set this. I defaulted it to 40MB. This means that in theory, a malicious user could connect and send a packet that claims that the payload is up to 40 mb (even if it doesn't actually turn out to be 40mb. More testing needs to be done on it where the packets are maliciously malformed. 2013-03-05 00:04:09 -05:00
teravus 7556b42d7a * Update LibOMV to f8f8e616b37a7ea22b7922b2331999bc06725bf9
* Add zero length blocks to the new packet blocks to remain compatible with older viewers and avoid a NullRef when _packets_.cs calls the Length parameter..    which adds up the Length property all of the blocks.
2013-03-04 21:26:26 -05:00
Justin Clark-Casey (justincc) fa9f4ef1ba Fix issue in the mesh upload flag module where the ID of the last agent to request the capability was always used instead of the original requesting agent for each cap.
Should address http://opensimulator.org/mantis/view.php?id=6556
2013-03-04 23:20:00 +00:00
BlueWall 66d74e76b1 Add method to remove JsonRpc Handlers from the server 2013-03-03 09:40:44 -05:00
Diva Canto e70c71a175 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2013-03-02 17:54:19 -08:00
Diva Canto b0985f7019 Fixed typos in TempAttachmentsModule. No changes. 2013-03-02 17:53:57 -08:00
Justin Clark-Casey (justincc) 1bc8692a99 Move AllowedClients and BannedClients section to new [AccessControl] section in OpenSim.ini from [Startup]
This change also corrects the setting names - they were actually wrong (though the text in {} was correct).
If there are settings in [Startup] they will continue to be used and anything there will override settings in [AccessControl]
2013-03-02 01:43:54 +00:00
Justin Clark-Casey (justincc) 1a98ce5f64 minor: Quieten down the parts of the WebSocketEcho module logging for now where it tells us it is added/loaded/removed from regions 2013-03-02 01:06:08 +00:00
Justin Clark-Casey (justincc) c91753c065 minor: Log number of region modules loaded from each plugin 2013-03-02 00:56:53 +00:00
Diva Canto 20530ee667 Moved permissions config vars out of [Startup] into [Permissions]. Backwards compatible ([Startup] still being looked up), but please update your configs sometime soon. 2013-03-01 15:24:22 -08:00
Justin Clark-Casey (justincc) 90a19fb573 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2013-03-01 21:49:05 +00:00
Justin Clark-Casey (justincc) c851ebcd8c Add the Mono AddinDependency attribute to the example region modules.
It turns out this is required to get Mono.Addins to pick up plugin DLLs
2013-03-01 21:47:17 +00:00
Robert Adams 326634a0b3 BulletSim: more things into the TODO list. 2013-03-01 09:44:39 -08:00
Robert Adams 1c740798b4 BulletSim: add parameters, code cleanup around checking and enforcing
maximum velocity and angular velocity values for prims.
2013-03-01 09:44:37 -08:00
Justin Clark-Casey (justincc) 862c3fd446 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2013-03-01 00:21:56 +00:00
Justin Clark-Casey (justincc) faf96f5c85 minor: Log location in which simulator/robust was started.
Useful information for system debugging, especially if logging and ini files locations have been changed from defaults.
2013-02-28 23:59:26 +00:00
Diva Canto 433102108b Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2013-02-28 14:20:31 -08:00
Diva Canto ea3e0ef8a3 Bug fix in DataSnapshot, where a var was being used before being initialized. 2013-02-28 14:20:07 -08:00
Justin Clark-Casey (justincc) 239a8da74e Fix potential concurrency issue since the LSL notecard cache was not being checked for expiry under lock 2013-02-28 21:19:23 +00:00
Justin Clark-Casey (justincc) a523ed1e4d Fix bug where simultaneous calls by different scripts to llGetNotecardLine() or llGetNumberOfNotecardLines() would sometimes not trigger a dataserver event.
This was because the notecard asset ID was being used as the request identifier.
Now using a random ID, in common with other code using the DataServer
2013-02-28 21:15:14 +00:00
Justin Clark-Casey (justincc) 14684116f8 Add regression tests for llGetNotecardLine() 2013-02-28 20:57:03 +00:00
Diva Canto 3cc3a8e5bf Removed duplicate 'using' statement. 2013-02-27 21:12:27 -08:00
Diva Canto bb44758179 Switched to using the other Util function with a default value. 2013-02-27 20:59:16 -08:00
Diva Canto 64b8ce73da Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2013-02-27 20:50:03 -08:00
Diva Canto f1010d7b15 Moved the HG default variables out of [Startup] and into their own section [Hypergrid] in *Common.ini.example. Backwards compatible for now. 2013-02-27 20:49:41 -08:00
Justin Clark-Casey (justincc) b892411575 Add comment to example region modules about need to add Assembly annotation if adding modules to a DLL which does not already have this 2013-02-27 22:54:51 +00:00
Justin Clark-Casey (justincc) 0e8ec5649e Get "show modules" console command to obey selected command line region/s 2013-02-27 22:32:14 +00:00
Justin Clark-Casey (justincc) 647cb278c7 Get "show modules" console command to show modules in alphabetical order, and group shared and non-shared modules together
This is to make it easier to tell if a region has a certain module active or not
2013-02-27 22:25:03 +00:00
Justin Clark-Casey (justincc) 9b045e72b6 Add asset name and description truncation warnings to SQLite database plugin for consistency. 2013-02-27 21:41:21 +00:00
Justin Clark-Casey (justincc) 74916ed777 Add more information to warnings logged when asset names and descriptions have to be truncated for database storage
On balance, I still think this is useful because asset names and descriptions can sometimes be helpful in determining what things are.
Even though they are never subsequently (inventory names/descriptions are always used instead).
2013-02-27 21:35:54 +00:00
Justin Clark-Casey (justincc) 61ba02e95f minor: remove some mono compiler warnings in script regression tests 2013-02-27 20:38:10 +00:00
Justin Clark-Casey (justincc) 056f11c297 Show http poll handlers in separate http (poll) section of "show http-handlers" console command instead of never showing them (due to a previous bug).
The code was assuming that poll handlers were also included in general http handlers but this was not the case.
2013-02-27 20:33:11 +00:00
Justin Clark-Casey (justincc) 59bd099b03 Add regression test for llReleaseUrl() (and for llRequestUrl)
Forgot to add file for llRequestUrl() test in commit b8a7c8b
2013-02-27 20:12:58 +00:00
Justin Clark-Casey (justincc) 80c19b7cac Make sure we dispose of WebResponse, StreamReader and Stream in various places where we were not already. 2013-02-27 00:21:02 +00:00
Justin Clark-Casey (justincc) ea4be309e8 minor: remove warning in ConfigurationLoaderTest 2013-02-26 23:40:55 +00:00
Justin Clark-Casey (justincc) b8a7c8b26f Add regression test for llRequestUrl() 2013-02-26 23:36:36 +00:00
Robert Adams bf9132e1c7 BulletSim: fix crash around race condition when a mesh asset cannot
be fetched.
Update TODO list.
2013-02-26 11:32:01 -08:00
Robert Adams 2b53f08386 BulletSim: tweeks to make avatar jump work better. 2013-02-25 21:58:00 -08:00
Diva Canto a356978c79 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2013-02-25 16:28:12 -08:00
Diva Canto 00da59ae52 Mantis #6552 -- stricter error (crash) if server URL is malformed. 2013-02-25 16:27:41 -08:00
Justin Clark-Casey (justincc) d0cb4fc326 Move map related settings from [Startup] to a new [Map] section in OpenSim.ini
Existing map settings in [Startup] will continue to work, and if present will override anything in [Map]
However, the proper place for such settings would now be [Map]
This is to reduce the use of [Startup] as a bag for non-generic settings which should really go in sections, in common with other settings.
This commit also extends Diva's previous work to allow a default setting to be given when looking at multiple sections for settings.
2013-02-25 23:04:38 +00:00
Diva Canto 66c5934d90 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2013-02-25 10:25:56 -08:00
Diva Canto f7aa018a78 Fixes mantis #6551 -- misspelled key name. Also fixed an issue with the roles cache. 2013-02-25 10:24:28 -08:00
Robert Adams aa538fe36f Add StatsManager registration for region specific stats as collected
by MonitorModule. Left existing functionality (command line and HTTP
fetch) and just added StatsManager registration.
2013-02-24 07:48:02 -08:00
Robert Adams b2495c9a1e Streamline stat registration code in ServerStats. Remove most of the
usage of ProcessCounters which tend to fail oddly and are not supported
everywhere.
2013-02-24 07:48:01 -08:00
Robert Adams 2aae046b95 Make StatsManager default output a little more readable 2013-02-24 07:48:01 -08:00
Robert Adams 9f213892ea Add EventHistogram.GetHistogramAsOSDMap that returns that parameters
about the histogram as well as the values.
2013-02-24 07:48:00 -08:00
Robert Adams ee8d726ec5 Modify StatsManager so console command "show stats category container"
only outputs the statistics in the specified container in the category.
2013-02-24 07:48:00 -08:00
Robert Adams 8e67ad25b0 Addition of ServerStats shared region module which collects and registers
server wide statistics (CPU%, network bytes sent, ...) with StatsManager.
2013-02-24 07:47:59 -08:00
Diva Canto d7115cfd46 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2013-02-22 15:58:06 -08:00
Diva Canto 0e8289cd00 Added new Util function for reading config vars that's more generic than the one I added yesterday -- this is for helping move config vars out of [Startup] 2013-02-22 15:57:33 -08:00
Justin Clark-Casey (justincc) a93f06eb88 minor: Add doc to ScenePresence.IsInTransit to make it clear that this is set only for region crossing and not teleport, etc. 2013-02-22 23:08:42 +00:00
Justin Clark-Casey (justincc) ccb7cce819 Make reset of EntityTransferStateMachine for an avatar transfer always happen despite unexpected exceptions.
This means that if such an exception does occur, the region does not need to be reset before that user can teleport from it again.
This is all Oren's code from his patch in http://opensimulator.org/mantis/view.php?id=6374 but I've chosen to split it in two.
2013-02-22 21:59:00 +00:00
Diva Canto 56c979afe8 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2013-02-21 17:27:03 -08:00
Diva Canto e515cdddec Simplification of HG configs: HomeURI and GatekeeperURI now are defined as default under [Startup]. They can then be overwritten in the other sections (but probably shouldn't). I kept the existing code for backwards compatibility, so this should not cause any breaks from people's current configurations. But people should move to have these 2 vars under [Startup] -- see OpenSim.ini.example and Robust.HG.ini.example. And yes, both names now end with "URI" for consistency. 2013-02-21 17:26:19 -08:00
Robert Adams 76ee47c797 Add a virtual ToOSDMap() function to Monitoring.Stat for future
overloading by aggregation statistics and browser based stat viewers.
2013-02-21 15:53:04 -08:00
Robert Adams 303e21babe Add CounterStat which is a wrapper for a counter stat but, because
the 'count' event is internal, historical data can be built it.
Also includes EventHistogram class for building time based,
bucketed history of event occurances.
Make Stat implement IDisposable for subclasses that might need it.
2013-02-21 15:53:02 -08:00
Justin Clark-Casey (justincc) 9de670c550 minor: Change summary in "show appearance" console command to "incomplete" rather than "corrupt"
Corrupt is misleading - it implies textures were uploaded but are not j2k valid.
The actual situation is that at least one required baked texture is not present.
2013-02-21 23:08:50 +00:00
Robert Adams efb5da0aa6 BulletSim: add OutOfBounds logic and some position sanity checking
to eliminate some of the "cannot find terrain height" warning messages.
2013-02-21 08:52:11 -08:00
Robert Adams 681653ca13 Add a method to IStatsCollector for returning stats as an OSDMap.
Extend implementors of IStatsCollector to return an OSDMap of stats.
Update UserStatsCollector and AssetStatsCollector to return both
string and OSDMap data (as well as console format).
2013-02-20 16:13:51 -08:00
Robert Adams 16bb40229b Add flush after write feature to LogWriter 2013-02-20 16:13:49 -08:00
Justin Clark-Casey (justincc) 99ebff94b5 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2013-02-20 22:11:04 +00:00
Justin Clark-Casey (justincc) a671c06ee5 Correct mistake in parsing 'show object pos' and similar pos commands where the 'to' text would be treat as the end vector rather than discarded.
Before this, the commands still work but the help text is wrong - one has to leave out the 'to' in stating the vectors
2013-02-20 22:09:33 +00:00
Mic Bowman 903b40b47e Fix the JsonStore path set problem justincc found earlier today and
remove the deprecated TestPath functions.
2013-02-19 22:53:46 -08:00
Diva Canto 4779f7d7d5 Deleted all AssemblyFileVersion directives 2013-02-19 17:14:55 -08:00
Diva Canto c5cbf862f9 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2013-02-19 17:04:43 -08:00
Diva Canto 66bc526e4c Updated AssemblyInfo.cs for Groups and OfflineIM to 0.7.6.*. Removed AssemblyFileVersionNumber too. 2013-02-19 17:04:21 -08:00
Justin Clark-Casey (justincc) 05a0998f57 Give the user some feedback about the success or failure of console login property commands 2013-02-20 00:51:55 +00:00
Justin Clark-Casey (justincc) 8a6f2432fc minor: remove some mono compiler warnings in OpenSim.Region.ClientStack.Linden.Caps.dll 2013-02-20 00:01:20 +00:00
Justin Clark-Casey (justincc) 26dca1adc3 Convert JsonTestPath() use in json regression tests to JsonGetPathType() instead 2013-02-19 23:53:57 +00:00
Diva Canto 9380d01976 First commit of Diva Groups. The Data bits went to OpenSim.Data core, the rest to Addons.Groups.dll. 2013-02-19 07:26:40 -08:00
Diva Canto 46e182dbf5 Offline IM: moved the Data and MySQL bits to the corresponding places in core, so that it will be easier to plugin a SQLite backend, if anyone is interested in doing that. 2013-02-19 06:37:20 -08:00
Diva Canto 9e460f2af8 One more sql statement on migration #2 for offline im, to really clean up things. 2013-02-18 19:54:18 -08:00
Diva Canto 4e846d55a8 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2013-02-18 16:06:01 -08:00
Diva Canto 5e709b087c Donating Diva OfflineIM as an addon in a single dll, OpenSim.Addons.OpenSim.dll 2013-02-18 15:44:00 -08:00
Justin Clark-Casey (justincc) 050ef1dc4e minor: Rename regression test method TestGetArrayLength() -> JsonTestGetArrayLength() to match others 2013-02-18 22:59:29 +00:00
Diva Canto 8b1b8a3921 I need these for OfflineIM and Groups. 2013-02-18 12:08:05 -08:00
Robert Adams 26421294f6 BulletSim: experimental lock axis code using constraints. Not enabled
by default. Like more debugging is needed.
2013-02-17 20:13:50 -08:00
Robert Adams 1d7276235a BulletSim: add calls for creating all the different Bullet constraint types.
Updated the DLLs and SOs and code for BulletXNA to create the types.
All the detailed control calls are not all in place yet.
2013-02-17 20:13:49 -08:00
Robert Adams 885b45b112 BulletSim: rework parameter setting for different types of values
(like vectors or quaternions).
2013-02-17 20:13:48 -08:00
teravus 6560d80fa8 * Fix walking to <NaN, NaN, NaN> via autopilot. 2013-02-16 22:54:37 -05:00
Robert Adams e549c2922a BulletSim: fix physical object appearing to slowly float off when
they stop moving.
2013-02-16 19:28:38 -08:00
Melanie 3108d18ffb Fix shape parameters sent for meshes tosupport the full number of faces 2013-02-16 05:44:41 +00:00
Justin Clark-Casey (justincc) 7d7736dc73 Separate IAR tests into separate files for load/save/loadpath tests 2013-02-16 01:57:42 +00:00
Justin Clark-Casey (justincc) d54d31807a Make it so that "load iar / ..." does not save the 'root' "My Inventory" folder.
Really "My Inventory" is just the name of the root, it isn't a folder in its own right.
This also makes it more intuitive for users to save whole inventory iars for backup/later restoration, as they don't need to remember to use /*
/* will still work and this is a special case just for the root
If you want to save only the contents of other folders (rather than the folder itself), you still need to specify something like a/b/*
Added a regression test for this case.
2013-02-16 00:50:52 +00:00