Justin Clark-Casey (justincc)
9ffc2c1062
minor: resolve some mono compiler warnings
2012-05-03 01:56:24 +01:00
Justin Clark-Casey (justincc)
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
Melanie
2af7f50f26
Stabilize sit position on region crossing
2012-05-03 02:07:55 +02:00
Melanie
9f9693dab8
Clear permissions given to the object we stand up from
2012-05-03 01:18:51 +02:00
Melanie
8b1cc0dd29
Merge branch 'avination'
2012-05-03 00:15:45 +02:00
UbitUmarov
a135e51d23
Improved sitted avatars crossings ( plus tests on vehicles)
2012-05-02 22:08:09 +01:00
Melanie
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
Justin Clark-Casey (justincc)
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
Melanie
8ef2a2b7de
Bogus change to get a version number
2012-05-02 00:35:52 +02:00
Melanie
58d460542d
Merge branch 'avination'
2012-05-02 00:33:56 +02:00
Melanie
82197c87a2
Merge branch 'ubitwork' into avination
2012-05-02 00:33:37 +02:00
Melanie
e6e12c2d42
Merge branch 'avination'
2012-05-02 00:32:28 +02:00
Melanie
98e9f22544
Preserve attachment rotation on objects rezzed via a script. Makes toasters
...
work right, finally.
2012-05-02 00:29:56 +02:00
Justin Clark-Casey (justincc)
a29f7f7551
Remove some test code that accidentally crept in with 9d2e1c67
2012-05-01 23:25:30 +01:00
Justin Clark-Casey (justincc)
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
Melanie
fc3cf2b5a3
Fix saving of attachment positions
2012-05-01 23:21:28 +02:00
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
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
Melanie
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
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
cc482d2d56
Add TBG Renfold to contributors
2012-04-30 17:39:11 +01:00
TBG Renfold
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
Justin Clark-Casey (justincc)
d0598c63f3
refactor: Simplify by combining SafeSendControlsToScripts() from fe8e835
into SendControlsToScripts() (instead of SendControlToScripts()).
2012-04-30 17:33:08 +01:00
Oren Hurvitz
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
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
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
UbitUmarov
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
UbitUmarov
be176b1e49
ubitode fix inertia for same cases. Added a nasty lock on llGetCenterOfMass and simulate
2012-04-29 08:24:41 +01:00
UbitUmarov
84b5b3e89b
llGetGeometricCenter...
2012-04-29 06:39:09 +01:00
Melanie
ad12b5df49
Merge branch 'master' into careminster
2012-04-29 02:23:54 +01:00
UbitUmarov
c7c0d5558b
remove repeated set of group rotation to physics
2012-04-29 01:00:46 +01:00
UbitUmarov
df9935273f
SOG bug fix in group rotations updates
2012-04-29 00:41:51 +01:00
Melanie
174fa4a70f
Merge branch 'avination'
2012-04-29 01:33:40 +02:00
UbitUmarov
dd745f60c2
fix llGetCenterOfMass ( checked with ubitODE only)
2012-04-28 21:36:38 +01:00
Justin Clark-Casey (justincc)
8380166251
Comment out debug [ASYNC DELETER] messages for now.
2012-04-28 00:39:40 +01:00
Justin Clark-Casey (justincc)
cd755fe598
Remove mono compiler warning. Adjust message log to error from info
2012-04-28 00:31:11 +01:00
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
2bad430ed8
Put scene object related console commands into new "Objects" help category rather than "Regions"
2012-04-28 00:08:04 +01:00
Justin Clark-Casey (justincc)
ab71779221
Revert "Revert "Implement bulk inventory update over CAPS (not recursive by design,""
...
This reverts commit a90b0e302c
.
Sorry, accidentally reverted this completely by mistake, reverting the revert.
2012-04-27 23:54:45 +01:00
Justin Clark-Casey (justincc)
737e177163
Revert "Log the full exception when errors occur in BaseHttpServer"
...
This reverts commit e31e7c68c8
.
Applied for patch assessment and accidentally committed too early.
2012-04-27 23:46:46 +01:00
Justin Clark-Casey (justincc)
a90b0e302c
Revert "Implement bulk inventory update over CAPS (not recursive by design,"
...
This reverts commit 6e7f13a72d
.
2012-04-27 23:46:33 +01:00
Justin Clark-Casey (justincc)
da29cbccfa
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-04-27 23:39:13 +01:00
Justin Clark-Casey (justincc)
d25469f66e
Add flags information (phantom, physics, etc.) to "show object" and "show part" console commands
2012-04-27 23:38:25 +01:00
UbitUmarov
e48fa38ff5
Oooops don't hover underground but do hover
2012-04-27 23:18:54 +01:00
UbitUmarov
f5cb403e7e
reorder priority of vehicle hover flags
2012-04-27 22:59:57 +01:00
Melanie
dcbcbd697f
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
2012-04-27 22:28:09 +01:00
Oren Hurvitz
e31e7c68c8
Log the full exception when errors occur in BaseHttpServer
2012-04-27 21:52:04 +01:00
BlueWall
db566fbb09
Fix prebuild.xml
...
adding a reference to a dll requires 'path="..."'
2012-04-27 16:17:46 -04:00
Oren Hurvitz
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
Oren Hurvitz
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