0db60eea85
Improve locking of RegionCombinerModule.m_regions
2012-05-19 04:59:36 +01:00
5759313f7f
Add size of region to OAR control file. Megaregions (sw root OARs when saved) will have a size larger than 256x256
...
Not yet read. Do not rely on this information yet, it may change.
2012-05-19 04:56:47 +01:00
824a3a114b
refactor: Add RegionConnection.PosX and PosY to return position in meters rather than copy/pasting the necessary calculations in lots of places.
2012-05-19 04:22:30 +01:00
fb8705dd4d
refactor: Rename connection paramaters from "conn" and "regionConnections" so that it's easy to tell whether they refer to the root region connection or a new region connection
2012-05-19 04:01:05 +01:00
d7f90dee1c
Correct some log messages in RegionCombinerModule about the position of the root region of a megaregion relative to an added region
2012-05-19 03:56:25 +01:00
4e5ac27928
Make the megaregion total area given to the physics module accurate instead of over-inflated.
...
This was previously over-inflated because adding a region to the NE of the root region resulted in double counting of regions already added.
An accurate extent will also be necessary for other purposes.
2012-05-19 03:45:58 +01:00
3f2a727b6d
Remove recent IRegionCombinerModule.IsMegaregion(). In theory, there can be more than one megaregion in a simulator, separated by water.
...
Rename IsRootRegion() to IsRootForMegaregion()
2012-05-19 03:17:21 +01:00
26dfcf5395
Add some method doc to RegionCombinerModule. Clean up log messages.
2012-05-19 03:07:24 +01:00
33247c8d85
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-05-19 02:46:37 +01:00
2b60a5c5d6
Add is_megaregion flag into oar control file. Not currently read - for future use. Please do not rely on this remaining here.
...
An adaptation of part of Garmin's patch from http://opensimulator.org/mantis/view.php?id=5975 , thanks!
Flag only written if the SW corner OAR is saved - this is the only one that captures object data presently (though not land or terrain data).
This adds an IRegionCombinerModule interface and the necessary methods on RegionCombinerModule
2012-05-19 02:45:17 +01:00
9ecdef2686
modulate collision sound intensity with collision relative velocity for parts also
2012-05-19 02:04:10 +01:00
98a2c7bfee
modulate collision sounds intensity with relative collision speed
2012-05-19 01:10:39 +01:00
247a56593f
Further refinement on properties
2012-05-18 20:02:32 -04:00
deb87e7890
fix character IsPhysical
2012-05-19 01:01:46 +01:00
e338c15433
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-05-18 19:34:19 -04:00
895dadbdbd
Cleanup + change properties to set fields with private set : Thanks Justin for the tip.
2012-05-18 19:34:12 -04:00
a7ece8c688
add colliders relative velocity projected in collision direction to collisions report information.
2012-05-19 00:17:37 +01:00
fc5d274229
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-05-18 23:56:44 +01:00
896cd45939
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-18 23:55:18 +01:00
c05f87b50c
Provide Telehub setting to allow use of landmarks
...
Setting to allow use of landmarks to override telehub routing. Default is off.
2012-05-18 17:51:38 -04:00
0147dc6302
Fix build break. Comment out EQG deregister/register logging.
2012-05-18 03:50:23 +01:00
45af29291a
Add level 2 debug eq logging which logs event queue polls.
...
Refactor: eq message logging into common method.
2012-05-18 03:43:36 +01:00
565c73751c
Invoke log4net configurator in pCampBot.exe in order to get OpenSim sylte logging
2012-05-18 00:49:39 +01:00
6501b1b1bb
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-18 00:38:29 +01:00
b18c8c8e78
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-17 23:59:43 +01:00
521ad080f1
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-05-17 23:56:36 +01:00
4d34763f8c
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-17 23:33:26 +01:00
0d0c472181
removed redundant colision sounds. Temporary muted sounds ( returns at top of funtions ).
2012-05-17 23:15:07 +01:00
24b35b7e93
Merge branch 'ubitwork' into avination
...
Conflicts:
OpenSim/Region/Framework/Scenes/CollisionSounds.cs
2012-05-17 22:29:44 +02:00
511fc663a2
Temprorarily disable collision sounds until we have some sound bites
2012-05-17 21:36:27 +02:00
b4cd8b491b
Merge branch 'avination' into careminster
2012-05-17 13:34:47 +01:00
34f20b7fe3
Merge branch 'master' into careminster
2012-05-17 13:28:25 +01:00
7652b3a957
udp transfer: make number packets estimation coerent with number actually sent. Use the safer lower max packet size defined in os source (600) and not OMV one (1100).
2012-05-17 13:13:31 +01:00
6af78836a5
trigger collision sounds on active agent position for better spatial effect without using the detailed collision position. (current error will be half max physical prim size). Moved some checks from sop to collisionSound code
2012-05-17 12:17:29 +01:00
2af11fea37
Merge branch 'master' of /home/opensim/lib/osgrid/opensim
2012-05-17 00:49:33 -04:00
295bb3227d
Force the default Telehub router if no matches are found in the config.
2012-05-17 00:47:19 -04:00
e4231e95a9
increase avatars collisions report to 10 per sec, Stopped sound on avatar to volumedetect collision
2012-05-17 04:41:46 +01:00
038986baff
add avatar colision sounds. Changed test sound UUID
2012-05-17 04:14:13 +01:00
c45b5a3d1c
minor: improve method doc for TestSameSimulatorSeparatedRegionsCreateAgentFails()
2012-05-17 03:27:05 +01:00
d19fb6fb0c
Add regression TestSameSimulatorSeparatedRegionsCreateAgentFails()
2012-05-17 03:12:31 +01:00
b743835f9e
default colisionVolume is 0, use it only for user specified sound
2012-05-17 01:36:42 +01:00
f0c9cb8dc0
Comment out TestSameSimulatorSeparatedRegionsQueryAccessFails() regression test logging accidentally left in
2012-05-17 01:34:04 +01:00
6b6a00a3d5
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-17 01:30:50 +01:00
bdcf2d1348
Add regression TestSameSimulatorSeparatedRegionsQueryAccessFails()
2012-05-17 01:27:59 +01:00
7cbc54d92a
default collision sounds. Incomplete, untested, needs revision
2012-05-17 01:04:30 +01:00
e444cb9da4
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 00:33:04 +01:00
0de7219485
collision sounds: simplify send code a bit and limit sending rate to 5 per sec per part ???
2012-05-16 23:36:37 +01:00
597f99bca7
Merge branch 'master' into careminster
2012-05-16 12:40:45 +01:00
ea47b03625
Added a invalidCollisionSoundUUID so that scripts can stop all collision sounds with llCollisionSound("",...). UUID.Zero means defaults should be used. In case part has several scripts with confliting llCollisionSound result depende on exec order. Specially on reset the efect of "" depends on reset order, it should override the others. This is intermediate improve(?) since collisions sounds seem to need a deaper revision.
2012-05-16 12:27:49 +01:00
23ae24b406
Route OAR SOG loading through the common SceneObjectSerializer.FromXml2Format() rather than the functionally identical but buggy Xml2ToSOG().
...
Remove buggy Xml2ToSOG().
2012-05-16 00:10:42 +01:00
e644e34545
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-05-15 23:47:42 +01:00
1b5ce8c10e
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-15 23:43:59 +01:00
02f3b116c6
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-15 23:42:49 +01:00
81ce169dfe
Merge branch 'avination' into careminster
...
Conflicts:
OpenSim/Data/MySQL/MySQLSimulationData.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2012-05-15 21:24:27 +01:00
a36c487c79
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
2012-05-15 21:19:06 +01:00
81d7844f51
use part VolumeDetectActive and not rootPart.VolumeDetectActive to be coerent with other places in case of future changes. Should be equivalent if all is well.
2012-05-15 17:01:00 +01:00
accab1e086
sop colisions don't play sounds on volume detectors
2012-05-15 16:56:43 +01:00
ca14534b91
sop: - added UpdatePhysicsSubscribedEvents() to update physics ator collision events subcription where needed. Made it consider also VolumeDtc and phantom cases. - added extra calls to it on physics ator proprieties changes. - Fixed land collisions reports. - Handle the case of physics sending a last zero colisions reports to trigger collision_end. - Made the physics collisions report rate be 20 per second. (needs review/testing)
2012-05-15 15:54:02 +01:00
9d67523235
ubitODE: if stopped having collisions do report zero colisions once, so collision_end event can be triggered. Changed reports rate to the requested rate and not full ode rate.
2012-05-15 15:45:01 +01:00
338be76e0a
ubitODE: fix not reporting land collisions on same cases.
2012-05-15 13:41:13 +01:00
65e1d7b2d7
Guard against null root part on SQLite. This really needs to be fixed so SQLite
...
loads roots before children like MySQL does.
2012-05-15 03:16:12 +01:00
069bcd45e5
Try to fix sqlite breakage
2012-05-15 02:27:21 +01:00
995cd25f30
Port the mel/dahlia fix
2012-05-15 02:36:11 +02:00
325973d36f
don't send colision events to volume detectors
2012-05-15 01:40:46 +01:00
e7819ce909
Port Avination's collision fixes to core.
2012-05-15 01:02:38 +01:00
71115c32ad
Merge branch 'avination' into careminster
2012-05-14 23:33:16 +01:00
6126b6da72
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2012-05-14 23:32:49 +01:00
ebdbaba615
Merge branch 'ubitwork' into avination
2012-05-15 00:17:52 +02:00
1b81ce303e
Merge branch 'avination' into ubitwork
2012-05-15 00:04:40 +01:00
0fb663272a
make llGetCameraPos and llGetCameraRot apply to avatar that granted permission and not owner
2012-05-14 23:42:45 +01:00
e9e797b681
Fix an omission
2012-05-15 00:15:44 +02:00
e3c376156c
Completely revamp collision handling. Now works as it is supposed to.
2012-05-14 22:45:54 +02:00
52a32878a9
Save the Telehub and its Spawn Points in the OAR
2012-05-14 19:59:45 +01:00
af6c85308a
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-14 18:57:42 +01:00
deeac69312
minor: comment out individual attachment transfer log messages for now
2012-05-14 18:48:40 +01:00
c2aa3b90d9
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-14 18:36:26 +01:00
42557d7d4c
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-05-14 18:33:20 +01:00
fad557485c
Add more region information to some teleport related logging
2012-05-14 18:06:48 +01:00
e78043cb70
Check parcel entry permissions when moving objects
2012-05-14 01:32:22 +02:00
59826c15ce
Allow non-gods to deed no-mod objects
2012-05-14 01:21:10 +02:00
171480f235
Merge branch 'master' of /home/opensim/src/OpenSim
2012-05-13 17:40:03 -04:00
b80db81cdd
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-05-13 17:39:05 -04:00
30a272ba31
Modifications for SMTP in OpenSimulator. Email size limit was fixed (was out of step with documentation at 1024, so boosted to 4096). Added configuration item for maximum email size. Redundant sleep inside email module was fixed (LSL Api was already sleeping). Added sleep time configuration item for snooze between email sending for LSL Api. Added two new configuration items (email_max_size and email_pause_time) into the example OpenSim.ini, plus fixed a spelling error (llimits) and odd tabbing.
...
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
2012-05-13 17:34:20 -04:00
7c229c8b81
Add configurable SpawnPointRouting
...
Will use one of three selected methods to route avatar landing
points when using Telehubs. The setting is in [Startup] using
SpawnPointRouting = closest/random/sequence
closest: The default setting. Routes avatar to the nearest SpawnPoint
to the location.
random: Picks random SpawnPoints to land the avatar.
sequence: Follows a sequence to place the avatar on the next available
SpawnPoint location
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
2012-05-13 17:20:54 -04:00
9870d7e4e7
ubitODE fix force in case of mlinear motor offset present
2012-05-13 01:28:20 +01:00
fe029cf4e8
Merge branch 'avination' into careminster
2012-05-13 01:25:03 +01:00
e5653ebeb7
Merge branch 'avination' into careminster
2012-05-13 01:24:10 +01:00
e2dc04586a
Merge branch 'master' into careminster
2012-05-13 01:24:01 +01:00
9b7023a159
display a sleep time of zero if forced spare time to zero, when sim fps is lower than desired, for better display coerence.
2012-05-12 17:58:36 +01:00
7461fe4554
TEST MESS* reduce animation packets send. Added onchangeanim event with parameters to define if to add or remove, and if to send anims pack on that evocation, etc
2012-05-12 15:27:37 +01:00
cf8b7c8aff
Merge branch 'avination' into ubitwork
2012-05-12 14:10:15 +01:00
4d98a291a2
ubitODE let vehicles responde faster to changes of some parameters like motors decay times
2012-05-12 14:00:08 +01:00
792e8db456
ubitODE reduced again a bit the max allowed correction velocity on colisions, to reduce a bit bouncing inerent to colisions.
2012-05-12 13:44:47 +01:00
46095c963c
ubitODE: trial workaround for avatar colisions
2012-05-12 12:17:28 +01:00
9d66792c2a
Fix mono compiler warning.
...
Last jenkins failure looked like a glitch.
2012-05-12 03:04:47 +01:00
8b958e7e74
Revert "Save the Telehub and its Spawn Points in the OAR"
...
This reverts commit b0b7b45b94
2012-05-12 02:36:56 +01:00
8dd5f08b6e
revert terminal vel reduction. It helped but not efective
2012-05-11 15:53:31 +01:00
b0b7b45b94
Save the Telehub and its Spawn Points in the OAR
...
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
2012-05-10 22:56:37 -04:00
480216f50f
Print out more information on connecting bots
2012-05-11 02:38:29 +01:00
e618194143
Mantis 6015 new LSL function llGetAgentList.
...
Details in the lsl wiki
2012-05-11 02:25:52 +01:00
f231ac39de
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-11 02:23:18 +01:00
9c392f6a68
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-11 02:05:32 +01:00
0ddf3c5289
Do bot startup on another thread so console is responsive during this process
2012-05-11 01:56:00 +01:00
93b615c51d
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-11 01:37:03 +01:00
dc39ec82fa
Change bot.IsConnected to be ConnectionState with Disconnected, Connecting, Connnected and Disconnecting states
2012-05-11 00:53:21 +01:00
ab4e6a02a5
If a bot is not connected, show region name "(none)" instead of throwing an exception in the "show bots" command of pCampbot
2012-05-11 00:37:20 +01:00
903cff9264
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-10 23:47:39 +01:00
abc029d1f4
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-05-10 23:43:38 +01:00
bce3e7cb06
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-10 22:48:03 +01:00
3c37bc2851
reduce avatars terminal velocity to less than 30m/s or colisions with basic boxs fail badly. (ode lib problem. chode just may support a bit higher velocity due to the use of tilt).
2012-05-10 22:44:12 +01:00
117c183fde
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-05-10 14:43:02 -07:00
f374b63ac8
Add even for terrain tainting and synchronize terrain module with physics scene before physics simulation step rather than after
2012-05-10 14:42:46 -07:00
8558a36506
Merge branch 'master' into careminster
2012-05-10 20:33:27 +01:00
de44734fe9
Saving estate state is really slow (relatively) and it gets
...
completely rewritten every time a region starts up. This
makes the data write only when the data was not already
read from the database.
There is a still a major race condition whenever two regions
share the same estate data, but at least it won't be triggered
on startup.
2012-05-10 09:08:40 -07:00
d0c0d37d24
ubitode: changes to vehicles servos
2012-05-10 16:17:02 +01:00
a90822f4b8
Merge branch 'master' into careminster
2012-05-10 00:42:10 +01:00
d8a78374aa
Where necessary, rename OpenSim/Services/Connectors/*.cs files to reflect the actual class names.
...
This is usually because the file name was singular (*Service*) but the class name was plural (*Services*).
This is to make configuration easier rather than having to look in the c# code itself to find the slightly different name of the connector.
This does not affect existing configuration since the files are being renamed rather than the classes.
2012-05-09 23:25:01 +01:00
6987aef38d
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-09 23:12:30 +01:00
e813f41478
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-09 21:11:14 +01:00
50321fb7bf
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneGraph.cs
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
2012-05-09 00:43:33 +01:00
61e99bcdcb
Mantis 6015 new LSL function llGetAgentList.
...
Details in the lsl wiki
2012-05-09 00:14:24 +01:00
e5dbb652d5
Remove physics actor related race conditions in SetVehicleFlags() and SetPhysicsAxisRotation()
...
sop.PhysActor can currently become null at any time.
2012-05-09 00:11:10 +01:00
3bc5620d74
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-05-08 16:06:02 -07:00
20952c75c5
Trigger event when scene presences are updated
2012-05-08 16:05:34 -07:00
c21c9e13ef
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-09 00:02:13 +01:00
ef279c5a62
Add automated TestllBreakLink()
2012-05-08 23:36:23 +01:00
c0658a102e
Add automated TestllCreateLink()
2012-05-08 23:29:51 +01:00
6406d5a5b9
refactor: Eliminate local id parameter from api initialize.
...
This is always available from m_host.LocalId
2012-05-08 23:20:27 +01:00
01b78235db
Instead of constantly looking up unchanging self item in script code, pass in self item on initialization.
2012-05-08 23:05:01 +01:00
abbd050a13
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-08 21:31:35 +01:00
05634907e9
Merge branch 'master' into careminster
2012-05-08 00:07:18 +01:00
900afbd53e
Merge branch 'avination' into careminster
2012-05-08 00:07:13 +01:00
d3844d142d
Merge branch 'ubitwork' into avination
2012-05-07 23:03:57 +02:00
74eafb78eb
Fix moving no-mod objects. Fixes a regression introduced with the undo fix
2012-05-07 23:03:07 +02:00
75c51f33c4
minor change to linear motor decay
2012-05-07 21:44:24 +01:00
5d1d47e1f9
Revert "Better error handling if Load OAR or Save OAR fail"
...
This reverts commit 65c88b2ff4
2012-05-07 20:01:17 +01:00
15844da3af
Log the full exception when errors occur in BaseHttpServer
2012-05-07 19:56:00 +01:00
65c88b2ff4
Better error handling if Load OAR or Save OAR fail
2012-05-07 19:07:38 +01:00
a82dc263ab
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-07 19:05:21 +01:00
5053506d88
refactor: Instead of performing a ScenePresence lookup twice over LocateClientObject() and GetClientScene(), do the lookup just once in LocateClientObject()
2012-05-07 18:27:33 +01:00
cdf97ab3a6
Fix a bug in FriendsModule.StatusNotify() where all subsequent friends would not be notified once a non-local friend was found.
2012-05-07 17:21:45 +01:00
df7abbb367
Merge branch 'master' into careminster
2012-05-07 12:07:47 +01:00
1120a2cf36
Merge branch 'avination' into careminster
2012-05-07 12:07:42 +01:00
4032455332
add a null check for Primitive.Sculpt in PrimitiveBaseShape constructor for OpenMetaverse.Primitive object
2012-05-07 00:33:50 -07:00
4186fa10f0
remove default values from prior commit since mono cant deal with them
2012-05-07 00:08:56 -07:00
b697d0e895
add OS_NPC_RUNNING option to osNpcMoveToTarget() to allow running speed for moving NPCs
2012-05-06 23:54:50 -07:00
b60f51dafc
Stop llSetPos from sending one update per child prim
2012-05-06 19:21:54 +01:00
2ab9588c9a
UbitODE: reduced the diference btw dinamic and static friction, making dinamic larger more identical to static.
2012-05-05 11:03:38 +01:00
e3226aecd9
SOG: tell physics about when we want a force or a impulse. (sorry add to change here also)
2012-05-05 10:47:51 +01:00
3b78e33d16
ubitODE prims: - moved outbounds checking back to UpdatePositionAndVelocity() from move() so it's done at end of each ode step and when it reports positions to core. There should be no need to check in both places. - Addforce() and AddAngularForce now apply a force if parameter pushforce is true or apply a impulse if false as it's actually needed (the prims grab case should be a force)
2012-05-05 10:40:03 +01:00
b62cc3ce0a
Merge branch 'avination' into careminster
2012-05-05 10:32:22 +01:00
31ab8b2fe0
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Framework/WebUtil.cs
OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2012-05-05 10:32:04 +01:00
163a86517a
force lower avatar density for testing
2012-05-05 03:28:35 +01:00
01b00ad0d5
Fire the scripting changed event with CHANGED_OWNER when an object that has changed owners is rezzed.
...
This needs to occur after the script is resumed rather than before, when the event is just dropped.
Addresses http://opensimulator.org/mantis/view.php?id=5890 and http://opensimulator.org/mantis/view.php?id=5952
2012-05-05 00:29:14 +01:00
e18686528e
Use the more efficient HashSet instead of List for FlotasmAssetCache.m_CurrentlyWriting
2012-05-04 23:03:33 +01:00
dec6ad2933
Don't try and update the access time of a file that is actively being cached.
...
This may cause IOErrors on Windows.
Aims to help with http://opensimulator.org/mantis/view.php?id=6003
2012-05-04 22:57:33 +01:00
6b3135aa4d
UbitODE: leave avatar 'freemove' state (entered on setmomentum) on any significant change like new 'velocity' or new position, etc, requests
2012-05-04 22:24:04 +01:00
da4819a170
Temporarily add debug log lines to lsl url request and release
...
To help with http://opensimulator.org/mantis/view.php?id=5993
2012-05-04 22:11:25 +01:00
c84ef57e52
minor: remove mono compiler warning
2012-05-04 21:04:42 +01:00
92fde6ed26
Mantis 60004 problems with damage and llSetDamage. In damage enabled areas this patch - Deletes any objects that have damage set > 0 that deliver that damage to an avatar Stops Gods receiving damage, Stops volume detect objects causing damage Deletes NPCS when their helth reduces to zero Gradually "heals" damage to an avatar Resets health on going to a non damage area
2012-05-04 21:01:09 +01:00
6096a1f30e
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-04 20:53:30 +01:00
e83bc049df
refactor: Rename new DeleteFoldersEx/PurgeFoldersEx methods to DeleteFolders/PurgeFolders overloads as previously discussed with Oren - I think this makes more sense on balance
...
These overloads are not publicly available on core connectors or IInventoryService.
2012-05-04 20:37:21 +01:00
ad23774433
Allow deleting folders even if they're not in the Trash
...
The functions DeleteFolders() and PurgeFolder() still work as before, i.e. they only allow deleting folders that are in the Trash. However, the functions DeleteFoldersEx() and PurgeFolderEx() can now be used to delete any folder.
2012-05-04 20:30:46 +01:00
197163e12a
Fix teleporting from older to newer regions
2012-05-04 21:00:41 +02:00
333d013b5c
Add the default animation to the child agent data update
2012-05-04 20:33:48 +02:00
cccef2e56d
Calculate the Daylight Savings Time information sent to the viewer based on US Pacific Standard Time rather than whatever timezone the login server is set to.
...
This is because the viewer doesn't receive a timezone from the server but bases its displays on Pacific Standard Time.
However, it still expects to receive notification from the server as to whether or not Daylight Savings Time for PST is in operation.
This commit introduces a new DSTZone setting in the [LoginService] config setting that accepts a list of timezone names valid across different platforms to calculate Pacific DST.
If you need the old behaviour of calculating DST based on the local timezone of the server running the login service, then please override DSTZone with "local".
A mailing list announcement will be made later.
Thanks to Olivier Van Helden and Gudule Lapointe for determining this behaviour and providing this patch.
From http://opensimulator.org/mantis/view.php?id=5972
2012-05-04 19:21:43 +01:00
b5b21013da
Reverse the order of physics event unsubscription to allow GC. Adapted from Unit's reverted patch
2012-05-04 20:06:42 +02:00
1183310a05
Retain velocity on walking crossing - adapted from Ubit's reverted patch
2012-05-04 20:05:51 +02:00
88c4c7283f
Revert "*TO TEST/REVIEW* added current default animation in animationSet.cs to/fromArray in array element 0. This may cause compatibilities issues, but think this information is needed for proper crossings. OSG regions did survived tps in/out with this. ALso added velocity in crossings cases, for now detected by Teleport flag equal to Default (0);"
...
This reverts commit 12c9916193
2012-05-04 20:02:14 +02:00
12c9916193
*TO TEST/REVIEW* added current default animation in animationSet.cs to/fromArray in array element 0. This may cause compatibilities issues, but think this information is needed for proper crossings. OSG regions did survived tps in/out with this. ALso added velocity in crossings cases, for now detected by Teleport flag equal to Default (0);
2012-05-04 19:19:54 +01:00
58a1a0710c
SOG copy bug fix, now new group has own empty list of sitted avatars. Also changed crossing code to restore sitting avas in case of group cross fail
2012-05-04 11:32:37 +01:00
fb99ee6774
minor: Tweak BaseHttpServer message to make it clear that this relates to slow handling of inbound requests.
2012-05-04 01:16:56 +01:00
c9faf0df74
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-04 01:12:56 +01:00
c221eaf0b0
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-05-03 22:39:04 +01:00
fcd5b0817b
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-03 22:30:36 +01:00
100e4ca67e
Fixes Mantis #5999 . llSetLinkPrimitiveParams with PRIM_BUMP_SHINY did cause a runtime error.
2012-05-03 19:00:09 +02:00
bf5f8b54ae
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-03 02:22:06 +01:00
9ffc2c1062
minor: resolve some mono compiler warnings
2012-05-03 01:56:24 +01:00
231a3bf147
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-03 01:45:49 +01:00
2af7f50f26
Stabilize sit position on region crossing
2012-05-03 02:07:55 +02:00
9f9693dab8
Clear permissions given to the object we stand up from
2012-05-03 01:18:51 +02:00
8b1cc0dd29
Merge branch 'avination'
2012-05-03 00:15:45 +02:00
a135e51d23
Improved sitted avatars crossings ( plus tests on vehicles)
2012-05-02 22:08:09 +01:00
bf630fb808
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
2012-05-02 01:37:51 +01:00
40f3c24562
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-01 23:49:02 +01:00
58d460542d
Merge branch 'avination'
2012-05-02 00:33:56 +02:00
82197c87a2
Merge branch 'ubitwork' into avination
2012-05-02 00:33:37 +02:00
e6e12c2d42
Merge branch 'avination'
2012-05-02 00:32:28 +02:00
98e9f22544
Preserve attachment rotation on objects rezzed via a script. Makes toasters
...
work right, finally.
2012-05-02 00:29:56 +02:00
a29f7f7551
Remove some test code that accidentally crept in with 9d2e1c67
2012-05-01 23:25:30 +01:00
9d2e1c67a8
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-01 23:14:12 +01:00
fc3cf2b5a3
Fix saving of attachment positions
2012-05-01 23:21:28 +02:00
5786521103
Move max teleport distance check down into etm.DoTeleport() since this should apply to all teleport calls, not just those through Teleport()
2012-05-01 18:38:46 +01:00
37dd174697
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-01 17:52:30 +01:00
4b982db252
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Data/MySQL/MySQLAssetData.cs
OpenSim/Data/MySQL/MySQLSimulationData.cs
OpenSim/Data/MySQL/MySQLUserAccountData.cs
2012-04-30 19:04:38 +01:00
b678ea18b2
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-04-30 18:44:22 +01:00
9c2a73b61e
llGenerateKey implementation. Creates a random UUID I.E: UUID.Random().ToString();
...
Signed-off-by: TBG Renfold <tbg.renfold@g2mv.co.uk>
2012-04-30 17:36:49 +01:00
d0598c63f3
refactor: Simplify by combining SafeSendControlsToScripts() from fe8e835 into SendControlsToScripts() (instead of SendControlToScripts()).
2012-04-30 17:33:08 +01:00
fe8e835bfc
Fixed: scripted controls didn't work if the avatar was sitting down
...
This fixes a bug introduced in 6473674bbf
2012-04-30 17:18:15 +01:00
4ad45934c6
If there are no new prim items to store then don't bother opening the MySqlConnection only to do nothing with it.
2012-04-30 16:00:31 +01:00
522eff6138
Consistently use using() to make sure we dispose of used MySqlCommands where this is not already being done.
2012-04-30 15:54:35 +01:00
303739622c
ubitODE fix applyROtationImpulse, let vehicle hover be relative to root prim and not center of mass ( as SL docs said) updated some flags to current ones
2012-04-29 11:46:16 +01:00
be176b1e49
ubitode fix inertia for same cases. Added a nasty lock on llGetCenterOfMass and simulate
2012-04-29 08:24:41 +01:00
84b5b3e89b
llGetGeometricCenter...
2012-04-29 06:39:09 +01:00
ad12b5df49
Merge branch 'master' into careminster
2012-04-29 02:23:54 +01:00
c7c0d5558b
remove repeated set of group rotation to physics
2012-04-29 01:00:46 +01:00
df9935273f
SOG bug fix in group rotations updates
2012-04-29 00:41:51 +01:00
174fa4a70f
Merge branch 'avination'
2012-04-29 01:33:40 +02:00
dd745f60c2
fix llGetCenterOfMass ( checked with ubitODE only)
2012-04-28 21:36:38 +01:00
8380166251
Comment out debug [ASYNC DELETER] messages for now.
2012-04-28 00:39:40 +01:00
cd755fe598
Remove mono compiler warning. Adjust message log to error from info
2012-04-28 00:31:11 +01:00
133f05dc41
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-28 00:29:08 +01:00
2bad430ed8
Put scene object related console commands into new "Objects" help category rather than "Regions"
2012-04-28 00:08:04 +01:00
ab71779221
Revert "Revert "Implement bulk inventory update over CAPS (not recursive by design,""
...
This reverts commit a90b0e302c
2012-04-27 23:54:45 +01:00
737e177163
Revert "Log the full exception when errors occur in BaseHttpServer"
...
This reverts commit e31e7c68c8
2012-04-27 23:46:46 +01:00
a90b0e302c
Revert "Implement bulk inventory update over CAPS (not recursive by design,"
...
This reverts commit 6e7f13a72d
2012-04-27 23:46:33 +01:00
d25469f66e
Add flags information (phantom, physics, etc.) to "show object" and "show part" console commands
2012-04-27 23:38:25 +01:00
e48fa38ff5
Oooops don't hover underground but do hover
2012-04-27 23:18:54 +01:00
f5cb403e7e
reorder priority of vehicle hover flags
2012-04-27 22:59:57 +01:00
dcbcbd697f
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
2012-04-27 22:28:09 +01:00
e31e7c68c8
Log the full exception when errors occur in BaseHttpServer
2012-04-27 21:52:04 +01:00
6473674bbf
Fixed: custom walking animations didn't stop when the avatar stopped walking.
...
This happened because the scripts were notified about control changes (e.g., the user stopped pressing the Forward key) when the animation was still WALK, so the script didn't stop the walking animation. Fixing this required: a) Update the movement animation *before* notifying the script; b) Add locking to prevent clashes with the Heartbeat thread (which also updates the animations); c) Handle the case of a user who stops walking just as the avatar is in the air: the avatar should STAND in that case, not WALK.
This reverts commit feef1dd732
2012-04-27 20:47:02 +01:00
9622e8ac72
If a Grid God teleports then include the Godlike teleport flag. This can affect the starting position in the destination region.
2012-04-27 20:22:35 +01:00
37d770f814
Use DotNetZip to compress OARs and IARs.
...
DotNetZip provides much better compression than standard .NET.
2012-04-27 19:46:31 +01:00
e39e4f6bfb
minor: style adjustments in SensorRepeat, mainly related to patch from stoehr
2012-04-27 19:40:19 +01:00
b35a1d5681
Fixing wrong position of llSensor, SensePoint wasnt following the rotation of the root prim.
2012-04-27 19:31:50 +01:00
9bc94c502a
MapImageService: changed the event at which the map tiles are uploaded, because they were being uploaded before the region was registered with the grid
2012-04-27 11:05:40 -07:00
a9dbe39319
MapImage security issue. Compare strings instead of IPAddresses.
2012-04-27 10:39:20 -07:00
292752bb78
MapImage security issue: better error messages
2012-04-27 10:22:43 -07:00
ac64fe03d8
Amend to last commit: account for the existence of proxies.
2012-04-27 09:59:46 -07:00
2970a18e54
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-04-27 09:26:14 -07:00
c84f63f4dc
Minor change in error message (HG teleport failures)
2012-04-27 09:24:50 -07:00
e4e754ee93
MapImageService: added an additional security check for OSGrid and other grids like it.
2012-04-27 09:23:56 -07:00
90305001de
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
OpenSim/Region/Framework/Scenes/Scene.cs
2012-04-27 17:09:49 +01:00
ee237fc5df
test
2012-04-27 12:19:22 +01:00
8ef7df5a56
test
2012-04-27 11:01:34 +01:00
2006188ee5
test
2012-04-27 10:49:32 +01:00
2419de2b6d
test
2012-04-27 10:10:31 +01:00
fedc9eb105
itest
2012-04-27 09:50:53 +01:00
1c735facee
test
2012-04-27 09:23:20 +01:00
cadbfcc011
itest
2012-04-27 09:15:31 +01:00
b948826b7e
test
2012-04-27 09:09:29 +01:00
7a7f4b7722
testing
2012-04-27 09:00:30 +01:00
03450dee39
testing....
2012-04-27 08:11:18 +01:00
6edbbdc83a
ubitODE fix don't report colisions with a volume detector ( only report to it )
2012-04-27 06:00:50 +01:00
e974d493c6
testing
2012-04-27 03:44:15 +01:00
d8f691664a
testing
2012-04-27 03:36:49 +01:00
76d9040ed4
testing
2012-04-27 02:54:39 +01:00
911bc81b00
testing
2012-04-27 02:13:54 +01:00
a64a9e48de
TESTING
2012-04-27 01:43:27 +01:00
7397c9a68e
Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster
2012-04-27 01:31:12 +01:00
30ab9647ba
TEST more changes
2012-04-27 01:24:44 +01:00
61e99fba87
TEST more options to avnLocalTeleport
2012-04-27 01:18:30 +01:00
2cf6023892
TEST added avnLocalTeleport(Vector3 newpos, Quaternion? newrot, bool Stopped) to scenepresence.cs
2012-04-27 01:06:07 +01:00
07e62df558
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-27 00:58:54 +01:00
8a65f5a70d
OSSL: Removed check for CanRunConsoleCommand() in osKickAvatar.
...
OSSL permissions are now controlled in OpenSim.ini.
2012-04-26 22:53:13 +01:00
0da8fe3124
Refactored how asset/inventory types are associated with content types: gathered all the knowledge into a single class. Added the Mesh content type.
2012-04-26 22:49:14 +01:00
ee13d817f1
When creating an OAR, objects where the user is the Creator are always included, regardless of their permissions.
...
The purpose of the permission checks is to prevent the unauthorized copying of assets, but users can always copy assets that they created.
2012-04-26 22:41:31 +01:00
cb6791fb30
Tweak log messages on local region to region teleport path to help with problem resolution.
2012-04-26 22:35:25 +01:00
d19aa9e792
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-04-26 21:54:50 +01:00
2542ca2a49
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-04-26 16:40:36 -04:00
fba802bb03
Merge branch 'master' of /home/opensim/var/repo/opensim
2012-04-26 16:13:47 -04:00
b8114d2b67
Add a version of osNpcSay that takes a channel number Mantis 5747
...
osNpcSay(UUID npc, string message) left untouched
New functions:-
osNpcSay(UUID npc, int channel, string message)
osNpcShout(UUID npc, int channel, string message)
osNpcWhisper(UUID npc, int channel, string message)
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
2012-04-26 16:13:29 -04:00
fc576df273
revert last add commit
2012-04-26 18:24:36 +01:00
f194c48cd3
add wearable type PHYSICS
2012-04-26 17:42:11 +01:00
ca228c4770
Comment out old Scene.HandleLogOffUserFromGrid() to reduce client closing analysis complexity
2012-04-26 16:20:53 +01:00
fd19601c6b
Help big boobies to dance (avatar visualParams). May not persist and need more lobe ?
2012-04-26 16:17:46 +01:00
f49912f92a
minor: Add more detail to unauthorized caps client message
2012-04-26 16:10:24 +01:00
b0cbf16c19
minor: Add region name to dropped inbound packet message
2012-04-26 16:04:49 +01:00
4c4ffb9868
Add request verb and url to error messages in WebUtil that lack this.
...
Make exception printing consistent across windows and mono.
2012-04-26 00:43:31 +01:00
e52fe03fff
minor: Add avatar name to removing agent log message
2012-04-26 00:42:37 +01:00
74dbfe6bb5
Comment out avatar move to target message for now.
2012-04-25 23:46:42 +01:00
133370f158
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-04-25 11:57:29 -07:00
a2d544c938
Add a configuration switch to turn on/off the use of the trash
...
folder when deleting objects from a scene. The use of the trash
folder causes assets to be created and stored everytime you delete
an object from the scene (slows down the delete and adds mostly useless
assets to your database).
Default is on (use the trash folder) which is the standard behavior.
2012-04-25 11:54:57 -07:00
db31c9fe58
Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster
2012-04-25 19:15:40 +01:00
88553bb884
Port Avination link order to make OpenSim behave like SL. Make Primstar scripts work. Fixes Mantis #5990
2012-04-25 19:09:22 +01:00
b62eee2f0b
Merge branch 'master' into careminster
2012-04-25 18:55:51 +01:00
88c9fdfa3a
Adapt some TeleportWithMomentum calls
2012-04-25 18:36:29 +01:00
1afae01311
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-04-25 09:52:44 -07:00
bec100a662
Add try/catch around Json script method registration to avoild some issues
...
with .NET 3.5 vs 4.0 differences.
See http://opensimulator.org/mantis/view.php?id=5971
2012-04-25 09:51:30 -07:00
22ea2ef9a0
set PIDHoverTau and not PIDTau since all physics need that
2012-04-25 17:11:32 +01:00
916e372382
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2012-04-25 16:49:07 +01:00
7aa25c6762
Slight rewording of output messages.
2012-04-24 22:40:07 -07:00
fd281ded3f
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-04-24 22:17:52 -07:00
cf1c34605b
HG: Moved User-level code down to the HGEntityTransferModule where it belongs.
2012-04-24 22:17:10 -07:00
550ff3b4da
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2012-04-25 04:01:55 +01:00
3be3189ee0
Commit the avination Teleport() methods (adaptedto justincc's changes)
2012-04-25 04:00:01 +01:00
af86e2939c
zero out SP velocity before calling SP.Teleport(), as the client expects (though this is also effectively done by physics at the moment)
2012-04-25 03:47:26 +01:00
9a23501824
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2012-04-25 02:33:39 +01:00
683cfc6f82
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-04-25 02:07:55 +01:00
a65ca24701
Add regression test TestSameRegionTeleport()
2012-04-25 01:51:40 +01:00
def65cd94a
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
2012-04-25 01:22:09 +01:00
f24289c47f
Comment out AvatarService.SetAvatar debug log line for now
2012-04-25 01:09:23 +01:00
6b299a4287
Comment out some debug ATTACHMENTS log messages for now.
2012-04-25 00:52:33 +01:00
39a6d7cab4
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-25 00:47:32 +01:00
0f470326aa
Improve teleport log debug and error messages to tell us who is teleporting.
2012-04-25 00:19:38 +01:00
3da613adf5
fix chODE loosing some part positions when doing isPhysical false
2012-04-24 23:13:57 +01:00
54d5ff6774
Go back to always using the local timezone for now - not all machines have US/Pacific or Olsen Amercia/Los_Angeles and this introduces variability that the server operator cannot control
...
Please see http://opensimulator.org/mantis/view.php?id=5972 soon for more comments.
2012-04-24 23:00:50 +01:00
816a44d6da
SOG bug fix in UI object changes
2012-04-24 21:48:12 +01:00
ef1668adb3
Revert "Refactored how asset/inventory types are associated with content types: gathered all the knowledge into a single class. Added the Mesh content type."
...
This reverts commit d3a4d67a20
2012-04-24 21:42:32 +01:00
2f398231ac
Minor improvements to logging
...
Eliminated an extra newline in the console if the log line doesn't contain a category (example of a category: "[ASSETS]").
2012-04-24 21:38:09 +01:00
c5520dc83f
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/World/Warp3DMap/MapImageModule.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2012-04-24 21:30:12 +01:00
d3a4d67a20
Refactored how asset/inventory types are associated with content types: gathered all the knowledge into a single class. Added the Mesh content type.
2012-04-24 20:52:18 +01:00
da5fd53702
Fixed problem with MySQL: it was possible for one thread to use an incomplete list of column names if another thread was creating the list at the same time. Now this is thread-safe.
2012-04-24 20:49:28 +01:00
c70e85a327
When reading a region, use null objects to represent NULL fields.
...
Previously NULL fields were converted to an empty string due to the use of ToString(). But if the field was an Int (e.g., "locZ"), then the subsequent attempt to convert an empty string to an int caused an exception. Now the field is null so we don't try to convert it, so there's no exception.
2012-04-24 20:46:31 +01:00
6011bfa5e3
OSSL: fixed the threat level check for osParseJSONNew
2012-04-24 20:41:29 +01:00
cbe889e10b
minor: formatting changes to top of LLLoginResponse.SetDefaultValues(), chiefly some break up of the long line.
2012-04-24 20:30:19 +01:00
0e3053e4c9
DST settings to match client default Pacific Time (mantis #5972 )
2012-04-24 20:22:34 +01:00
c6f30e044b
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-04-24 20:15:10 +01:00
f0ba6c84e4
fix animations if sited in ground also
2012-04-24 07:27:14 +01:00
a4b76a42cc
let objects/avas push avas
2012-04-24 06:56:34 +01:00
1848ceac95
"save the catgirls"
2012-04-24 05:42:47 +01:00
fd27988978
Changed the Map-related messages from Info to Debug. They're debug messages.
2012-04-23 21:29:18 -07:00
1cfee4e84c
display heatbeat sleep time in stats. This may not be good for general use, but for testing/debug
2012-04-24 04:57:59 +01:00
95bb2049a0
fix Simulation time report
2012-04-24 04:01:29 +01:00
f1d6b3e710
some reduction on time resolution efects on spare time report
2012-04-24 03:38:13 +01:00
b019b20eb8
*testing* changed stats time reports to be per reported frame and not acumulated in about 1second. Total Frame Time is not just 1/reported sim fps
2012-04-24 03:05:29 +01:00
6c21e15cb9
Add online/offline indicator to "friends show" region console command.
...
Improve output table formatting.
2012-04-24 00:32:01 +01:00
40e37d8b78
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:03:57 +01:00
b798b32b19
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-04-23 22:54:11 +01:00
1f8d1bcdcf
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-23 22:52:46 +01:00
60065f06b3
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-23 22:23:47 +01:00
159b3b27ca
Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster
2012-04-23 21:13:08 +01:00
e903709847
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
2012-04-23 20:44:41 +01:00
5a8fdc8a0b
ubitODE - do own timing control (as chODE does) until heartbeat does it right
2012-04-23 20:16:53 +01:00
679da63da6
Mantis 5977 Corrections to llRegionSayTo
...
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
2012-04-23 07:16:33 -04:00
e0f81e2400
ubitODE - several changes...
2012-04-23 01:47:11 +01:00
49ed68e98c
refactor: simply some properties code in BasicPhysicsPlugin
2012-04-22 20:28:12 +01:00
58c890df5d
Make TestSetPhysicsSinglePrim() actually add the object to the scene in order to test more code paths.
2012-04-22 20:03:34 +01:00
8205fe79ce
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-04-22 19:51:51 +01:00
8df4bd14f5
Merge branch 'master' into careminster
2012-04-22 15:06:06 +01:00
26fd1e3a0c
fix a bug i added fixing another....
2012-04-22 03:08:47 +01:00
190e7a4334
ubitODE: - don't try to hover underground unless volumedetector (that doesn't colide with it)
2012-04-21 05:16:54 +01:00
ae2b8f7007
Comment out spurious Body != IntPtr.Zero code after disableBody(), since disableBody() sets Body == IntPtr.Zero on all code paths.
2012-04-21 03:42:54 +01:00
f609594595
refactor: Simplify ODEPrim.AddChildPrim() by returning early where appropriate.
2012-04-21 03:23:51 +01:00
77a7de87e1
Add test for setting physics in a linkset
2012-04-21 02:45:16 +01:00
d5c724e5b8
Add regression test for prim status when root prim in a new linkset is non-physical
2012-04-21 01:51:57 +01:00
9ac48b2aff
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-04-21 01:43:09 +01:00
17bf2a62db
Add test for correct physics status on linking two physics objects
...
Also fixes last build break.
2012-04-21 01:09:42 +01:00
71900968b2
refactor: extract common setup code in SceneObjectStatusTests
2012-04-21 01:01:24 +01:00
ae789f6c16
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-04-21 00:55:27 +01:00
06552f217e
Add TestSetPhysics() to SOP status tests
2012-04-21 00:54:48 +01:00
7a574be3fd
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-04-21 00:12:07 +01:00
c8307cdf1e
Improve bitmap disposal to do null checks and not to potentially try disposal of uninitialized variables.
...
This issue doesn't cause the mono 2.10.5 compiler to fail but appears to cause the windows compiler to fail.
Resolves http://opensimulator.org/mantis/view.php?id=5973
2012-04-20 23:35:11 +01:00
566327a948
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-04-20 23:24:24 +01:00
31c5a7241e
Merge branch 'master' into careminster
2012-04-20 23:17:29 +01:00
3b56c44453
changed seletion code. SOP now knows about parts selection. UI actions are sent to SOP and this reports to SOG. Group is selected if any part is selected.sop.isSelect get() is only used in SOG. Will need to be improved for better performance on largelinksets. *UNTESTED* NEEDS CHECKING for side efects
2012-04-20 18:51:32 +01:00
464fb2533f
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs
2012-04-20 16:48:43 +01:00
2c7f035925
ubitODE: - Change triangles used in terrain height estimation
2012-04-20 04:49:23 +01:00
75f117484b
Always dispose of existing opened bitmap from file in SaveFile(), instead of simply dropping the reference if the existing file didn't contain a bitmap of the same size.
2012-04-20 03:57:22 +01:00
cba64ebc79
Explicitly dispose of bitmaps opened from files in GenericSystemDrawing and JPEG.cs
2012-04-20 03:46:33 +01:00
4ac2f839bd
Remember to dispose of the bitmap opened from a file in GatekeeperServiceConnector.GetMapImage()
2012-04-20 03:32:38 +01:00
63cda3a6d0
concerns GenericSystemDrawing.cs
...
in OpenSim\Region\CoreModules\World\Terrain\FileLoaders\GenericSystemDrawing.cs
Ln 67
Apply Justin's solution
Signed-off-by: Garmin Kawaguichi <garmin.kawaguichi@magalaxie.com>
2012-04-20 03:26:02 +01:00
ec6347f987
ubitODE - again avatar/terrain collision. Reduce new viewers interpolators efects reporting null velocity and aceleration when stopped near the right position, where they can still have instantanius large values that can get magnified by interpolators, specially using diferent timing estimation.
2012-04-20 03:17:36 +01:00
f3dda2d85d
Add more exception detail to Exception and IOException throws in BaseHttpServer.HandleRequest()
2012-04-20 03:12:25 +01:00
2b98e2f106
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-20 02:50:36 +01:00
65b3e13010
Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster
2012-04-20 00:17:14 +01:00
aeb5aed5b7
changed - VolumeDetect and phantom setting interaction. Script VD(true) forces phantom ON. UI phantom off turns off VD. Other transitions should only change specific parameter. This is not as current SL. - Fixed volumedetect prims being wrongly removed from physics.
2012-04-19 23:01:22 +01:00
9b02e1cf4a
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-04-19 01:52:23 +01:00
beb7b8d189
Fix a logic error in app domain creation
2012-04-18 23:23:37 +01:00
c2be894330
Fx up estate settings
2012-04-18 23:23:01 +01:00
411bd0574d
Allow setting a specific target velocity on TeleportWithMomentum
2012-04-18 22:16:59 +02:00
525b7593e8
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
2012-04-18 20:09:52 +01:00
7a255efdb2
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2012-04-18 20:07:32 +01:00
ea73a03553
Don't re-add the assembly resolver for each script if not creating the appdomain
2012-04-18 20:01:41 +01:00
5936e0c376
Allow scripts in attachments owned by the NPC to control the NPC
2012-04-18 19:51:27 +02:00
08714a0d38
ubitODE still retouching character pid
2012-04-18 03:59:38 +01:00
7f42069295
ubitODE - retouch character PIDs
2012-04-18 03:02:28 +01:00
c85f9d681a
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 00:39:39 +01:00
fc9f244a7d
Merge branch 'master' into careminster
2012-04-18 00:28:33 +01:00
b430c0162c
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-04-18 00:00:09 +01:00
859646ef5c
minor: Add some method doc. Add warnings since calling SOG link/delink methods directly rather than through Scene may allow race conditions.
2012-04-17 23:54:51 +01:00
0fe0b2ceec
Prevent objects rezzed in sim from being seen as attachments and becoming uneditable or crashers. (Foxtail of death)
2012-04-17 23:39:41 +02:00
84891930aa
clean up some more logging spam in the jsonstore modules
2012-04-17 14:23:43 -07:00
4db518b9a3
Fix the Csharp 3.0 vs 4.0 problem in JsonStore initialization.
...
Cut down on the logging spam.
2012-04-17 14:15:17 -07:00
5ff2bda587
This commit adds a new optional region module, JsonStore, that provides structured
...
storage (dictionaries and arrays of string values) for scripts and region modules.
In addition, there are operations on the storage that enable "real" distributed
computation between scripts through operations similar to those of a tuple space.
Scripts can share task queues, implement shared locks or semaphores, etc.
The structured store is limited to the current region and is not currently
persisted. However, script operations are defined to initialize a store from a notecard
and to serialize the store to a notecard.
Documentation will be posted to the opensim wiki soon.
2012-04-17 13:45:27 -07:00
4bb72c9ffe
make the namespace for the ScriptModuleComms consistent with its file system location
2012-04-17 13:45:03 -07:00
9464fcebcd
ubitODE: prims - update managed dinamic parameters from unmanaged at ODE rate and not heartbeat.
2012-04-17 16:49:08 +01:00
9132c9e499
ubitODE: - character managed ode was only getting position etc from unmanaged at heartbeat rate like core ode. Now do it at ODE rate in move(..). UpdatePositionAndVelocity() called once per heartbeat is now empty.
2012-04-17 15:50:14 +01:00
d7e2454281
ubitODE: - made avatar/ground collision pid servo a bit softer since seems a bit unstable with small avas in AVI even if fine on my testsite - Removed reading of PID parameters from config files since that only serves to mess things up and adds more unknowns
2012-04-17 14:24:13 +01:00
cca6b6bd0d
Add TestGetChildPartPositionAfterObjectRotation()
2012-04-17 02:14:10 +01:00
74aa8eee12
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2012-04-17 01:54:54 +01:00
2f2181683c
Add test TestGetChildPartPosition()
2012-04-17 01:51:13 +01:00
ab1a3688e2
Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster
2012-04-17 01:50:49 +01:00
7e1ab216e3
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-17 01:33:55 +01:00
24a0cc5261
refactor: Rename EstateSettings.IsEstateManager() to EstateSettings.IsEstateManagerOrOwner() to reflect what it actually does.
...
This makes it consistent with other parts of OpenSimulator that are treating ESTATE_MANAGER and ESTATE_OWNER as different entities.
As per opensim-dev mailing list.
2012-04-17 01:25:41 +01:00
36207b88ff
ubitODE: bug fix let avatars colide with volume detectors
2012-04-17 01:00:50 +01:00
5655239f44
Null reference in llGetObjectMass on a seated avatar.
2012-04-17 00:56:46 +01:00
e6ec83125b
Use INSERT OR REPLACE INTO sql in WebStatsModule for session update rather than separate insert and update statements
2012-04-17 00:46:43 +01:00
572440cd23
correct bug where f_invalid was being inserted on a webstats update for an existing session rather than d_world_kb
2012-04-17 00:33:23 +01:00
1bb3873338
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-17 00:19:36 +01:00
f213f55586
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-17 00:02:58 +01:00
d30b18b1de
Merge branch 'ubitwork'
2012-04-17 00:09:04 +02:00
723015e4f0
fix ( http://opensimulator.org/mantis/view.php?id=5965 ) llGetObjectMass was bad for sitted avatars not checking for the null physicsactor
2012-04-16 21:58:25 +01:00
6480b72eda
ubitODE: - fix remove characters from default raycasts filters as older code (or camera is very odd) - Slow down avatar if velocity is higher than 50m/s as in chODE
2012-04-16 19:44:02 +01:00
adb629a416
Merge branch 'ubitwork'
2012-04-16 20:02:15 +02:00
fff5c61ae8
chODE: if character velocity > 50m/s apply breaks. In free fall this will give a terminal velocity +- 60m/s
2012-04-16 17:47:17 +01:00
04ed5519a5
chODE bug fix
2012-04-16 17:14:31 +01:00
f05a977afa
Let llCastRay use ubitODE raycast if avaiable plus a few changes/fixes that should be checked. PROBLEM: it will not detect nonphysical phantons :(
2012-04-16 16:35:35 +01:00
25a2f97bc2
added suport funtions for ubitODE raycastFiltered
2012-04-16 16:33:57 +01:00
03139f07d7
Downgrade an error log message to info because there is nothing we can do if
...
an asset is damaged so it should not spew red ink.
2012-04-16 17:32:30 +02:00
86a2169d73
ubitODE + physmanager: - Revised use of ODE collisions categories and bits(flags) for better use as filters together with top spaces (for example physical prims are on topactivespace and not physical are on topstaticspace) - Added new world raycast with filters. This blocks calling thread with a timeout of 500ms waiting for heartbeat ode thread signal job done. - Don't let ode bodies being disabled for 2 long except for vehicles. This is necessary to detect when the object is at rest at top of other and that is removed. Assume that vehicles can be enabled by used action.
2012-04-16 16:16:55 +01:00
3999822e13
Use chode character actor.SetMomentum() to force full restore Velocity in scenepresence TeleportWithMomentum(), since actor.Velocity was selected by original coders as the input of a desired velocity (even 'forces') that is modified by character conditions, like not changing velocity.Z if it is in free fall.
2012-04-14 05:07:52 +01:00
2c74e1bba8
Add GroupPosition and GetWorldPosition() checks to TestGetRootPartPosition()
2012-04-14 01:57:09 +01:00
6602dee2fc
Merge branch 'master' into careminster
2012-04-14 01:54:24 +01:00
da342d0b21
minor: make test names consistent
2012-04-14 01:53:40 +01:00
f61b234252
refactor: move common init code into SetUp() in SceneObjectSpatialTests
2012-04-14 01:52:16 +01:00
919972a440
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs
OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs
2012-04-14 01:51:20 +01:00
317aebcce6
refactor: put SOG position test in a separate TestSceneObjectGroupPosition()
2012-04-14 01:47:56 +01:00
40d01fb20b
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-04-14 01:43:57 +01:00
3ae98611f2
Add simple RelativePosition and OffsetPosition checks to TestGetRootPartPosition
2012-04-14 01:43:03 +01:00
4bdd9d51bc
Correct whitespace error introduced by previous commit
2012-04-14 01:04:26 +01:00
4d652c7041
Missing or unimplemented LSL memory functions.
...
Implemented to behave as if scripts were LSO.
Signed-off-by: nebadon <michael@osgrid.org>
2012-04-13 17:08:00 -07:00
eeec1f32c6
Add very basic TestGetRootPartPosition() test
2012-04-14 01:01:28 +01:00
a366c05ae2
Added ability to exclude inventory items or folders when saving IAR files.
2012-04-13 23:31:12 +01:00
47ba9d9429
Merge branch 'master' into careminster
2012-04-13 23:29:10 +01:00
eced091689
Change threat level of osNpcStopMoveToTarget from Low to High to match other NPC functions, and change OSSL permissions name to osNpcStopMoveToTarget instead of osNpcStopMoveTo
...
Thanks to Oren Hurvitz for pointing out these mistakes.
2012-04-13 22:52:24 +01:00
1ad3fdb40b
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-04-13 22:34:36 +01:00
ab7c0e7547
Remove hardcoded god requirement from osSetRegionWaterHeight, osSetRegionSunSettings and, osSetEstateSunSettings no matter the threat level.
...
Change threat level on osSetRegionSunSettings and osSetEstateSunSettings from nuisance to high to match similar functions.
If you had enabled these functions but had relied on the hardcoded god check in the code, then please adjust your OSSL permissions config.
Thanks to Oren Hurvitz for pointing this out.
2012-04-13 22:32:33 +01:00
b574d43c5d
Use presence absolute position to request raycast to camera. Used m_pos maybe a sitting offset. For reasons i don't understand that also seems to crash ode more when i let this rays colide with heighmaps (ubitODE with normal ode lib).
2012-04-13 20:34:56 +01:00
5da77e047a
don't do Animator.UpdateMovementAnimations() in scenepresence RegionHeartbeatEnd if agent is sitting. Also restore Velocity in teleportWithMomentum()
2012-04-13 17:50:03 +01:00
5e3a76361f
Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster
2012-04-13 03:03:44 +01:00
fe65b51876
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
2012-04-13 03:00:48 +01:00
08e509978d
Mantis 55025 Implement script time.
...
Signed-off-by: nebadon <michael@osgrid.org>
2012-04-12 18:44:00 -07:00
4a67e8b98f
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Interfaces/IEstateModule.cs
2012-04-11 23:35:27 +01:00
8be14095fe
HGFriendsModule: Type casts to fix compile error
2012-04-11 18:56:28 +02:00
1f4d3d3582
HGFriendsModule: Added optional user level based restriction to send friendship invitations to foreign users.
2012-04-11 18:52:07 +02:00
f2ede8c7e0
HGFriendsModule: add the scaffolding for supporting permissions pertaining to HG friendships. Snoopy take it from here.
2012-04-11 08:13:11 -07:00
78fd487a70
New OS scripting functions osSetTerrainTexture and osSetTerrainHeight as originally proposed in SL Jira ( https://jira.secondlife.com/browse/SVC-244 ).
2012-04-10 21:49:43 +02:00
4ab479bf58
Add uri to various log messages when region registration fails. Upgrade some debug log messages to error.
2012-04-10 20:40:59 +01:00
f9dd4ed89c
Do not timeout group member cache entry, as long as there are frequent group membership requests. These are caused by movements within the parcel boundaries.
2012-04-10 15:51:26 +02:00
c4a9eae961
make llGetGeometricCenter() work as in current SL. Now this is not real geom center but a average of positions relative to root prim ignoring prims details, so no need to use physics engine.
2012-04-09 23:33:42 +01:00
a45ff62adb
Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster
2012-04-09 21:40:41 +01:00
67d4f1d66c
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Interfaces/IScriptModule.cs
OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
2012-04-09 21:40:03 +01:00
78c0028179
Mantis5502 implementation of some of the new constants
...
Signed-off-by: Melanie <melanie@t-data.com>
2012-04-09 21:25:22 +01:00
39079a62c0
chODE and ubitODE always return prim mass (they where returning object mass on physical prims) so SOG can do the total add. (ubitODE as more code to use a simpler terrain geom on a modified ode lib but should do autodetect and work with normal lib).
2012-04-09 20:58:40 +01:00
87fdb2ed7e
llGetMass and llGetObjectMass (and push estimation) always use object mass as in current SL ( push is what makes sense or impulse will depend on what prim it is and not object). Added llGetMassMKS() that just returns 100 x llGetMass() as it seems to be in SL.
2012-04-09 20:53:29 +01:00
ad544bdd3d
sop.AddToPhysics(..) fixed and in use. For now it seems it needs to set sop.PhysActor, so made it return void.
2012-04-09 18:03:37 +01:00
0f277dfa17
Addresses mantis #5846
2012-04-08 17:54:59 -07:00
6b5b73bfae
Fix a LSL merge artefact
2012-04-08 13:18:03 +02:00
a25d12d166
Merge branch 'master' into careminster
2012-04-08 02:25:48 +01:00
d4a370a5f2
A few more minor improvements on Suitcase inventory service.
2012-04-07 14:52:15 -07:00
0d566aa385
Better Suitcase Inventory Service.
2012-04-06 21:52:48 -07:00
b39de2425c
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
OpenSim/Region/CoreModules/World/Land/LandObject.cs
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2012-04-07 04:52:14 +01:00
806082cd6e
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-04-06 20:35:01 -07:00
9637e50956
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-04-06 20:34:31 -07:00
cce760dbfc
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-07 00:40:55 +01:00
7d8bb33c5b
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-07 00:33:02 +01:00
70b5a2dace
refactor: Eliminate unnecessary SOP.m_physActor
2012-04-06 23:49:23 +01:00
33e91f1088
Implement PRIM_POS_LOCAL on llSetPrimitiveParams() and other prim params LSL functions.
...
This is the same as PRIM_POSITION
2012-04-06 23:43:03 +01:00
4a58d4c5a4
refactor: Use clearer part.ParentGroup.IsAttachment in LSL_Api.GetPartLocalPos()
2012-04-06 23:36:13 +01:00
3af1cd65f9
Fix llGetLinkPrimParams for PRIM_POS_LOCAL for child prims whether in scene or attachments.
...
Return relative position to root prim rather than 0,0,0.
Should fix same issue with llGetLocalPos()
http://opensimulator.org/mantis/view.php?id=5951
2012-04-06 22:41:35 +01:00
47108bb351
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-04-06 21:15:31 +01:00
f2903db390
For llGetMass(), return the mass of the avatar is the object is attached.
...
As per http://lslwiki.net/lslwiki/wakka.php?wakka=llGetMass
This is the mass as used by the physics engine (ODE or Bullet).
2012-04-06 21:14:19 +01:00
c3a8c00ce0
Addition of missing constants for llGetObjectDetails including for Mantis 5502
...
Signed-off-by: nebadon <michael@osgrid.org>
2012-04-06 12:42:46 -07:00
627efc172b
Make llGetMass() return total mass of object when called on root prim.
...
As per http://lslwiki.net/lslwiki/wakka.php?wakka=llGetMass
Aims to resolve http://opensimulator.org/mantis/view.php?id=5954
2012-04-06 20:32:39 +01:00
908cebbea8
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-04-06 20:29:54 +01:00
6a9f36788d
Deleted the unused and commented code from 2 commits ago.
2012-04-06 12:28:15 -07:00
4c32f79c10
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-04-06 11:52:38 -07:00
7435582b70
If an AddItem fails, try adding it to the right folder type.
2012-04-06 11:52:05 -07:00
25b3edc21c
WARNING: LOTS OF COMMENTED AND UNUSED CODE IN THIS COMMIT. This is on purpose; it's an historical record of what works and what doesn't wrt manipulating inventory at the viewer. I'll remove the unused code in a subsequent commit, but wanted to place it in history. The uncommented code works.
2012-04-06 11:51:12 -07:00
953fe46811
A few minor tweaks here and there in XInventoryService.
2012-04-06 11:48:41 -07:00
6eaff18961
Finish the implementation of GetUserInventory, even though it's still not used.
2012-04-06 11:38:47 -07:00
8fd86c9156
Packing of folder in SendBulkUpdateInventory always set the folder type to -1. Not sure if there's a reason for it, but I'm changing it to the given folder type.
2012-04-06 11:24:34 -07:00
e324fb2415
Guard against null inventory contents.
2012-04-06 11:22:30 -07:00
cdbe34716f
Thank you, BaseHttpServer, for telling me where things go wrong.
2012-04-06 11:21:27 -07:00
67537f3596
Added missing refresh of group membership client side cache to the groups module. Before memberships of non active groups often were not stored in the cache (n_groupPowers).
2012-04-05 13:03:57 +02:00
8f45eb913c
Revert last commit
2012-04-05 11:10:05 +02:00
e4406c846d
Group based access restrictions to parcels require group membership, but not that this group is active for that user.
2012-04-05 10:25:54 +02:00
600a86bcae
Little bug fix in HasGroupAccess, to properly store the case "true" in the cache.
2012-04-05 10:02:18 +02:00
a5d6b624f6
Simplify group access checks and break them out into a separate method.
...
Use existing cache if the avatar is within the region and use an
ExpiringCache to cache status if the avatar is not in the region. The
30 second delay now applies to scripted objects ony and only when the owner
is not present.
2012-04-05 00:45:58 +01:00
36c8fa16c0
Implements group based access restrictions for parcels of land. Because of caching there can be a delay of up to 30 seconds until the access rights are effectively changed for a user.
2012-04-05 00:53:40 +02:00
6378abb966
Merge branch 'ubitwork'
2012-04-04 23:57:09 +02:00
77caa286a4
Remove some unneeded parens
2012-04-04 23:48:37 +02:00
c7419a4d61
Adjust Snoopy's contribution for AVN
2012-04-05 00:36:30 +01:00
3a0aac97b4
Merge branch 'master' into careminster
2012-04-04 23:57:50 +01:00
016079ef27
minor changes.. a few physicsactor -> pa and a use a constant with |'ed bit fields in place of 6 individual checks ||'ed
2012-04-04 18:24:56 +01:00
867d50d14c
remove more merge artefacts
2012-04-04 17:01:29 +01:00
787cc0d076
reverted changes to llApplyRotationalImpulse execution in SOP/SOG. This functions naming is misleading, Here Apply means to apply a instante impulse that may add to previus unprocessed ones and not setting a permanente torque (that is done by llSetTorque).
2012-04-04 16:38:29 +01:00
823895b997
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-04-04 15:43:07 +01:00
726915e9ef
Fix the last merge artefacts
2012-04-03 23:38:12 +02:00
1bded840b9
More artefact
2012-04-03 23:25:34 +02:00
dbec5e9859
Fix more merge artefacts
2012-04-03 23:22:47 +02:00
7154d480b9
Remove duplicate implementation of Material { get; set; }
2012-04-03 23:18:07 +02:00
1c4bcf3fed
Fix merge artefacts
2012-04-03 23:13:48 +02:00
63c44719f7
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2012-04-03 23:52:53 +01:00
9a9923405a
terrain save-tile extensions Signed-off-by: Garmin Kawaguichi <garmin.kawaguichi@magalaxie.com>
...
Signed-off-by: Melanie <melanie@t-data.com>
2012-04-03 20:06:03 +01:00
633f4bb3d8
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-03 09:28:17 +01:00
e480e25d8b
Fix more SOP.PhysActor race conditions in LSL_Api
2012-04-03 06:01:05 +01:00
7468299673
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-03 05:51:38 +01:00
d5e123c106
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-04-01 11:20:11 +01:00
6e7f13a72d
Implement bulk inventory update over CAPS (not recursive by design,
...
do NOT CHANGE THIS, needed for HG 2.0)
2012-03-31 02:32:47 +01:00
a6c26b093c
Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster
2012-03-31 02:31:57 +01:00
f3132c45d9
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
OpenSim/Tests/Common/Mock/TestClient.cs
2012-03-31 02:18:02 +01:00
32a953fed7
refactor: Rename SOG.GetChildPart() to GetPart() since it can also return the 'root' part.
2012-03-31 01:52:06 +01:00
f0406f9fe2
Rename SOG.HasChildPrim(uint) to SOG.ContainsPart(uint) to match existing ContainsPart method and remove method duplication.
...
HasChildPrim is also misleading since the 'root' prim can also be returned.
2012-03-31 01:45:37 +01:00
387d7fdad5
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-03-31 01:29:13 +01:00
38d241a317
Add MSSQL login processing fix for servers run on different locales.
...
This may no longer be an issue with better locale enforcement in OpenSimulator but it doesn't hurt to have this patch.
http://opensimulator.org/mantis/view.php?id=4680
Thanks to controlbreak for this
2012-03-31 01:12:04 +01:00
69fc8c4985
minor: small message adjustment and unnecessary code elimination when notifying client of no build permission
2012-03-31 01:07:14 +01:00
874140f950
fix Infinite loading on No Rez http://opensimulator.org/mantis/view.php?id=5932
2012-03-31 01:01:59 +01:00
8728b9ea81
Implement bulk inventory update over CAPS (not recursive by design,
...
do NOT CHANGE THIS, needed for HG 2.0)
2012-03-31 01:34:39 +02:00
c4e4e04eee
reduced instability in vertical atractor with eficiency of 1 and banking
...
this will need a nicer solution sometime...
2012-03-31 00:03:45 +01:00
e5343bccdf
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:11:32 +01:00
269e479cdc
minor: remove some now unneeded code from FriendsCommandsModule
2012-03-30 02:00:01 +01:00
3525c876c8
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-03-30 01:57:38 +01:00
1ef62ca75e
Lock NullFriendsData.m_Data for consistency and against concurrent read/write
2012-03-30 01:23:34 +01:00
bce7964ac2
refactor: Move "friends show cache" console command out into separate FriendsCommandsModule.
...
Expose required methods on IFriendsModule. Rename GetFriends() -> GetFriendsFromCache() for self-documentation
2012-03-30 01:05:29 +01:00
59157d9d63
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-03-30 00:42:55 +01:00
b8d383da0a
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-03-30 00:38:23 +01:00
30db0ac5e2
Finish up the SuitcaseInventory service.
2012-03-29 16:25:55 -07:00
5e3999c84c
Cache the last maptile and return the cachrd tile if the last request is
...
less than an hour ago. Avoids generating the maptile twice on startup.
2012-03-29 22:34:33 +02:00
bf09d6a22b
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-03-29 18:31:57 +01:00
b9d61d5413
Allow the map tile module to be enabled without also eabling refresh
2012-03-29 15:38:12 +02:00
807bb85ac2
Allow llTeleportAgent to work in attachments
2012-03-29 14:45:56 +02:00
012b01f224
Add simple regression test for logging in with offline friends. Don't expect to receive any in this instance.
2012-03-29 03:19:45 +01:00
cd3f3cbdde
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-03-29 01:29:00 +01:00
22a85b947a
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-03-29 01:26:30 +01:00
62b1c807c2
Also add OSS header to interface
2012-03-29 01:14:50 +01:00
bd83676d6c
Change namespace on CallingCardModule and correct interface file placemant. Also ass OpenSource header
2012-03-29 01:13:08 +01:00
93ac47f0d3
Revert "Simplify friends caching by only doing this for root agents - no functions require caching for child agents."
...
We need to cache child agents so that friends object edit/delete permissions will work across boarders on regions hosted by different simulators.
This reverts commit d9f7b8549b
2012-03-29 01:08:47 +01:00
a1de9bc33f
Revert "Add comment about setting client.SceneAgent in AddNewClient()"
...
This reverts commit 964cae4f37
2012-03-29 01:08:37 +01:00
c52ff5cf7b
Committing the Avination calling card module
2012-03-29 00:47:09 +01:00
5a82d939e6
Adding the Avination calling card interface
2012-03-29 00:34:28 +01:00
532e3dad26
Pushing the Avination Calling card hooks. Module to follow.
2012-03-29 00:31:11 +01:00
964cae4f37
Add comment about setting client.SceneAgent in AddNewClient()
2012-03-29 00:21:14 +01:00
d9f7b8549b
Simplify friends caching by only doing this for root agents - no functions require caching for child agents.
...
This allows us to avoid unnecessary multiple calls to the friends service.
All friends functions originate from the root agent and only go to other root agents in existing code.
This also allows us to eliminate complex ref counting.
2012-03-28 23:40:25 +01:00
33df0c2efd
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-03-28 23:36:30 +01:00
6bf4d88397
HG 2.0 Suitcase inventory: proof of concept now working properly with the heavy SendBulkInventoryUpdate message. Waiting for Melanie to finish the light-weight version of that message.
2012-03-28 15:32:19 -07:00
874bf1f8e5
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-28 23:30:28 +01:00
51dc1e709c
HG 2.0: added the beginning of HGSuitcaseInventoryService. Plus moved the hack away from ScenePresence. This is better but it still doesn't restore the inventory upon arrival.
2012-03-28 15:01:37 -07:00
a85876bc17
Committing the Avination calling card module
2012-03-28 23:51:44 +02:00
7dad1ded2e
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
2012-03-29 00:27:35 +01:00
1888e174cd
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-03-28 17:51:56 +01:00
e73023b90b
Merge branch 'master' into careminster
2012-03-28 04:45:05 +01:00
03766c010f
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-03-27 20:38:02 -07:00
af96b99356
More on switching the root folder from under the viewer. More experiments.
2012-03-27 20:36:54 -07:00
614c404923
Typo fix
2012-03-28 03:45:52 +01:00
4007f62158
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-03-27 19:09:03 -07:00
300968e933
HG: Switch root folders from under the viewer. Towards HG 2.0. This is guarded by an obscure config that no one but me should be using at this point.
2012-03-27 19:08:29 -07:00
b24605d526
Fix typos
2012-03-28 02:55:29 +01:00
514a9fdf8e
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-03-28 02:52:11 +01:00
12d3ea3029
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-03-28 02:51:34 +01:00
a43e804e59
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2012-03-28 02:46:31 +01:00
0463a00d34
Start on Bulk inventory update via CAPS. Not functional yet. HG v2
2012-03-28 02:45:50 +01:00
8c0f1e9058
Add a corresponding method for items. HG v2
2012-03-28 02:10:07 +01:00
710c14fb57
Add SendRemoveInventoryFolders which allows to remove one or more
...
folders from the viewer's inventory view. For HG v2.0. More to come
2012-03-28 01:49:06 +01:00
4ab63bfe97
Typo fix
2012-03-28 02:33:15 +02:00
caaf25c326
Merge branch 'master' into careminster
2012-03-28 02:56:31 +01:00
300488f862
Merge branch 'master' into careminster
2012-03-28 02:46:54 +01:00
b519cf6383
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Framework/Client/IClientInventory.cs
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs
2012-03-28 02:20:40 +01:00
445e8bc560
minor: Add some documentation to OnNewClient and OnClientClosed events
2012-03-28 01:08:56 +01:00
cb41fb64be
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-03-28 01:06:18 +01:00
2a8b9a47b2
Add SendRemoveInventoryFolders which allows to remove one or more
...
folders from the viewer's inventory view. For HG v2.0. More to come
2012-03-28 01:15:56 +02:00
b18b1b1d70
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2012-03-27 23:14:43 +01:00
37603ca6da
Reverse a conditional in XInventory that made updating system folder evrsion numbers impossible
2012-03-27 23:11:06 +01:00
db5f46fa23
Let grided simulators retrieve the user's inventory skeleton
2012-03-27 15:24:55 -07:00
b74a89bc12
minor: clean up some code formatting in VivoxVoiceModule.cs
2012-03-27 22:33:42 +01:00
5e07336672
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-03-27 14:25:36 -07:00
91950b3147
Amend to previous commit regarding the config name. Bugs bite.
2012-03-27 14:24:59 -07:00
de45fe7515
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-03-27 21:58:25 +01:00
19837ff4dd
Two new scripting functions osInviteToGroup(userID) and osEjectFromGroup(userID) that invite/eject users to/from groups the object containing the script is set to. These functions also work for closed groups.
2012-03-27 22:30:02 +02:00
5d37a31436
Merge branch 'master' of ssh://snoopy@opensimulator.org/var/git/opensim
2012-03-27 22:16:25 +02:00
7223b63563
User level based restrictions for HyperGrid teleports, asset uploads, group creations and getting contacted from other grids. Incoming HyperGrid teleports can also be restricted to local users.
2012-03-27 22:09:58 +02:00
971d32fda3
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-03-27 12:51:58 -07:00
0247d738e2
When loading objects from DB, first add to scene, then call TriggerOnSceneObjectLoaded.
2012-03-27 12:50:58 -07:00
a619621c60
Merge branch 'master' into careminster
2012-03-27 20:03:41 +01:00
de242a29ca
HG: beginning of a more restrictive inventory access procedure (optional). Experimental: we'll try switching the root folder from under the viewer.
2012-03-27 11:54:13 -07:00
6b5f3b49e7
Merge branch 'master' into careminster
2012-03-27 18:11:05 +01:00
2e2634896d
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-03-27 10:09:08 -07:00
8131a24cde
Send the config section name up to the service classes themselves (XInventory and Assets).
2012-03-27 10:08:13 -07:00
9efabe5e1e
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-03-27 12:07:52 +01:00
09c85a6a6c
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-03-27 02:10:02 +01:00
1aa1a9eb3d
In TerrainModule.cs, the command terrain save-tile is modified to remove an unnecessary double argument "minimum Y tile"
2012-03-27 02:05:57 +01:00
0964af41be
Replace HG linker with core version
2012-03-27 01:46:02 +01:00
872d513daa
BulletSim: make avatar animations update properly.
...
It seems that ODE calls the avatar collision handling routine even
if there are no collisions. This causes the animation to be updated.
So, for instance, going from HOVER to FLY is caused by the physics engine
calling the collision routine each frame with 0 collisions.
2012-03-26 17:36:33 -07:00
caeaa03a69
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-03-26 23:04:07 +01:00
0bd0514e81
Merge branch 'master' into careminster
2012-03-26 16:47:02 +01:00
ad865ab4fc
Add some more overloads to allow registering overloaded methods and lists
...
of methods.
2012-03-26 16:46:07 +01:00
2fcdecf090
BulletSim: fix typo introducted by previous checkins (git merge sometimes makes mistakes)
2012-03-26 08:57:40 -07:00
f8879e06d2
Merge branch 'bulletsim1'
2012-03-26 08:49:12 -07:00
da9743d1d7
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/OptionalModules/Scripting/ScriptModuleComms/ScriptModuleCommsModule.cs
2012-03-26 14:22:49 +01:00
3810e98474
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
...
Conflicts:
OpenSim/Region/OptionalModules/Scripting/ScriptModuleComms/ScriptModuleCommsModule.cs
2012-03-26 14:21:15 +01:00
7e0936e4b6
Add a hust UUID to the script invocations
2012-03-26 14:19:55 +01:00
055269805d
Fix compile error in ScriptModuelComms and add some debugging into the modInvoke
...
routines to simplify finding method registration issues.
2012-03-25 22:59:06 -07:00
98a6c78943
Fix the omission on the interface declaration
2012-03-26 03:33:39 +01:00
5f1f956d17
Fix the omission on the interface declaration
2012-03-26 03:32:30 +01:00
2c42dafe56
Fix Typo
2012-03-26 03:26:02 +01:00
e05c72d32f
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/OptionalModules/Scripting/ScriptModuleComms/ScriptModuleCommsModule.cs
2012-03-26 03:22:26 +01:00
c9c01d5226
Further simplify ScriptComms
2012-03-26 03:20:40 +01:00
ac0f1ff0a6
Dynamically create the delegate type to reduce complexity in the caller
2012-03-26 01:47:20 +01:00
d7cc194e83
Correct the design error I introduced into ScriptComms. Untested but about to
...
be.
2012-03-26 01:47:14 +01:00
5e8d64c943
Dynamically create the delegate type to reduce complexity in the caller
2012-03-26 01:21:44 +01:00
4b76c52c41
Correct the design error I introduced into ScriptComms. Untested but about to
...
be.
2012-03-26 00:30:52 +01:00
44f1f87656
Merge branch 'master' into careminster
2012-03-25 20:07:43 +01:00
cb44808504
Simplify the module invocation registration. The types and method name
...
can be pulled fromt he delegate so we don't need to pass them explicitly
2012-03-25 19:52:38 +01:00
a07fa0395f
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-03-24 22:45:17 -07:00
a14437ad5a
Add support for key, vector, rotation and list types for both
...
arguments and return values to the modInvoke family of functions.
See http://opensimulator.org/wiki/OSSL_Script_Library/ModInvoke
2012-03-24 22:43:42 -07:00
88d5cb6eef
UbitOde let caller try to build meshs like done in chode. Changing this was a bad move i made. Variable colisions softness.
2012-03-24 16:04:13 +00:00
21a97408d4
Avatars have no bounce
2012-03-24 11:30:29 +00:00
4f17537555
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-03-24 03:07:01 +00:00
f03c3c062e
Hack example on to "terrain save-tile" extended help.
...
Thanks to Garmin Kawaguichi for the initially suggested text.
2012-03-24 02:41:45 +00:00
f53c6b2594
Use system provided temporary file in "terrain save-tile" to avoid problems with drive letters on windows
...
Thanks to Garmin Kawaguichi for picking up on this and providing an initial solution (which I adapted).
2012-03-24 02:30:43 +00:00
cf61c74e90
Give feedback when "terrain save-tile" is not successfully invoked.
2012-03-24 02:16:44 +00:00
07388071d4
Merge branch 'bulletsim1' of ssh://island.sciencesim.com/home/sceneapi/radams1/bs-opensim into bulletsim1
...
Conflicts:
OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
2012-03-23 16:20:53 -07:00
ff54b3c366
BulletSim: change default of shouldDisableContactPoolDynamicAllocation from False to True. It seems that collisions don't happen well when it is False (things fall through terrain).
2012-03-23 15:50:32 -07:00
3f53b7bc91
BulletSim: Add new configuration parameters to get and set console commands
2012-03-23 13:15:24 -07:00
142de1d02f
BulletSim: add a bunch of internal Bullet configuration parameters to OpenSimDefaults.ini and the code.
2012-03-23 13:15:23 -07:00
1273f259e4
BulletSim: remove confusion between angularVelocity and rotationalVelocity (there is still confusion in the rest of OpenSim). Enhance some debug statements to include the object ID.
2012-03-23 13:15:22 -07:00
1a738caeca
BulletSim: update TODO list. Rearrange code for readability. Add per object friction and restitution runtime settable parameters.
2012-03-23 13:15:18 -07:00
de24feb275
BulletSim: Add AvatarRestitution parameter. Centralize computation of buoyancy for flying. Tweek avatar default friction and resititution
2012-03-23 13:15:17 -07:00
6ecdadb329
BulletSim: set buoyancy in only one place
2012-03-23 13:15:16 -07:00
b22d040169
BulletSim: add some new runtime setable parameters to match the dll.
2012-03-23 13:15:14 -07:00
975184b3f9
BulletSim: Update list of TODO tasks
2012-03-23 13:15:11 -07:00
164706043d
Have the PhysicsParameters module output console command responses
...
directly to the console rather than logging at INFO (which doesn't
output anything for WARN).
There should really be a WriteLine method on ICommandConsole so all
of the different commands don't have to figure out where the command
output should go.
2012-03-23 13:11:58 -07:00
9a67baae21
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
2012-03-23 14:24:55 +00:00
6b87a29c86
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-03-23 02:22:57 -07:00
1ae9ab685a
Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster
2012-03-23 03:49:22 +00:00
d4beb2f5bc
Comment out log message about sending periodic appearance updates.
2012-03-23 03:39:39 +00:00
54887bf386
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-23 03:33:07 +00:00
4ed833bc9d
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-23 02:49:29 +00:00
fac89b6671
Merge branch 'master' into careminster
2012-03-23 02:46:49 +00:00
2190a62366
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Application/OpenSimBase.cs
OpenSim/Region/Framework/Scenes/Scene.cs
2012-03-23 02:44:22 +00:00
ade164667f
Make anims way more snappy. Decouple SP animation handling from physics frame
...
time.
2012-03-23 03:16:07 +01:00
349454ca27
Remove unnecessary shutting down check in Scene.Heartbeat(). Add some method doc. Rename HeartbeatThread, shuttingdown to conform to code standards.
2012-03-23 01:46:11 +00:00
c0672cb7db
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-03-22 21:27:03 -04:00
176bba4f67
Merge branch 'master' of /home/opensim/src/opensim
2012-03-22 21:26:30 -04:00
18b3f1132e
Rename Scene.StartTimer() to Start() - this method no longer uses a timer. Comment out more effectively unused old heartbeat code.
2012-03-23 01:21:43 +00:00
4ee8b3e23e
Fix build break
2012-03-23 01:11:43 +00:00
a9995ede65
Fix bug in ScenePresenceAnimator.RemoveAnimation() introduced in commit 1a8769e
...
Forgot to uppercase the animation name for default animations, since for some reason we store and use them in upper rather than lowercase.
2012-03-23 01:08:13 +00:00
bc2963d42a
Comment out unused scene loop restart code.
...
This has actually been unused since at least 0.7.2 due to earlier changes.
2012-03-23 01:03:10 +00:00
08b8ebcc7e
Use m_lastFrameTick instead of m_lastUpdate in Scene.GetHealth(). m_lastUpdate is no longer properly updated and is redundant anyway.
2012-03-23 00:55:11 +00:00
c903813e00
RegionReady logging
...
Some maintenance to clean up logging messages
2012-03-22 20:49:45 -04:00
40b9b519b8
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-23 00:12:14 +00:00
efe61b2481
BulletSim: remove confusion between angularVelocity and rotationalVelocity (there is still confusion in the rest of OpenSim). Enhance some debug statements to include the object ID.
2012-03-22 17:04:06 -07:00
15c2499ccd
Comment out login parameters debug output accidentally included with c4b2d24
2012-03-22 23:31:41 +00:00
c1d064e1ca
Comment out a terrain save-tile debugging message that accidentally crept in with c4b2d24
2012-03-22 23:16:52 +00:00
ed67b698d3
Merge commit '760010d6fb6aac313d79ce0a4d0016d3809246a0' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
2012-03-22 23:05:58 +00:00
9edf99703a
Merge commit 'df624c13c98b06d57311c1d93ecbd4790553f3b3' into careminster
2012-03-22 23:01:50 +00:00
5bf45b9b98
refactor: simplify code for checks when part.OwnerID != destPart.OwnerID in MoveTaskInventoryItem()
2012-03-22 22:40:38 +00:00
760010d6fb
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 22:33:37 +00:00
3bcf71c647
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-03-22 22:33:16 +00:00
c4b2d24f33
Add llGiveInventory() test from object to object where both objects are owned by the same user.
2012-03-22 22:17:07 +00:00
df624c13c9
HG Friends: don't notify if the server isn't there.
2012-03-22 15:08:57 -07:00
53b4551b58
Fix merge issue from core
2012-03-22 20:48:31 +00:00
6bc1ccf234
Change a false false to be truly true - or is this statement false?
...
Fixes perms boo-boo
2012-03-22 20:39:18 +00:00
3381899481
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/World/Land/LandObject.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2012-03-22 20:38:49 +00:00
b5d0bc2488
Rework Diva's patch to simplify it
2012-03-22 20:25:20 +00:00
45b588cf00
Revert "Simple build permissions feature. NOTE: EXPERIMENTAL, DISABLED BY DEFAULT. Turns out that this can't be expressed by cascading Permission modules, so I did it as per this patch."
...
This reverts commit 6146e7ef25
2012-03-22 20:10:38 +00:00
6146e7ef25
Simple build permissions feature. NOTE: EXPERIMENTAL, DISABLED BY DEFAULT. Turns out that this can't be expressed by cascading Permission modules, so I did it as per this patch.
2012-03-22 12:57:12 -07:00
9949ac2f9f
refactor: Rename AvatarAnimations -> DefaultAvatarAnimations for code clarity since non-default animations are handled completely separately from this class
2012-03-22 00:10:41 +00:00
71ec84d77f
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-03-22 00:00:05 +00:00
1a8769e6ef
Instead of loading default avatar animations in both SLUtil and AvatarAnimations, load just in AvatarAnimations instead.
...
This lets us remove the dependency of OpenSim.Framework.dll on data/avataranimations.xml, which is not necessary for ROBUST.
This commit also takes care of the odd situation where animations are stored and used internally with uppercase names (e.g. "STAND")
but scripts refer to them with lowercase names (e.g. "sit").
2012-03-21 23:57:39 +00:00
7783c93802
BulletSim: update TODO list. Rearrange code for readability. Add per object friction and restitution runtime settable parameters.
2012-03-21 16:16:47 -07:00
cb2727cf6e
BulletSim: Add AvatarRestitution parameter. Centralize computation of buoyancy for flying. Tweek avatar default friction and resititution
2012-03-21 16:16:46 -07:00
6c55fd93a3
BulletSim: set buoyancy in only one place
2012-03-21 16:16:45 -07:00
898a16802b
BulletSim: add some new runtime setable parameters to match the dll.
2012-03-21 16:16:44 -07:00
eafc3d6c47
BulletSim: Update list of TODO tasks
2012-03-21 16:16:41 -07:00
8652f277df
Revert "Stop messing order of updates, destroing the defined order of the selected priority (by distance being the one that makes sense(?). So called fairness serves no usefull purpose. If a region is lagged or user has bad comms, and far objects updates don't arrive, at least nearby thinks do have a chance to keep ticking. Just test on a big region and observe rez order on arrival. lower viewer bandwith helps seeing the diference. No use to put in core since cmic loves the priority scrambling code i comented out."
...
This reverts commit 68981d01f0
2012-03-21 22:45:34 +01:00
68981d01f0
Stop messing order of updates, destroing the defined order of the selected priority (by distance being the one that makes sense(?). So called fairness serves no usefull purpose. If a region is lagged or user has bad comms, and far objects updates don't arrive, at least nearby thinks do have a chance to keep ticking. Just test on a big region and observe rez order on arrival. lower viewer bandwith helps seeing the diference. No use to put in core since cmic loves the priority scrambling code i comented out.
2012-03-21 21:19:29 +00:00
4f593fa8c3
minor clean
2012-03-21 21:17:00 +00:00
5170cd7577
Updated the UserAccountsClient a little bit, plus some more sanity checks on the service connector.
2012-03-21 11:22:39 -07:00
4a9ca3ca8f
HG Friends: reroute the status notifications to the HGFriends service, so that they can scale better. They were previously being handled by the UAS; that is still there, but it's now obsolete and will be removed in a future release.
2012-03-21 10:35:06 -07:00
d8bcb78b10
HG Friends: pulled sim-bound notification code to HGStatusNotifier, so that we can better manage this traffic.
2012-03-21 09:14:17 -07:00
68736aa460
fix a bad reset of shapetype on pbshape change, added missing checksculpload ( to reload mesh on change )
2012-03-21 15:27:33 +00:00
8ad426f329
Removed extraneous debug message
2012-03-21 08:08:43 -07:00
1089e9b842
Removed extraneous debug message
2012-03-21 08:08:12 -07:00
a03c55fee7
missed a creatMesh in chODE. temporary removed m_meshfailed test since it may colide with how meshs and sculpts are loaded. This needs a good revision..
2012-03-21 14:03:50 +00:00
316f272b62
shapetype support on chOde so it can also request a simple convex hull 'mesh'
2012-03-21 12:57:46 +00:00
5abe1b4fce
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-03-20 21:36:46 -07:00
d49dd5573b
Removed extraneous debug messages. Added a check for UUID.Zero.
2012-03-20 21:36:02 -07:00
312f0c6970
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-03-21 02:45:33 +00:00
f6cbafcaf0
Changes of PrimShapeType should now work with UbitOde ( almost untested )
2012-03-21 02:39:16 +00:00
54a8a5baba
If "debug scene updates true" then print out to log when a garbage collection occurs.
2012-03-21 02:02:14 +00:00
11ed932263
Tell physics about physics shape when creating. Added some virtual methods to get/set density,gravmod, frition,bounce and shape type ( not in use ). UbitOde now should do convex type on creation or everytime the mesh is changed ( as in change size, shape, etc )
2012-03-21 01:46:41 +00:00
de53aa32e0
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-21 01:27:09 +00:00
2e41294da9
add convex state to mesh key, so a change is detected.
2012-03-21 01:24:30 +00:00
ab243f4a57
Incorporate scene teleporting debugging into "debug scene teleport true|false" command
2012-03-21 01:13:44 +00:00
9671e43497
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-21 01:02:58 +00:00
ee9210f656
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
2012-03-21 00:26:02 +00:00
7a0d7be44c
Refix the fixed fix!
2012-03-21 00:17:58 +00:00
69a9a6993e
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-03-20 17:33:26 -07:00
91a001d3cf
fix compile error from last commit
2012-03-21 00:31:31 +00:00
9e8b194356
Fixed borkness with map search introduce by my last changes to it.
2012-03-20 17:29:34 -07:00
742acc0a3c
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-03-20 17:26:18 -07:00
f7c61790b7
Fixed borkness with previous merge.
2012-03-20 17:25:52 -07:00
022366a074
refactor: simplify EstateManagementModule.handleEstateDebugRegionRequest()
2012-03-21 00:23:46 +00:00
841b4232f6
Line endings
2012-03-20 17:19:55 -07:00
3fa51f66ec
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
...
Conflicts:
OpenSim/Framework/Util.cs
2012-03-20 17:19:14 -07:00
d08ad6459a
HG Friends: allow the establishment of HG friendships without requiring co-presence in the same sim. Using avatar picker, users can now search for names such as "first.last@grid.com:9000", find them, and request friendship. Friendship requests are stored if target user is offline. TESTED ON STANDALONE ONLY.
2012-03-20 17:14:19 -07:00
d3a5cdd7c2
Merge branch 'master' into careminster
2012-03-21 00:09:18 +00:00
250b75f03b
Merge branch 'master' into careminster
2012-03-21 00:03:03 +00:00
7bf628ab31
Add ability to log warn if a frame takes longer than twice the expected time. Currently commented out.
2012-03-21 00:02:08 +00:00
117a862769
Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster
2012-03-21 00:01:11 +00:00
5233e335e9
Move the health monitoring stuff where it will do some good
2012-03-21 00:00:32 +00:00
80a3b43e69
Merge branch 'master' into careminster
2012-03-20 23:59:49 +00:00
35c3124c3b
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
2012-03-20 23:39:02 +00:00
4c41b53a4b
Add prim name to "[MESH]: No recognized physics mesh..." log message
2012-03-20 23:35:50 +00:00
02f9caf6ce
remove some mono compiler warnings
2012-03-20 23:34:10 +00:00
3701f893d3
remove unnecessary tmpFrameMS, use maintc instead for frame time calculation
2012-03-20 23:31:57 +00:00
c39fba8f9d
minor: remove some mono compiler warnings
2012-03-20 23:19:11 +00:00
8bdd38b804
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-03-20 23:14:15 +00:00
30b2a8c778
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-20 23:12:21 +00:00
3d258d2688
Merge branch 'ubitwork'
2012-03-20 23:09:34 +01:00
8817b6e74c
let convex be a parameter to createMesh so it can be used. Was forced to add it also to original mesher code and zeromesher
2012-03-21 00:02:41 +00:00
23e6a31aa5
added convex decomposition hulls support. Hardcoded to use mesh or this. (so no simple hull of convex prims for now).
2012-03-20 23:38:04 +00:00
bd1f848bf6
slight increase in jump power to make running jump slightly better.
2012-03-20 14:17:15 -07:00
fdd4d787a4
Merge branch 'master' into careminster
2012-03-20 20:48:55 +00:00
9ed3532c1b
reduce avatar verticle jump from the absurd 5 meter jump to a less
...
absurd 3m vertical jump to better match what you would see in Second
Life and be more in line with what users would expect.
2012-03-20 13:45:38 -07:00
86bd287b53
refactor: precalculate the fixed movement factor for avatar tilting (sqrt(2)) rather than doing it multiple times on every move.
2012-03-20 20:39:33 +00:00
5f2a65c976
refactor: Eliminate unnecessary duplicate avCapsuleTilted
2012-03-20 20:28:58 +00:00
8c1550b58e
WORK in progress!! Now it reads the simple hull shape to use if convex shape is selected for a prim. Due to ODE limitations on convex hulls colisions, it creates a mesh. Being work in progress it is hardcoded to only read that simple convex hull for now. It writes a file named "lixo_lixo.raw" that can be imported into blender for examination of the created mesh (the last one loaded and also hardcoded). To play with put in opensim.ini "meshing = UbitMeshmerizer"
2012-03-20 19:24:45 +00:00
70c0d6cf0b
Merge branch 'ubitwork'
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
2012-03-20 18:07:24 +01:00
7f7801ecb9
Cover the case where prims are loaded and ParentGroup is not yet set
2012-03-20 18:02:43 +01:00
efd7ff3146
add some more notifications about changes on physical parameters ( still incomple and there should be a better away )
2012-03-20 16:46:16 +00:00
f2d17433bb
Cause prims to be saved if extra physics parameters are changed
2012-03-20 12:34:06 +01:00
abd9957198
Fix an invalid cast that only showed at runtime
2012-03-20 12:24:42 +01:00
7779b1eabc
Store and reload extra physics from database
2012-03-20 12:04:55 +01:00
5768a151ff
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Data/MySQL/MySQLXAssetData.cs
2012-03-20 02:48:11 +00:00
a3abd65e3d
Remove pointless ThreadAbortException catching in a test that isn't run anyway.
2012-03-20 01:41:32 +00:00
8c911ddaf0
Remove some pointless catching/throwing in the scene loop.
2012-03-20 01:39:19 +00:00
4cbaf053cf
Fix small typo
2012-03-20 00:53:33 +00:00
1c0f3a1f21
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-20 00:40:03 +00:00
e9271ec653
Add some doc about the EventManager.OnLoginsEnabled event.
2012-03-19 22:48:26 +00:00
e2b1c569da
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:45:03 +00:00
437f18bc41
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:43:23 +00:00
618244f285
Remove debug output using Console.WriteLine and trim excessive whitespace
2012-03-19 14:39:19 +01:00
808995fb68
Merge branch 'ubitwork'
2012-03-19 14:25:11 +01:00
ab54ce1907
Fix configuration problems where XAssetDatabasePlugin was picked up accidentally.
...
The asset data plugin now implements IXAssetData rather than IAssetData so the ordinary AssetService should no longer pick it up.
This replaces the changes in 92b1ade
2012-03-19 00:18:04 +00:00
c7e302864a
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
OpenSim/Region/Framework/Scenes/Scene.cs
2012-03-18 20:44:56 +00:00
d1256536b5
Added GetUUID(first, last) on UserAgentsService so that we can finally make direct user connections.
2012-03-17 21:27:28 -07:00
441ef301a3
Amend to previous commit: normalize strings ToLower.
2012-03-17 19:41:47 -07:00
7dfa0309c6
More on HG access control. This commit splits the UserManagementModule into the Basic one and the HG one, so that we can do everything that needs to be done for HG ACLs to work without interfering with the vanilla opensim. For the moment, it finds foreign users who have left a trace in the region, e.g. an object. This makes it possible to ban/IM/etc these users using the regular avatar picker. TODO: contact the UAS directly given a name of the form First.Last @foo.com.
2012-03-17 15:36:20 -07:00
1a4fdd2666
Moved HandleAvatarPickerRequest from the generic Scene.PacketHandlers to the UserManagementModule where it belongs. No functional changes.
2012-03-17 10:48:22 -07:00
d87a5758fb
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-03-17 10:00:43 -07:00
33c14cb107
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 10:00:11 -07:00
41a0c850f8
added a new UbitMeshing module so i can mess it...
2012-03-17 09:27:56 +00:00
4a57112f19
Add osGetInventoryDesc() as per http://opensimulator.org/mantis/view.php?id=5927
...
This allows one to get description data for a given prim inventory item.
Thanks MarcelEdward and GuduleLapointe!
2012-03-17 04:02:23 +00:00
1e4180fc93
Clean up "save iar" help
2012-03-17 02:54:19 +00:00
a4dca88a57
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-03-16 13:08:27 -07:00
a2009ffe2e
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.
2012-03-16 13:08:05 -07:00
ae8e089b9c
some more work on costs
2012-03-16 15:33:49 +00:00
59b6f6a6e0
minor: reuse threadpool count we just fetched instead of fetching it again
2012-03-16 03:56:56 +00:00
bece2023e7
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-16 03:52:13 +00:00
9497a7c7bd
refactor: separate out console and status report generation parts of XEngine
2012-03-16 03:32:14 +00:00
922d8c9312
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-03-16 03:28:17 +00:00
6e8f80f1ab
Improve threadpool reporting to "show threads" console command (also gets printed out periodically)
2012-03-16 03:26:47 +00:00
05bb2e4275
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-03-15 20:22:59 -07:00
05a1493fff
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:22:26 -07:00
421b562a04
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-16 02:43:33 +00:00
aa881e8065
Allow comments to appear in command scripts (e.g. shutdown_commands.txt).
...
These can start with ; # or //
2012-03-16 02:07:26 +00:00
8550a4a07e
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-16 01:46:21 +00:00
c386b68373
Aggregate script execution times by linksets rather than individual prims.
...
This is for the top scripts report.
2012-03-16 01:31:53 +00:00
7df4a544fe
Fix owner name display in "Top Colliders" and "Top Script" region reports.
2012-03-16 00:53:36 +00:00
a4b01ef38a
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-16 00:34:30 +00:00
0548eeb571
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-03-15 16:03:33 -07:00
18d1d6d3b4
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:03:09 -07:00
df144eb9e2
Revert "Revert "More hacking around viewer bug""
...
This reverts commit e5612553ce
2012-03-15 14:55:25 -07:00
f52917288a
These SLURLs are very confusing! -- reverting the revert. Hack is, indeed, needed.
...
Revert "Revert "Hack around https://jira.secondlife.com/browse/VWR-28570 ""
This reverts commit 5a9560db28
2012-03-15 14:54:25 -07:00
5a9560db28
Revert "Hack around https://jira.secondlife.com/browse/VWR-28570 "
...
This reverts commit 697ac7fd9d
2012-03-15 14:36:48 -07:00
e5612553ce
Revert "More hacking around viewer bug"
...
This reverts commit 10731732b4
2012-03-15 14:36:29 -07:00
8b5298a62e
Protect the scriptmodulecomms interface.
2012-03-15 13:37:43 -07:00
402ff75d78
Adds a new script command 'modInvoke' to invoke registered functions
...
from region modules. The LSL translator is extended to generate the
modInvoke format of commands for directly inlined function calls.
A region module can register a function Test() with the name "Test".
LSL code can call that function as "Test()". The compiler will translate
that invocation into modInvoke("Test", ...)
2012-03-15 13:16:02 -07:00
fd4ad82367
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-03-15 11:06:08 -07:00
10731732b4
More hacking around viewer bug
2012-03-15 11:05:43 -07:00
697ac7fd9d
Hack around https://jira.secondlife.com/browse/VWR-28570
2012-03-15 10:17:02 -07:00
b4adf652e7
Merge branch 'ubitwork'
2012-03-15 10:24:40 +01:00
897dc5e77e
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
2012-03-15 10:55:44 +00:00
15ad5f492b
Playing with object costs CAPS ...
2012-03-15 10:25:18 +00:00
051ea18a4f
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-03-15 04:20:19 +00:00
84ca09f7c5
added ObjectPhysicsProperties http event message to send viewer that data. For now on caps/EventQueue, and still only used on a material change...
2012-03-15 02:24:13 +00:00
acb1355ff2
Remove property/field duplication in ScriptInstance where it's unnecessary.
2012-03-15 02:02:31 +00:00
2d32401e23
Simplify some logic in the ScriptInstance constructor - running is set to false in both if/else branches
2012-03-15 01:32:16 +00:00
f0c1746063
minor: correct indentation levels
2012-03-15 01:26:38 +00:00
5ddda89238
Remove duplication of m_RunEvents and Running
2012-03-15 00:48:44 +00:00
2f81e53f63
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-15 00:20:47 +00:00
12cebb12d5
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-15 00:06:52 +00:00
cf9ebd301c
bug fixs, added a default physics shape estimator based on being a mesh or not and use it on unlink if new root part as type none. Viewer doesn't get updated even with fullupdates we are missing something still
2012-03-14 18:24:04 +00:00
d1daea0108
Allow llTeleportAgent to teleport gods when not in god mode
2012-03-14 19:21:25 +01:00
c0f70d17fc
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
2012-03-14 11:33:51 +00:00
d6dd3c42d1
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-03-13 20:16:19 -07:00
479dd65a63
Teleports: bounce off repeated requests of teleporting the same agent. Some scripts do that, and that fails the whole thing.
2012-03-13 20:15:38 -07:00
5a09572393
Minor sanity check on simulation agent handler (content type)
2012-03-13 20:14:51 -07:00
95ec96bf86
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-14 00:29:36 +00:00
8388182707
Implement llSetPrimitiveParams for physics shape and material. Add
...
llSetPhysicsMaterial support.
2012-03-13 22:20:12 +01:00
d4e6834f99
Hook up the new cap to the SOP changes
2012-03-13 20:49:16 +01:00
f53c322b7e
Merge branch 'ubitwork'
2012-03-13 20:21:26 +01:00
577d07aa44
missed commit of extraphysics parameters serialization..
2012-03-13 19:51:41 +00:00
741badc4fa
let PhysicsShapeType none remove physics remove physics on child parts **UnTested**
2012-03-13 19:24:41 +00:00
bf2a5508de
bug fix
2012-03-13 19:17:32 +00:00
f415eb84e1
Implement the cap to send extra physics params to the viewer. Not functional
...
yet because the parameters are not actually stored anywhere yet.
2012-03-13 20:06:39 +01:00
923db53975
let checkheartbeat work ( bad ideia :p ) commited by mistake my local copy with it disabled...
2012-03-13 18:10:43 +00:00
5086fe9176
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-03-13 18:00:27 +00:00
3de3b9e63c
initial suport for ExtraPhysical parts parameters. Reading from llclientView to SOP including SOPserialization (not to databases). No action on physics still. No send to viewer, etc
2012-03-13 17:56:32 +00:00
37828c9b9a
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-03-13 08:07:11 -07:00
4eb2605c79
Datasnapshot: added "secret" to the registration/deregistration query so that data providers can verify authenticity if they want.
2012-03-13 08:06:30 -07:00
22e0cc09ac
Ensure child prims of a phantom prim are marked as phantom
2012-03-13 13:12:14 +01:00
ebcd4910a2
Refactor, move OjectChangeData into it's own file and rename
...
ObjectChnageWhat what into ObjectChangeType change. What is
no name for a variable or type!
2012-03-13 13:08:32 +01:00
25592bbd85
Add max thread and min thread information to "xengine status" region console command
2012-03-12 21:16:05 +00:00
e0dd38f672
Rename the stream extension method WebUtil.CopyTo() to WebUtil.CopyStream().
...
.NET 4.0 added the method Stream.CopyTo(stream, bufferSize). For .NET 3.5
and before, WebUtil defined an extension method for Stream with the signature
Stream.CopyTo(stream, maxBytesToCopy). The meaning of the second parameter
is different in the two forms and depending on which compiler and/or
runtime you use, you could get one form or the other. Crashes ensue.
This change renames the WebUtil stream copy method to something that
cannot be confused with the new CopyTo method defined in .NET 4.0.
2012-03-12 10:07:04 -07:00
13fb582c12
DataSnapshot: renamed gridserverURL to gatekeeperURL, and normalimzed the capitalization of 'name' to lower case, also in the same <grid> section.
2012-03-12 07:55:17 -07:00
edc8a15487
Restore duplication of the SL bug where linking phantom to solid lets the
...
child prim remain phantom
2012-03-12 14:06:39 +01:00
bfd38ecad4
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-03-12 11:45:38 +01:00
139c0665cf
Add AVATAR_MALE flag to return values of llGetAgentInfo
2012-03-12 11:44:07 +01:00
a35e00e81e
allocate UndoRedoStore only on demand
2012-03-12 07:50:14 +00:00
b5e172677d
ubitode prim select was not doing phantom case
2012-03-12 07:46:20 +00:00
6c4c500ee4
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-03-12 06:58:38 +00:00
2a17dafa04
missing file in ubitODE
2012-03-12 06:52:03 +00:00
44ce068d6c
Allow RLV to redirect received folders to #RLV folder
2012-03-11 18:21:47 +01:00
925295f3ab
ubitOde also knows a bit more about physical phantom
2012-03-11 12:33:59 +00:00
7832889437
Physical phantoms testable with chOde. Volume detection was changed and also needs testing. Started making it more independent of phantom acording to new sl. ** 99.999...% UNTESTED ***
2012-03-11 11:01:38 +00:00
dab7e03584
bug fix (??) in sog copy()
2012-03-11 08:43:53 +00:00
43dc0ee020
more phantom physics ( chODE and a fix in manager physicsactor
2012-03-11 07:44:34 +00:00
21a76a619f
initial steps to support physical phantoms
2012-03-11 06:32:06 +00:00
b0f01cec98
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-03-11 03:57:59 +00:00
824eb7ed20
Added osGetGridGatekeeperURI()
2012-03-10 19:51:28 -08:00
1f7c0c2ea0
cleanup + comments
2012-03-11 03:28:17 +00:00
53bda83cc2
cleanup + comments
2012-03-11 03:14:15 +00:00
80160c128d
coments change..
2012-03-11 02:58:56 +00:00
dba0d79833
minor changes on updates control on doChangeObject(..)
2012-03-11 02:55:39 +00:00
4f7ec1d691
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
2012-03-11 01:55:36 +01:00
f292e19689
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Application/OpenSimBase.cs
2012-03-11 02:29:43 +00:00
e4e6f781a6
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-03-11 00:53:53 +00:00
0a4056ad22
Merge branch 'ubitwork'
2012-03-11 01:47:36 +01:00
ab235abc46
Changed undo redo internals. moved exec code to UndoState.cs from sop that now only sees a unified UndoRedoStore class, added size limit on buffers so only last 5 undo/redo are kept. (5 is hardcode like it was ) ***UNTESTED***
2012-03-11 00:36:34 +00:00
908abb1c3d
BIG MESS. changed Iclient interface so only one event is used to inform scene about position scale or rotation change by client (others can be added). Its served at SceneGraph that does permition checks, undostore and sends down to SOG. changed values are stored in a class (ObjectChangeData) and what is changed as a enum (ObjectChangeWhat) with bit fields and 'macros' of this for better readability (at top of scenegraph.cs lasy to find better place for now) this can be extended for other things clients changes and need undo/redo. SOG process acording to what is changed. Changed UNDO/redo to use this also (warning is only storing what is changed, previus stored all, this must be checked for side efects. to save all PRS change commented line in scenegraph). Still have excessive calls to ScheduleGroupForTerseUpdate. **** UNTESTED ****
2012-03-10 20:32:19 +00:00
291dc39691
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-03-10 08:09:43 -08:00
05e821c444
Fix TestSaveOarNoAssets() by not launch a no-assets request on a separate thread.
...
This was previous behaviour anyway.
2012-03-10 03:11:28 +00:00
6e26f17923
minor: In IAR save, log when we start adding the control file rather than saying afterwards that we added it.
2012-03-10 02:13:17 +00:00
5507752dc5
minor: rearrange some save oar messages so they say what they're about to do rather than what they've just done.
2012-03-10 02:11:30 +00:00
1693799623
On OAR saving, try fetch assets serially rather than firing all the requests at the asset service at once.
...
This may (or may not) improve reliability for http://opensimulator.org/mantis/view.php?id=5898
Quick tests show that save time is the same.
2012-03-10 02:03:07 +00:00
d6ebf2d6ca
Add ability to specify a default estate to be used when creating regions.
...
This is configured in the new [Estates] section of OpenSim.ini.
If a default estate is configured then all new regions are automatically joined to it instead of asking the user.
If the default estate does not already exist then it is created.
Current default behaviour remains the same - the user is asked for estate details when necessary.
Thanks to Frenando Oliveira for the patch which I adapated further.
2012-03-10 01:27:05 +00:00
7b8e9d88e3
Serialize all web requests to a particular host:port pair; only applied to the PostToService variants.
2012-03-09 16:53:51 -08:00
bdc968f1fc
Factor out common default animations code into SLUtil. LLClientView now makes use of the SLUtil copy via a method rather than each LLClientView loading a separate copy.
...
As per opensim-users mailing list discussion.
2012-03-09 23:57:24 +00:00
3dbf754651
Merge branch 'master' into careminster
2012-03-09 23:00:24 +00:00
5c5a493791
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2012-03-09 22:59:23 +00:00
35f2479858
fix for NPC not playing internal animations
2012-03-09 22:58:59 +00:00
a58152bd2a
More on inventory transfer hold ups:
...
- Added an inventory cache for caching root and system folders
- Synchronized the remote inventory connector, so that all the remote inventory calls are serialized
This will not make much difference in the hold ups. We'd have to move the FireAndForget high up to AddInventoryItem, but that opens up a can of worms regarding the notification of the recipient... the recipient would be notified of the offer before the items are effectively in his inventory, which could lead to surprises.
2012-03-09 12:59:24 -08:00
81869c4a3f
More on HG inventory transfers. Move the FireAndForget higher up.
2012-03-09 09:48:12 -08:00
0e5e324a2c
ubitOde bug
2012-03-09 17:20:49 +00:00
e83a2181d0
on linking update linked parts physical flags acording to new parent ones ( untested )
2012-03-09 17:19:10 +00:00
13f340077c
let chode and ubitode find ode.dll on windows
2012-03-09 04:19:39 +00:00
f545d669de
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-03-08 19:32:21 -08:00
7db5ba7702
More on the freeze on HG inventory transfers: spawn a threadlet on the functional asset posts so that the client threads doesn't freeze (but the network posts are serialized).
2012-03-08 19:31:53 -08:00
06dda14505
Simplify minimap coarse location code by just reference SP.AbsolutePosition
...
This is rather than checking whether the avatar is sitting and doing its own calculation.
2012-03-09 02:50:57 +00:00
205c36d3a4
Get rid of unnecessary ParentID == 0 check on SP.Get_AbsolutePosition since this is handled by the necessary ParentPart check
2012-03-09 02:44:08 +00:00
94e58ff6b9
Use SP.ParentPart instead of ParentID in places where it's more efficient (saving extra null checks, etc.)
...
However, it looks like we should retain SP.ParentID since it's much easier to use that in places where another thread could change ParentPart to null.
Otherwise one has to clumsily put ParentPart in a reference, etc. to avoid a race.
2012-03-09 02:38:11 +00:00
b454326273
refactor: cleanup SP.HandleAgentSit so that everything is done within one if (part != null), rather than having unnecessary multiple checks
2012-03-09 02:33:48 +00:00
c22446ede0
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-03-08 18:29:08 -08:00
8a34d1b710
HG inventory/asset transfers: serialize asset posts. I'm using the same pattern as suggested in the patch mantis #5921 . Testing it in this smaller context to see how it works.
2012-03-08 18:28:46 -08:00
73c47f7205
Remove a race condition from SP.Set_AbsolutePosition where we assume the ParentPart is still not null if the ParentID != 0
...
Another thread could come in and stand the avatar between those two instructions.
2012-03-09 02:22:22 +00:00
e1be1c5263
Merge branch 'ubitwork'
2012-03-09 02:11:25 +01:00
e5786ba043
more changes on undo/redo group scaling seems to work better
2012-03-09 02:56:14 +00:00
99c64f0645
Fix a merge artefact
2012-03-09 02:45:53 +00:00
dc5f831ca8
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2012-03-09 02:39:14 +00:00
05cdf9bda9
more changes in undo/redo. Basicly moved control to llclientview.cs. later we can move back to a dispatcher function on SOG that handles the several cases( in a viwer independent way (?)) and calls current exec funtions. made cosmetic changes replacing decimals by hexs so bits are easier to read. Changed behavour of case 12 and 28 ( 0x0c and 0x1c) to make identical to 0x0d and 0x1d ( scale only and scale plus position). DOn't see 12 and 28 in use... cases 1c and 1d still broken
2012-03-09 01:53:58 +00:00
42a7a85062
FireAndForget scripted rez - port from Avination
2012-03-09 00:57:49 +00:00
ac577bf606
Merge branch 'master' into careminster
2012-03-09 00:56:52 +00:00
df4b06aed1
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-03-09 00:20:10 +00:00
034c9d6bcc
Merge branch 'xassetservice'
2012-03-09 00:19:42 +00:00
3c5bd7c35a
minor: move some compression related var setup inside compression if/then switch
2012-03-09 00:16:49 +00:00
0cbdf9dad2
Put big fat EXPERIMENTAL warning in xassetservice database plugin
...
This should not currently be used in any circumstances except for experimentation.
Database tables used by this plugin can still change at any time with no migration path.
2012-03-09 00:05:34 +00:00
9c8ef96301
Fixes mantis #5923
2012-03-08 15:55:43 -08:00
675d40357c
Hold a ref to the prim we're sat on rather than querying scene each time
...
the check for significant is carried out. Prevents a deadlock condition.
2012-03-08 19:14:34 +00:00
b0fc96c17d
Merge branch 'master' into careminster
2012-03-08 19:10:22 +00:00
3089344114
Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster
2012-03-08 19:09:11 +00:00
b8c27252c1
Hold a ref to the prim we're sat on rather than querying scene each time
...
the check for significant is carried out. Prevents a deadlock condition.
2012-03-08 18:31:58 +01:00
fa2a64564a
Move "change region" command into general category
2012-03-08 02:24:37 +00:00
dfdb0e140c
Uses shorter AddCommand form for "show estates"
2012-03-08 02:23:52 +00:00
650d761c06
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-03-08 02:17:45 +00:00
430304c176
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-03-08 01:59:00 +00:00
749c3fef8a
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-03-08 01:51:37 +00:00
3d3b81e676
changes on undo/redo (untested/incomplete). Think we may consider moving this mfrom SOP to client side. At least does seem to work a bit better ( again there wwas a issue on sop.copy )
2012-03-07 07:31:26 +00:00
6bdea15ecf
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-03-07 01:11:37 +00:00
f8b1b86c3a
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
2012-03-07 01:05:32 +00:00
a1b28a61a6
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2012-03-07 01:04:09 +00:00
7769362687
Always zero the PhysActor on dupes to prevent side effects on the orignal prim
2012-03-07 01:03:26 +00:00
5884d08062
Fix merge issue
2012-03-07 00:58:01 +00:00
caa19862fa
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
2012-03-07 00:51:59 +00:00
f3e04beb2e
Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster
2012-03-07 00:51:24 +00:00
f3678d217f
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-03-07 00:31:18 +00:00
23aba007dd
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-07 00:04:24 +00:00
3376979923
Remove static m_MainInstance in LocalGridServiceConnector.
...
I believe this was originally required back when there could be two LocalGridServiceConnectors but this is no longer the case.
Having such statics makes performance testing much more difficult since they prevent GC of objects unless static references are explicitly nulled.
2012-03-06 23:51:50 +00:00
98251cdab3
Add sensor, dataserver requests, timer and listener counts to "xengine status" command.
...
This is for diagnostic purposes.
2012-03-06 23:21:17 +00:00
e9d8eb5a27
Remove unnecessary explicit ElapsedEventHandler in SimReporter
2012-03-06 22:31:25 +00:00
0be4ed3df4
Prevent scripted region crossings from crashing with prim limits enabled
2012-03-06 22:27:01 +01:00
17b1454d6f
Null PhysActor on SOP.Copy() to prevent clobbering the original one
2012-03-06 20:20:12 +01:00
0f4cdc0c5b
Explictly close down the StatsReporter so that we can shutdown its timer
...
This is another step necessary for the scene to be garbage collected between performance tests
2012-03-06 19:05:32 +00:00
de03d1ece0
Removed some whitespace errors - don't be naughty, don't use hard tabs!
...
Also removed commented code block.
2012-03-06 09:56:19 +01:00
cca94aaefc
make copied parts have diferent LocalIds than original. More building control for ubitODE. for all let physics know about linking of physical parts. Assume UNTESTED
2012-03-06 05:13:39 +00:00
f33654b62f
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-03-06 03:07:48 +00:00
b3449e998a
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-06 02:30:22 +00:00
a92153ed88
Get all test methods in OpenSim.Region.ScriptEngine.Tests.dll to report that they're running
2012-03-06 02:21:19 +00:00
85198a45cb
Fix off by one error in script error reporting.
2012-03-06 02:01:47 +00:00
1dc03e5c4f
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-06 01:47:43 +00:00
5004d0ad09
Merge branch 'master' into careminster
2012-03-06 01:45:20 +00:00
d44b7c486a
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:27:30 +00:00
af46650bae
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
2012-03-06 01:18:37 +00:00
aa613dab1f
Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster
2012-03-06 00:29:43 +00:00
5e77973667
Merge branch 'master' into careminster
2012-03-06 00:29:25 +00:00
413bc1e77e
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:27:49 +00:00
Justin Clark-Casey (justincc)