6ea82ad48a
Make some existing reprioritization values changeable outside the scene for test purposes, and use more consise property syntax.
...
No functional change.
2014-08-14 01:16:58 +01:00
dabb8e62f4
Update OpenID server handler with proper interface. fixes http://opensimulator.org/mantis/view.php?id=7301
2014-08-13 20:06:07 -04:00
bc0895c758
On entity transfer of scene presence, replace polling sleep in SP.WaitForUpdateAgent() with a triggered event instead.
...
Rapid polls are more expensive than triggered events (several polls vs one trigger) and may be problematic on heavily loaded simulators where many threads are vying for processor time.
A triggered event is also slightly quicker as there is no maximum 200ms wait between polls.
2014-08-13 23:45:51 +01:00
0d2a25b477
Remove redundant origin region lock in SP.CompleteMovement()
...
This is already going to be correctly set by WaitForUpdateAgent() earlier on in that method, which is always called where a callback to the originating region is required.
2014-08-13 23:11:32 +01:00
0db6f3a2bd
Only set up the UnackedMethod for an outgoing message if that message is actually meant to get an ack (because it's reliable).
2014-08-13 22:57:14 +01:00
21176a3a90
Terminate 'nothing' behaviour (and potentially others) by signalling using an event rather than polling connection state every 100ms
...
This kind of polling is very expensive with many bots/polling threads and appears to be the primary cause of bot falloff from the client end at higher loads.
Where inbound packet threads can't run in time due to contention and simulator disconnect timeout occurs.
2014-08-13 22:38:27 +01:00
1bd13155e6
put back baked textures debug msgs at start of validatebaked...
2014-08-13 20:43:26 +01:00
f1f935ed95
Add 'server' stats information to pCampbot, as used elsewhere in OpenSimulator
...
This adds the "show stats", "stats record", etc. commands and information on available Threadpool threads, etc.
It also adds the Watchdog which logs warnings if time between executions is unexpectedly large.
2014-08-13 19:53:42 +01:00
483afe6867
remove creative hack and try to fix
2014-08-13 18:52:13 +01:00
3f0138c967
Merge branch 'master' into ubitworkmaster
2014-08-13 15:50:12 +01:00
92117d48af
remove the region where we are root from the list of Neighbours and
...
childSeeds
2014-08-13 03:54:13 +01:00
444b41b22a
reverted last change since it did nothing usefull
2014-08-13 03:11:55 +01:00
0a1ffad07c
TEST do a Animator.UpdateMovementAnimations() when making root ( in
...
validate appearence just before sending animation
2014-08-13 03:01:49 +01:00
b96f951a6a
Merge branch 'ubitworkmaster'
2014-08-13 03:05:54 +02:00
ecae45a21e
Revert "make HandlerRegionHandshakeReply processing async and delay it a bit. This"
...
This reverts commit 30f00bfb14
2014-08-13 03:05:25 +02:00
cf48b814eb
remove HandleCompleteMovementIntoRegion delay hack from llUDPserver. If we
...
need a delay, we need to do it at end of HandleUseCircuitCode before
feeding pending packets (including that one) into processing queue.
2014-08-13 01:42:16 +01:00
0760fa3106
process AgentUpdates in order with rest of packets. Only give higher priority to chat
2014-08-13 00:17:03 +01:00
20b3cab5d1
take agentUpdate checks out of llUDPserver (disabling useless debug) and
...
do it only where its supposed to be done..
2014-08-12 23:57:41 +01:00
f811efde85
do the significance test invalidation at MoveAgentToRegion
2014-08-12 22:36:17 +01:00
b9224a70c4
no need to go from cos into squared sin when just abs of cos is as good
2014-08-12 22:27:50 +01:00
dbbfaf3ac3
force AgentUpdate after CompleteAgentMovement to pass by significance test
2014-08-12 22:17:15 +01:00
96d89c5906
Merge branch 'ubitworkmaster'
2014-08-12 22:46:28 +02:00
3e7f475e58
fix the damm thing
2014-08-12 21:08:01 +01:00
bf269c871a
use Vector3.normalize in place of util.GetNormalize
2014-08-12 20:59:36 +01:00
c7e3e59953
try no send current LookAt, remove redundant incomplete position height
...
check
2014-08-12 20:37:34 +01:00
f1cec684e2
For pCampbot, set max number of permitted connections to an endpoint to int.MaxValue
...
This is to avoid issues where many bots connect to a single end point with multiple regions, where each region requires a long-lived poll connection for each bot.
2014-08-12 18:46:09 +01:00
4997a9e87a
fix VS creative indentation
2014-08-12 18:42:18 +01:00
a0f26dc6ec
change XMLIrpgGroups attach to events, using the more correct
...
\addons\Groups\... model
2014-08-12 18:28:01 +01:00
37921c66e5
Avination's Dynamic Floater Module. This works with Singularity viewer only.
...
It's WIP in that a dialog builder is on it's way. For now, the XML needs to
be handmade.
2014-08-12 01:04:29 +02:00
22d472e34a
Merge branch 'ubitworkmaster'
2014-08-11 18:45:39 +02:00
2cc8e90bd2
remove a land.SendLandUpdateToClient() since its now done for all cases in
...
completmovement and not only that specific one
2014-08-11 02:51:34 +01:00
ba33d78af9
dont do ParcelCrossCheck() on child avatars
2014-08-11 01:44:12 +01:00
0eaabef1dc
Fix a condition check
2014-08-11 02:31:29 +02:00
519df0d2a3
Fix a condition check
2014-08-11 02:30:09 +02:00
036017bba7
Make texture anims work right on singu
2014-08-11 02:08:17 +02:00
01e381fa33
Make texture anims work right on singu
2014-08-11 02:07:23 +02:00
e860dd33fa
remove confusing defonly control
2014-08-11 00:54:30 +01:00
306875fc61
... one day..
2014-08-11 00:49:11 +01:00
9217d5ca31
will get there..
2014-08-11 00:44:34 +01:00
0a9925ff4a
validatebaked still not ok
2014-08-11 00:28:14 +01:00
67a91ee314
make sensors detect sitting avatars also by the distance to the root prim
...
of the object as sl does (as sl avatar needs to be in the arc)
2014-08-10 22:13:39 +01:00
0e809ab265
LSL llListFindList fix: check types as well as content. Items must be same type
...
to be found.
2014-08-10 22:01:39 +02:00
4707c48828
LSL llListFindList fix: check types as well as content. Items must be same type
...
to be found.
2014-08-10 22:00:01 +02:00
7fcd1068e7
TEST move parcelRegionCross to EntityTransferModule cross so it works on
...
sitting avatars. (may be bad) comented out sending root avatars
information to the child that was just a root it should have it all
already. Dont turn a sitting avatar physical, that needs to be a stand at SOG
2014-08-10 20:09:02 +01:00
c0378d5430
actually let delay match throttles as original design
2014-08-10 16:36:20 +01:00
ebc18a80bf
OutgoingPacketHandler can not be paced by hits on SendPacket()
2014-08-10 14:49:58 +01:00
a363ed484e
Merge branch 'master' into ubitworkmaster
2014-08-10 13:02:39 +01:00
c84a3c3630
also on other case
2014-08-09 16:22:46 +01:00
601c50dc1e
return even zero costs ( prims on other regions )
2014-08-09 16:19:07 +01:00
52dc27991f
Give extra info on the call stack when SQL errors happen
2014-08-09 16:25:40 +02:00
2eb1c1c377
move from RegisterInventoryServiceHandlers to
...
RegisterRegionServiceHandlers what belongs there ( readabilitly only )
2014-08-09 15:15:27 +01:00
dc7b9c1cc3
dont do for children what is for growups ( root agents) ( needs check)
2014-08-09 15:12:02 +01:00
74efe1e393
explicitly force a reset to the event on creation
...
#Please enter the commit message for your changes. Lines starting
2014-08-09 15:08:21 +01:00
ddfb05e57a
Comment out stupid XEngine-bound message about script vs non-script startup, it's annoyed me for a long time. Comment out periodic stats as well, they've never been useful to us and just cause console spew.
2014-08-09 05:31:09 +02:00
8738445eb7
Move the inventory request lock introduced in git master a58152bd to HGInventoryBroker to preserve that behaviour there but allow 2 simultaneous inv requests (chiefly WebFetch) rather than 1
...
This lock serialized all requests and made the inventory throttling in WebFetch redundant.
By moving this lock, two simultaneous requests may now take place which may help with http://opensimulator.org/mantis/view.php?id=7054
2014-08-09 00:52:51 +01:00
30f1b424bb
Change RootRotationUpdateTolerance from 0.01 to 0.1 in code as well.
2014-08-08 23:47:53 +01:00
36f01dce2d
Change MaxPoolThreads default in code as well from 15 to 300
2014-08-08 23:47:03 +01:00
ebbf236abc
of course.. bug..
2014-08-08 02:25:31 +01:00
9aa6389b8b
lock set appearence during ValidateBakedTextureCache there seems to be a
...
overlap in same cases
2014-08-08 02:22:18 +01:00
998e3d435a
DANGER back to right current max number of wearables ( TP out of regions
...
with this may kill old regions)
2014-08-08 01:39:19 +01:00
c6cdd597f3
add wearables array size checks on unpack
2014-08-08 01:32:16 +01:00
2a457c862e
Merge branch 'master' into ubitworkmaster
2014-08-08 00:52:41 +01:00
16bcd86dfb
back to max 15 wearables until its safe ( and before i kill other grid
...
regions)
2014-08-08 00:01:49 +01:00
a8e49a4538
max 16 for testing
2014-08-07 23:33:48 +01:00
4ae0bb7df1
add limites checks on wearables size, revert to max 15 for
...
compatibility/testing
2014-08-07 23:29:31 +01:00
5628c0bcd6
Reduce delay time on regin handshake reply to speed up terrain sending.
...
Terrain IS more important than avatar!
2014-08-07 23:54:38 +02:00
7486684436
update the max number of texture faces and wearables to current values.
...
This should be safe now..
2014-08-07 22:47:29 +01:00
73cbdf2c6b
bug
2014-08-07 22:00:23 +01:00
6d372f3d9e
remove annoying debug msg . still a lot of spam, but to remove later
2014-08-07 21:37:11 +01:00
f788947594
make grid baked textures override the ones on appearance. Due to bug
...
somewhere they are always bad at ValidateBakedTextures entry. ( even if
they where good and on assets cache we whould need to generate the
cacheID hash )
2014-08-07 21:24:52 +01:00
38e2e5942c
bug on upload new bakes decision
2014-08-07 19:16:51 +01:00
dfa9ba0937
minor clean, dont check for cache if we aren't using it..
2014-08-07 08:47:03 +01:00
1408c9eee7
reply to cached checks with same serial number
2014-08-07 07:55:56 +01:00
a95afb7fc5
bug
2014-08-07 07:36:23 +01:00
12d8ed2dcd
only send to bakedmodule the baked textures :)
2014-08-07 07:08:01 +01:00
b7f24bacce
bugg
2014-08-07 06:09:56 +01:00
c3f9c99fb3
DANGER... changed bakedtextures caching. Assuming grid baking is cache
...
only, reduced number of accesses to it. TESTING
2014-08-07 05:20:45 +01:00
2924d250ab
Fix short help string for show region command.
2014-08-06 21:41:53 -04:00
10a8d2852e
OpenSimExtras
...
Move the experimental extra features functionality into the GridService. This sends default values for map, search and destination guide, plus ExportSupported control to the region on startup. Please watch http://opensimulator.org/wiki/SimulatorFeatures_Extras for changes and documentation.
2014-08-06 17:25:12 -04:00
e36e416637
Fixed crash when using Allowed/Denied Viewers, and the viewer's name is shorter than one of the test strings
...
This fixes http://opensimulator.org/mantis/view.php?id=7294
2014-08-06 19:02:15 +03:00
552b4e45e8
bakemodule didnt like last changes
2014-08-06 05:56:10 +01:00
66dea8fe05
some debug to remove later
2014-08-06 05:17:30 +01:00
bd3d58dd00
try to make the baked textures cache work
2014-08-06 04:54:14 +01:00
78ccadb27e
Add RootPositionUpdateTolerance, RootRotationUpdateTolerance, and RootVelocityUpdateTolerance parameters to [InterestManagement] in OpenSimDefaults.ini
...
These govern when AgentUpdates are sent to observers on position, rotation and velocity changes to an avatar (including the avatar themselves).
Higher values reduce AgentUpdate traffic but at a certain level will degrade smoothness of avatar and perceived avatar movement.
2014-08-06 00:53:14 +01:00
961cb9cc77
refactor: Rename recent new Client*UpdateTolerance to Root*UpdateTolerance for better accuracy and consistency with other similar parameters
2014-08-06 00:35:26 +01:00
e1a5a1f829
apply objectSlamSale to all roots of coalescence objects. replace the
...
single object condition for renaming
2014-08-05 23:25:08 +01:00
3c321e5bb3
dont mess with names and descriptions on coalescence objects. Inventory
...
name can change for inventory purposes only.
2014-08-05 22:49:41 +01:00
2c4908578e
revert to old avn-current code, not using ApplyPermissionsOnRez() till its
...
reviewed/fixed
2014-08-05 21:55:42 +01:00
01780d4dc6
put back a check for null foldedperms
2014-08-05 19:59:21 +01:00
31b5a587a4
Merge branch 'master' into ubitworkmaster
2014-08-05 19:28:56 +01:00
c80322f1e6
dont change agentItem.BasePermissions where avination-current didn't
...
change
2014-08-05 19:03:11 +01:00
6eca2475d4
dont assume that all zero folded perms are to ignore ( coerence with old
...
code in avn-current )
2014-08-05 17:55:30 +01:00
dc2471fedd
Fixed premature closing of the connection in DataSnapshotManager
2014-08-05 19:09:11 +03:00
0e71e3889c
Go back to disconnecting bots in parallel since serially is too slow.
...
However, disconnecting now halts any current connection, with the possible exception of the single currently connecting bot.
2014-08-05 01:37:10 +01:00
fcc665a567
Put pCampbot "disconnect" command on separate thread like "connect" so that we can continue to run status commands whilst bots are disconnecting.
2014-08-05 01:15:07 +01:00
e57e9e95d4
Allow "show bots" pCampbot console command to quickly report status by not locking entire bot list for almost 100% of connection time.
2014-08-05 01:07:08 +01:00
d6890d78ad
Make currently unfiltered EventQueue log messages only appear now at DebugLevel 1
...
This covers event queue setup messages and some outgoing messages (e.g. EnableSimulator)
In my experience these messages are only useful if you really know what they mean and you're looking for them
Otherwise, they're quite spammy.
Event queue DebugLevel 1 is enabled with the "debug eq 1" console command
2014-08-05 00:52:04 +01:00
507a29d581
diference fix
2014-08-04 21:55:58 +01:00
3cca5ec667
check...
2014-08-04 21:52:29 +01:00
3d81f25e34
Revert "start sending terrain in scenePresence after well defined avatar. Minor"
...
This reverts commit 05a2feba5d
2014-08-04 20:32:11 +01:00
05a2feba5d
start sending terrain in scenePresence after well defined avatar. Minor
...
change on significante AgentUpdate check.
2014-08-04 19:57:47 +01:00
8cf945544c
local chat gods bug fix
2014-08-04 00:43:57 +01:00
b07b0ff555
missing child login parcel overlay
2014-08-04 00:16:56 +01:00
14250c776a
missing currentParcelUUID update
2014-08-03 23:44:51 +01:00
bad01fbb41
some mess cleanup
2014-08-03 22:57:08 +01:00
0d71a2bb8f
mess update ( hide avatars )
2014-08-03 22:38:50 +01:00
21aa325883
remove debug msgs at attachments deRez
2014-08-03 19:41:48 +01:00
6b3f10790e
bugg
2014-08-03 19:35:16 +01:00
c2d9a6499a
dont get script states for NPCs on deRez
2014-08-03 19:08:13 +01:00
ca8b0e6a1d
replace debug msgs by others
2014-08-03 19:00:01 +01:00
ed47874197
several debug msgs, need to be removed asap
2014-08-03 18:22:00 +01:00
1a407e2545
Stop deleting objects that have status DIE_AT_EDGE set when they cross regions.
...
This was an OpenSim hack to prevent vehicles from trying to cross.
2014-08-03 17:32:34 +02:00
bcab663ad7
debug...
2014-08-03 06:16:30 +01:00
cc16fe68cc
....
2014-08-03 02:26:39 +01:00
b9443b186e
test...
2014-08-03 02:09:07 +01:00
53e95803a5
test not rezzing attachments on a FireAndForget
2014-08-03 01:20:34 +01:00
9f5e19127d
comment out a debug msg. more on gods being Gods
2014-08-03 00:22:21 +01:00
addca0737c
testing...
2014-08-02 23:38:18 +01:00
009e8ee76c
testing
2014-08-02 23:04:18 +01:00
e87f70e277
god also read local chat
2014-08-02 22:45:28 +01:00
580604c231
let gods see hidden avatars ( test )
2014-08-02 22:32:51 +01:00
35616339f3
remove the groups restrictions for npcs since they do nothing usefull
2014-08-02 21:01:44 +01:00
46da95d1b7
bug hunt: disable group for npc
2014-08-02 19:33:38 +01:00
01981fdf58
dont fire a thread on npc creation keeping the main one just waiting
2014-08-02 18:57:43 +01:00
74447d14cd
add some filters for NPCs
2014-08-02 18:32:28 +01:00
b0864a2f0f
crossing into a hide parcel may work now. Not nice fix.. need get back to
...
this later
2014-08-02 14:17:00 +01:00
de3421b408
Fix typo in log message
2014-08-02 08:21:25 -04:00
20eeeba0d2
initial state change
2014-08-02 03:17:39 +01:00
c11c4c0daa
add a hide check at end of region arrival
2014-08-02 02:26:54 +01:00
46add98071
remove a few more
2014-08-02 01:45:32 +01:00
bdac5058c8
remove some ischild tests
2014-08-02 01:21:24 +01:00
7cec4997db
Fix regression in SimulatorFeatures module that would stop OpenSimulator from starting if no [SimulatorFeatures] section was present in config.
2014-08-01 20:29:25 +01:00
e296f25445
sitting avatars hidding by their position. This is not as SL that uses
...
avatar sitting on root prim. All cases have good and bad situations, this is
simpler. Only SOG position changes triggers checks, rotation alone will
not. ( as happens in other cases ) (UNTESTED, as usual )
2014-08-01 19:52:55 +01:00
ef1f37cf20
handle change of hide avatars flag. Parcel limits edition still need work
2014-08-01 18:59:08 +01:00
cb43dff2dc
remove unnecessary sendparceloverlay
2014-08-01 02:55:34 +01:00
e5f9f064a7
filter local chat from avatars or attachment acording to parcel hide (
...
not fully tested)
2014-08-01 01:43:12 +01:00
0a1e9d731d
work on hide avatars
2014-08-01 00:34:52 +01:00
dfd0c2a54a
If REMOVEAGENTFROMGROUP core groups call fails because requesting agent does not have sufficient permission, return null failure result rather than true.
...
On non-HG this is on the only recognized failure state so we can return more information in the error result.
On HG there are multiple failure states which would require more work to distinguish, so currently return the unsatisfying "Internal Error" like some other existing calls.
2014-07-31 21:32:20 +01:00
6ab463a446
Don't overwrite the null result with the true result is groups service REMOVEAGENTFROMGROUP call has failed because of missing parameters
2014-07-31 21:20:55 +01:00
cac910d401
Add region-side extra feature setting for destination guide
2014-07-31 08:20:06 -04:00
50ed97aa1a
BulletSim: thread safe handling of list of avatars.
...
Fix for 7284 which is an enumeration exception when starting up a region.
2014-07-30 21:49:57 -07:00
a5e9429f2b
MESS: changes in MakeRootAgent and CompleteMovement reordering things.
...
Added sending of land overlay and parcel information. This in order to
only send avatar related information after having its position well
defined and on the right parcel. THIS MAY STILL BE BAD :)
2014-07-31 03:10:50 +01:00
6c4eed5539
Fix bug where calling PUTGROUP on the core groups service without specifying a ServiceLocation would set the group name to an empty string.
...
This should set the ServiceLocation to an empty string instead.
2014-07-31 00:32:35 +01:00
30f00bfb14
make HandlerRegionHandshakeReply processing async and delay it a bit. This
...
delays things like terrain height map sending, giving chance to
completemovent to send more priority information. POssible things on this
should be on other event trigger when its more apropriate
really done.
2014-07-30 21:11:11 +01:00
3ec695e05b
Add Chat module extra feature settings to GridExtraFeatures service
2014-07-30 15:01:26 -04:00
17f9f1c247
restrict other avatar sounds to parcel flags ( untested )
2014-07-30 16:32:25 +01:00
e0d8f42e6b
Simulator Extra Features Service
...
Provide a means for regions to fetch extra features supported by modern viewers from a central location
.
2014-07-30 11:24:39 -04:00
d6dbfd1687
missing file in commit 5fe1f87837
2014-07-30 15:43:54 +01:00
2a2a772408
mute avatar collision sounds if parcel doesnt allow
2014-07-30 15:36:49 +01:00
5fe1f87837
changes to parcels code (still more to to)
2014-07-30 14:53:56 +01:00
a4107cb6c7
In TerrainModule, lock m_perClientPatchUpdates when removing entries.
...
This may have been the trigger CheckSendingPatchesToClients() dictionary out of sync exceptions in today's load test.
Don't need to check ContainsKey() since Remove() returns false on a request to remove a key that it doesn't have
2014-07-29 23:39:10 +01:00
fcf5fb5dfd
Implement "scene debug set root-upd-per" for dropping 1 in N root agent updates except to originator
...
For experimental purposes.
Also corrects a previous bug where each terse update sent was counted rather than each set of terse updates to agents.
2014-07-29 18:54:16 +01:00
0f87a99e54
Add debug mechanism for only sending 1 in N AgentUpdate packets to child agents.
...
Allows experiments in manually reducing updates under heavy load.
Activated by "debug scene set client-upd-per" console command.
In a simple test, can send as few as every 4th update before observed movement starts becoming disturbingly rubber-banded.
2014-07-29 18:09:11 +01:00
ec5f96b272
Persist new land fields for access control
2014-07-29 05:53:40 +02:00
6a0be97974
Correct nomenclature for LLSD messages. LL sure suck
2014-07-29 05:06:53 +02:00
0c2537bb24
Try to plumb the other half
2014-07-29 04:41:38 +02:00
5cd21516a4
Add "debug scene set appear-refresh true|false" to control whether periodic appearance refresh is active.
...
Corresponds to ResendAppearnceUpdates setting in [Appearance] in OpenSim.ini
This was originally implemented to alleviate cloud appearance problems but could be too expensive with large numbers of avatars.
2014-07-29 03:26:14 +01:00
dfa9780c8c
Send new parcel permissions to activate viewer options - done right this time
2014-07-29 04:19:01 +02:00
f54fccba1e
Make it possible to change avatar position update, rotation and velocity tolerances on the fly.
...
This is done via "debug scene set client-pos-upd, client-rot-upd, client-vel-upd".
For testing purposes.
2014-07-29 03:13:10 +01:00
477b5b5623
Add new fields to parcel update
2014-07-29 03:40:05 +02:00
181142c5ce
Change some ORs to assignments as they should be
2014-07-29 02:37:36 +02:00
6b0521d3c9
fix the mess about exclusive fields and flags on land overlay
2014-07-29 01:24:43 +01:00
3654ae8d8c
Allow the "debug scene set physics false|true" command to work when bulletsim physics is running in a separate thread.
...
This will also allow the "disable physics" setting in the region debug viewer dialog to work in this circumstance.
2014-07-29 01:21:15 +01:00
3e1d2df261
change parcel overlay bytes adding LocalSound.. changed others also NEEDS
...
checking
2014-07-29 00:39:08 +01:00
df816b38ac
minor: make "debug scene set" usage command accurate again from last commit f6f7585
2014-07-29 00:20:35 +01:00
f6f7585ec5
Add a "debug scene set child-repri <double>" command that allows child reprioritization distance to be changed on the fly.
...
This governs when child agent position changes are sent to neighbouring regions.
Corresponding config parameter is ChildReprioritizationDistance in [InterestManagement] in OpenSim.ini
For test purposes.
2014-07-29 00:13:29 +01:00
f32bd24a2c
dont mess with sound gain on stop
2014-07-27 17:03:53 +01:00
55df2b317c
dont send packets twice
2014-07-27 12:02:59 +01:00
c3b5a6c2ab
change how sounds work. May be bad.. needs testing
2014-07-27 08:18:27 +01:00
5a7a609683
remove forgotten lines
2014-07-27 08:11:27 +01:00
eb55e69d4a
serialize sound parameters for llLoopSound
2014-07-27 08:08:01 +01:00
9c804466e5
BulletSim: rearrange code for sensing whether shapes have been
...
constructed.
Add routine to check for failed and use that method rather than
checking individual state.
2014-07-26 16:03:43 -07:00
43cf184603
clear script controls on crossing (untested)(possible should be done
...
elsewhere/othe way)
2014-07-26 16:56:21 +01:00
b6af41ec11
dont standup avatar on crossing
2014-07-26 05:59:38 +01:00
4aa55204a2
allow reset default animation to default as core does
2014-07-26 05:27:36 +01:00
327632dc66
Add inventory.<url>.RequestsMade stat.
...
This gives a count of all requests made to the remote inventory service.
This is finer grained than inventory.httpfetch.ProcessedFetchInventoryRequests since such a request can be comprised of many individual inv service calls.
In addition, this will count requests that don't go through the HTTP inventory fetch (e.g. HG, archiving, etc.)
2014-07-26 02:17:04 +01:00
56a623ac0c
Fix issue with TestTextureNotFound in previous commit 1e3027a
...
Stop failure by actually giving the test handler a path instead of null
2014-07-26 01:56:42 +01:00
1e3027afb1
Temporary stop CAPS service points from being added to stats as this can be a huge number.
...
A stop gap solution - a better one may be to improve stats display on simulator-side.
Caps information is still accessible via the "show caps stats by user" and "show caps stats by cap" commands
2014-07-26 01:41:03 +01:00
c0c92a95bf
Add undocumented RemoteRequestTimeout seconds parameter to xinventory requests
...
This is for testing purposes (chiefly http://opensimulator.org/mantis/view.php?id=7054 ) so many not be permanent
Setting this will change the xinventory request timeout from the simulator from the default 100 seconds
2014-07-25 23:06:23 +01:00
8c5c9806d7
Add stats for service endpoints using existing data.
...
For each service endpoint (e.g. posts to the xinventory service), a stat is available which shows the number of requests received and moving average per second
The full name is "service.<http-method>:<path>.requests (e.g. service.POST:/xinventory.requests)
2014-07-25 23:00:41 +01:00
70890e211a
add queue transition code needs review/more testing
2014-07-25 17:33:01 +01:00
fa59cddc28
remove old and dead code that its only making it hard to understand
2014-07-25 13:03:40 +01:00
cc61681484
Revert "Write UDP statistics to the log, not just the console (e.g., "show queues")"
...
Fixes http://opensimulator.org/mantis/view.php?id=7280
It can't be done this way because the stats data needs to show up on the console at all log levels, not just debug.
But this means setting it to log at fatal, which is not appropriate for this stuff in the log.
I understand the desire but this has to be done some other way, perhaps by (yet another) config parameter.
Also, this was already being done with the ClientStatsReport but that also should be done in another way, I think.
This reverts commit 5d53412766
2014-07-25 01:56:41 +01:00
86a9710e77
change previus code, send a NoEvents response back to http server, even
...
if we know there is no one there, so that the server finishes handling
it.
2014-07-24 23:32:39 +01:00
ee951f7a10
EventQueueGetModule: dont reuse queues, we dont know whats there; make
...
pool silently loose requests for unknown avatars, or they will stay active
until timeout after close ( possible not a big problem after not reusing
queues ? )
2014-07-24 17:14:14 +01:00
05d071a430
let BlockingQueue timeout work as its suposed to and not wait for ever
2014-07-24 05:37:56 +01:00
6c3e08e18d
revert my change of not adding physcis to a failed avatar transfer. This
...
may need a better fix later ( doing a stand elsewhere?)
2014-07-24 00:58:23 +01:00
9936f13c1b
on transfer fail of sited avatars, only do
2014-07-24 00:56:48 +01:00
46695ddbfe
fix line ending
2014-07-24 00:30:38 +01:00
8808549669
on sit use root prim camera at and eye if child as neither
2014-07-23 23:09:13 +01:00
f6af5f4996
change last commit setting intransit without messing flight
2014-07-23 22:28:51 +01:00
f9ae7ea2e6
do CompleteMovement with InTransit set as core
2014-07-23 21:14:35 +01:00
237075ce21
cleanup a bit presence CheckForBorderCrossing removing dead code
2014-07-23 20:31:54 +01:00
d64a50ac9b
changed locations of m_originRegionID setting to where current core has
...
them. Changed avatar AbsolutePosition, it still didnt assume m_pos as
relative to root prim. ( forgot to commit before) ( this sit may still
have loose ends, specially around the use of OffsetPosition that is now
relative to root prim and was relative to prim)
2014-07-23 19:56:06 +01:00
f236b2e5d3
request.DoHTTPGruntWork(..) is now identical to our version, so use
...
those again, getting code closer to os
again
2014-07-23 02:14:15 +01:00
0331159d2c
clamp avatar standup position within region
2014-07-22 21:34:21 +01:00
3a87cce2e0
Fix recent regression in 3c6becd5 where login or hg login to variable sized regions failed with outdated simulator message.
...
I forgot that a null 'their version' would not be passed over the wire and ends up as an empty string instead (like older simulators).
So instead pass through the correct simulator protcol version instead (SIMULATOR/0.3) when querying from login or hg login.
Also removes a debug console write for agent limit accidentally left in for the same commit.
Relates to mantis 7276
2014-07-22 18:04:28 +01:00
f394fabfc0
if sited avatar cross fails, dont add it to physics and dont mess scripts
...
(?)
2014-07-22 16:28:30 +01:00
fe900b28c6
CrossPrimGroupIntoNewRegion does keyframes and physics crossing fails, so
...
revert previus change assuming it didnt. remove a no longer needed else {}
2014-07-22 15:56:20 +01:00
ed905418b3
consider that CrossPrimGroupIntoNewRegion removes DIE_AT_EDGE and
...
RETURN_AT_EDGE from simulation
2014-07-22 15:47:42 +01:00
f9fdf26ec3
make ResetChildPrimPhysicsPositions only do what it is supposed to do and
...
not what AbsolutePosition does
2014-07-22 15:13:37 +01:00
cf132430ae
tell scripts about positions changes after they are actually changed
2014-07-22 14:50:17 +01:00
5269511339
dont try to cross with avatars on DIE_AT_EDGE or RETURN_AT_EDGE sog
2014-07-22 14:31:47 +01:00
0e4a9e35c7
bug fix. Child position got broken because first prim i parts array may
...
not be the root prim
2014-07-22 04:10:51 +01:00
3e73e96bef
fix HUD attachment update filter to allow avatar center etc
2014-07-22 01:49:42 +01:00
243499ea4e
send updates on selected attachments as sl ( warinin if reverted then a
...
fix is needed elsewhere since the changes are never sent)
2014-07-22 01:11:18 +01:00
36920adb96
minor: convert tabs to spaces that got in on recent commit 4a9282e
2014-07-21 23:58:30 +01:00
0239c7ba1c
avatar collisions fix
2014-07-21 23:54:53 +01:00
3c6becd524
On login and first HG entrance to a foreign grid, perform query access checks before proceeding.
2014-07-21 23:53:33 +01:00
3355bedaeb
minor: Limit processor related stats to 3 decimal places instead of all the places.
...
Easier to read and analyze, and probably still too much detail (1 dp would probably be fine)
2014-07-21 23:08:15 +01:00
200dcee1b7
Fix CPU processor use reporting on Mono.
...
Despite the comments in the code, it appears that the issue where the .NET performance counter was wrongly idle time time on Mono was fixed in 2009.
https://bugzilla.novell.com/show_bug.cgi?id=468625
Which means that the workaround is no longer necessary and produces bad results instead.
2014-07-21 22:55:38 +01:00
1a9c14b041
Revert "Removed unused files: Texture/Mesh server connectors"
...
This reverts commit f6ea5088f4
2014-07-21 21:25:48 +00:00
5cdd205ee7
change presence movetotarget avoiding trying to go undergroud or fly when
...
it can walk. ( still needs better code )
2014-07-21 21:31:48 +01:00
d9797b6478
change ava to ava collisions a bit
2014-07-21 19:16:23 +01:00
726490a994
bug fix
2014-07-21 19:15:51 +01:00
4a9282e681
Add missing parts to profiles - classified delete
2014-07-21 12:46:26 -04:00
899bcb7acd
Fixed: after a Hypergrid teleport, attachments often either disappear, or appear both on the avatar AND as in-world objects.
...
Another manifestation of this bug is that after a Hypergrid teleport, when you click on one of the avatar's attachments the object doesn't show its name. This means that the viewer knows the attachment is there, but the simulator does not.
The problem was caused by treating Hypergrid teleports as if they're Logins (because the teleport flag ViaLogin is enabled).
This may fix: http://opensimulator.org/mantis/view.php?id=7238
This may fix: http://opensimulator.org/mantis/view.php?id=7220
2014-07-21 09:29:51 +01:00
712c50e0bf
Don't append attachments multiple times
2014-07-21 09:29:50 +01:00
feacae173e
Fixed avatar hovering above the ground. The avatar physics capsule was too tall.
...
This is related to http://opensimulator.org/mantis/view.php?id=7067 .
But that bug complains about BulletSim, and this fix is for ODE.
2014-07-21 09:27:57 +01:00
4804edf77f
Allow reading the BulletSim detail log while the sim is running
2014-07-21 09:27:57 +01:00
2d034e20c4
XBakes: store the assets only in the sim's local assets cache; not in the main assets server. Also, some cleanup.
2014-07-21 09:27:56 +01:00
6b57b61836
Log RestClient requests similarly to WebClient (e.g, "debug http all 6" logs the entire request and response)
2014-07-21 09:24:45 +01:00
4c5d7d4683
Fixed problems if an avatar tries to cross regions when the previous cross hasn't completed yet
...
This caused the client to stop responding, and even the simulators to have problems. The solution is to disallow crossing before the previous cross has completed.
2014-07-21 09:23:13 +01:00
b481711fa6
Added locking in AccessModule to prevent possible errors when shutting down a simulator that has >1 region
2014-07-21 09:19:05 +01:00
05cacf6eb6
Eliminated common but un-useful log messages
2014-07-21 09:18:20 +01:00
f94b3bbe0f
Minor: changed "existant" to "existent"
2014-07-21 09:15:05 +01:00
46c1d4e319
pCamBot: download Meshes
...
The "Sculpt" field in prims is used for both Sculpties (where the assets are Textures), and real meshes. Meshes require a different download URL than textures.
2014-07-21 09:12:16 +01:00
470161ae2e
Write some pCampBot messages to the log
2014-07-21 09:11:51 +01:00
af3498efdb
In "show throttles", show the maximum drip rate. This shows whether a client is being throttled due to past poor performance.
2014-07-21 09:10:50 +01:00
5d53412766
Write UDP statistics to the log, not just the console (e.g., "show queues")
2014-07-21 09:10:19 +01:00
0d70033a5d
Include the group name in group IM's
...
When sending an ImprovedInstantMessage to a group, the IM's binary bucket is supposed to contain the group's name (this is what SL does). Singularity uses this to show the group name when it shows the message at the bottom of the viewer for a few seconds: "[Group Name] From User: Message". Before this update, the group name was empty ("[]").
This update doesn't have any visible effect in Firestorm, because it doesn't use the group name sent in the IM.
2014-07-21 09:09:17 +01:00
528704bc04
Added "debug packet --all" option, which changes the packet logging level for both current and future clients
...
The existing "--default" option only changes the logging level for future clients.
2014-07-21 08:31:20 +01:00
a57b4b81b9
Fixed the logic that decides if a packet was queued (it was reversed)
2014-07-21 08:31:09 +01:00
f6ea5088f4
Removed unused files: Texture/Mesh server connectors
2014-07-21 08:30:23 +01:00
48d1cca303
Better logging of threadpool activity in Overload mode: if we didn't log "Queue threadfunc" for a particular thread then don't log "Run threadfunc" or "End threadfunc" for that thread either.
2014-07-21 08:30:17 +01:00
9fa8d84598
Eliminated some warnings
2014-07-21 08:30:10 +01:00
99ac770abb
Close streams immediately when we finish using them
2014-07-21 08:30:03 +01:00
72cead2920
Remove extremely spammy error message that isn't an actual error - user
...
ids queried may not exist, since LSL can use this as well, with
arbitrary ids
2014-07-20 23:58:46 +02:00
34c40a1e1a
Remove some already commented lines
2014-07-20 23:58:16 +02:00
c37a88d4f1
Fix LSL portions of sit positioning
2014-07-20 23:54:06 +02:00
719880a6ff
make sittarget camera relative to root prim
...
Please enter the commit message for your changes. Lines starting
2014-07-20 20:20:59 +01:00
b81187db5a
Set "[Terrain]SendTerrainUpdatesByViewDistance=true" by default.
...
This, by default, enables terrain patches being sent to each avatar
from the avatar away (rather than the old outside-in pattern), only
sending terrain patches within the avatars view distance (making
view loading quicker), and sending multiple terrain patches per
protocol packet (making terrain loading and editing quicker).
2014-07-20 10:56:52 -07:00
aa8b44c001
Add code to GridService to check for overlapping of varregions
...
when registering a new region.
Adds parameter "[GridService]SuppressVarRegionOverlapCheckOnRegistration=false"
that can be turned on to suppress the error check if a simulator's database
has old regions that overlap.
2014-07-20 10:34:09 -07:00
5f364dbed5
another change to standup
2014-07-20 16:09:34 +01:00
d6f56a4f99
change avatar standup code
2014-07-20 16:03:05 +01:00
a5fcc0c0c0
remove avn hack on sitted avatars positions
2014-07-20 14:47:35 +01:00
79aea3e588
physicsSit SendSitResponse also relative to parent prim
2014-07-20 09:21:00 +01:00
931434de87
fix physics sit for physical child prims
2014-07-20 09:15:29 +01:00
32b060a608
physics engine cannot change internal positions of linksets, at least not
...
in teaseupdates
2014-07-20 05:54:51 +01:00
b3068355bc
Merge branch 'ubitworkmaster'
2014-07-20 02:27:08 +02:00
dc717303d4
replace old Attachoffset by AttachedPos. Comented out possible merge
...
artifacts
2014-07-20 01:15:33 +01:00
bef76bf3c5
Fix duplicate attach message being sent to objects picked up from the ground
2014-07-20 01:52:26 +02:00
95f0d582a5
Fix coalesced objects not showing up as "piles" of prims (AVN only bug)
2014-07-20 00:18:28 +02:00
5000a5c038
Fix coalesced objects not showing up as "piles" of prims (AVN only bug)
2014-07-20 00:17:35 +02:00
07c0ee1fbf
Fix taking objects
2014-07-19 23:17:26 +02:00
e1b2ecdfdc
Merge branch 'avination-current'
...
Conflicts:
OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
2014-07-19 22:32:07 +02:00
95b89dd450
fix attachments
2014-07-19 22:18:12 +02:00
9654b81b2d
revert to capsule representation of avatar collider
2014-07-19 16:16:13 +01:00
738c60459c
BulletSim: Modify first and default vehicle vertical attractor to be feature complete with use of the Limit Roll Only Flag.
...
Signed-off-by: Robert Adams <misterblue@misterblue.com>
2014-07-18 19:07:00 -07:00
d1b7c2ece3
minor: remove long unused RegionInfo.ignoreIncomingConfiguration
2014-07-19 01:15:15 +01:00
29d5950838
minor: remove long unused RegionInfo.commFailTF
2014-07-19 01:10:53 +01:00
4dc0aaa03f
minor: Add meters unit to water height console display
2014-07-18 23:57:33 +01:00
1bdf0bed9c
Add "show region" command which will show parameters for current region.
...
This shows static data (e.g. region agent limit) whereas "show scene" shows live data (sim fps, current prims, etc.)
2014-07-18 23:52:49 +01:00
6048dfcd71
In grid mode, add SuppressConsoleCommands flag to [GridService] so that we can stop misleading grid service only console commands from registering.
...
We need to do this because the simulator initializes and internal copy of the GridService in grid mode for internal purposes
2014-07-18 22:57:04 +01:00
a26d1ffc66
minor: add method doc to ICommands.HasCommand()
2014-07-18 22:31:04 +01:00
9be935ac6d
Add ICommands.HasCommand() method so that we can detect whether a command has already been registered without needing to also run it
2014-07-18 22:27:39 +01:00
f0853139d5
refactor: slightly adjust some code in ODECharacter.Move() to eliminate a condition check without changing the logic
2014-07-18 18:13:38 +01:00
cfbfca6447
With ODE physics, fix an issue where the avatar couldn't jump and then move forward when moving south or west.
...
Addresses http://opensimulator.org/mantis/view.php?id=5003
Thanks to UbitUmarov for this fix.
2014-07-18 18:03:30 +01:00
748fc66ef1
reduce avatar hover in basic ode plugin
2014-07-18 13:19:24 +01:00
d5e0437465
fix Xengine script instance load
2014-07-18 11:43:31 +01:00
1daec26ba0
BulletSim: rearrange code to prevent using null pointers when a
...
child mesh is not available when building a linkset.
2014-07-17 21:41:39 -07:00
e455374a4b
fix all instances of "non-existant" to "non-existent" (spelling mistakes) thanks Ai Austin for pointing this out.
2014-07-17 09:37:24 -04:00
8cd7ca568d
Change default script stop method to co-op instead of abort.
...
co-op should be more stable as it doesn't abort threads, which can trigger virtual machine instability
This change will be invisible to users as script DLLs are recompiled automatically where necessary, though the change won't take affect until the next simulator restart.
This change has no effect on existing script state.
If you want to continue using abort, set ScriptStopStrategy = abort in the [XEngine] section of OpenSim.ini
2014-07-16 22:58:38 +01:00
19d33c571d
Merge branch 'avination-current' into ubitwork
2014-07-16 16:22:32 +01:00
fc1bd4567d
Merge branch 'avination-current' of ssh://3dhosting.de/var/git/careminster into avination-current
2014-07-16 16:16:37 +01:00
0c8f3dddd8
Use thread-safe version of .NET Random as the SDK class is not thread-safe.
...
As per http://msdn.microsoft.com/en-us/library/system.random%28v=vs.100%29.aspx , the .NET Random class is not thread-safe.
If called by multiple threads at once, methods may return 0.
Except for llRand(), other OpenSimulator code did not lock before calling a shared Random instance.
This commit adds a ThreadSafeRandom class that extends Random but does internal locking so that it is thread-safe.
This change is invisible to existing callers and the explicit locking in the llFrand() implementation is now redundant.
2014-07-14 20:08:11 +01:00
e008d54cd4
minor: Remove compiler warning in GridService
2014-07-14 19:28:43 +01:00
4e92b55231
Call RemoveScriptInstance when removing from inventory
2014-07-14 18:06:24 +01:00
2766bf3fef
minor: Move debug xengine script console command to Debug help section where other debug commands live.
2014-07-11 00:18:39 +01:00
15b38f0036
minor: further cleanup of old vb and yield prolog script engine references that were removed some time ago
2014-07-11 00:15:47 +01:00
d7b9260496
If [XEngine] ScriptStopStrategy is changed between abort and co-op, for the existing session use the previous strategy for that script rather than not starting the script at all.
...
We have to do this since we can't unload existing DLLs if they're all in the same AppDomain.
But we can still update the underlying DLL which will be used in the next simulator session.
2014-07-11 00:03:02 +01:00
6d3b409af2
refactor: use existing Compiler.CreateScriptsDirectory() (renamed to CheckOrCreateScriptsDirectory()) when checking that scripts directory exists on compile.
...
Code was identical apart from error logging, but if there are failures creating these directories then you'll be
seeing lots of errors anyway, and these will be more informative
2014-07-10 19:40:44 +01:00
fea18a909f
Fix bug in "show modules" comamnd that was showing shared modules as non-shared and non-shared as shared
2014-07-09 23:24:12 +01:00
a8860d79d8
Turn RestClient.Request() logging down the debug and comment out for now.
2014-07-09 23:12:14 +01:00
8ae5ab809f
Fix issue with running "stats record start|stop" console command
...
In commit e6080a38
2014-07-08 18:49:57 +01:00
ba233008cd
Changed GetUserInfo so that the exposure of user account details is ruled by a configuration variable. It's on by default.
2014-07-06 16:02:04 -07:00
108978be1e
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2014-07-06 15:17:27 -07:00
63b5c11b9c
Lookup username given key(uuid) XML-RPC
2014-07-06 15:14:55 -07:00
219d273418
Add experimental "show grid size" robust console command.
...
This will show an approximate grid size that doesn't count regions that are hyperlinks
Not particularly trustworthy since it will still count regions that are not active but were not deregistered (deliberately or due to simulator crash or similar)
2014-07-05 00:50:33 +01:00
bb9071e5f0
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2014-07-04 16:28:58 -07:00
869191a51d
Small change to my previous commit: not so aggressive on the trigger, please.
2014-07-04 16:28:37 -07:00
b019fd5a95
Show region size column in simulator version of "show regions" console command
2014-07-05 00:20:39 +01:00
82a5d00bc8
Adjust "show regions" and "show region" robust service console output to show size
...
"show regions" drops the owner id column but is till present in "show region"
"show regions" name column expanded to allow for longer hg regions (probably still too short, may eventually have to truncate rather than taking up huge screen space)
2014-07-05 00:15:35 +01:00
dac8703949
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2014-07-04 15:56:32 -07:00
78c155cd12
Instrument the UDP path of creating assets so that it triggers an asset post for users with different asset servers
2014-07-04 15:56:09 -07:00
4b73268cbd
minor: put standard 'category' in brackets at front of log messages from previous commit 3d70db4a
2014-07-04 23:48:37 +01:00
3d70db4a58
When uploading mesh objects with textures also create inventory items for uploaded textures.
...
This implements:
http://opensimulator.org/mantis/view.php?id=7250
2014-07-04 23:40:09 +01:00
6e0e35cd66
Include option to remove auto backup files older than given number of days. New property created to specify how many days to keep files for. Off by default, also made sure only oar files will be removed.
2014-07-04 23:32:13 +01:00
20b47fce07
Still log (but this time with warning rather than an exception) if we regenerate a new child caps seed for a region where we already have one.
...
I think it's still useful to know this to show up any errors early, but it's reasonable to still carry on rather than throw an exception.
Follow on from Diva's commit 9643792
2014-07-04 22:59:10 +01:00
82b875317b
On logout, delay the removal of AgentCircuitData until the very end, because that data structure contains important information about the agent that may be needed by modules.
2014-07-04 14:36:11 -07:00
60ad72357e
This fixes the bug related to rebooting neighboring varregions while avatars are logged in; the avies would not see the region anymore until they relogged. Same problem as before: inconsistent calculation of scope.
2014-07-04 11:45:30 -07:00
d99c8e68a7
It turns out that child agent management has had a bug for a while: there was an inconsistency in the scope between opening and closing child agents in neighboring regions. For opening (in EnableChildAgents), the region's DrawDistance was being used; for closing (in IsOUtsideView) , the viewer's (SP) DrawDistance was being used. This fixes this inconsistency, therefore eliminating bugs observed in TPs between, at least, neighboring varregions.
2014-07-04 10:13:53 -07:00
d0782c2bc0
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2014-07-03 20:09:38 -07:00
9643792b34
Avoid an exception in creating child agents some times.
2014-07-03 20:09:16 -07:00
4ba396b81c
Temporarily disable new regression test TestLifecycle() until I have a chance to fix it
...
This was working for me locally because it was still picking up all my *.ini config files, which jenkins won't have in its test env
2014-07-03 00:30:42 +01:00
c3923a1aa6
Re-enabled TestLifecycle regression test logging so I can get some idea of why it's failing on jenkins but not locally
2014-07-03 00:01:47 +01:00
889194db63
Actually call Close() for shared region modules when the simulator is being shutdown.
...
Adds regression test for this case.
2014-07-02 23:49:25 +01:00
fe6dab7f13
minor: Change default max phys prim size in code to match OpenSimDefaults.ini
2014-06-28 00:20:09 +01:00
cd031d129a
minor: change allow script crossings default in code to true in order to match OpenSimDefaults.ini
2014-06-28 00:18:00 +01:00
9d2789aff8
add LSL constant PRIM_ALPHA_MODE
2014-06-27 16:06:03 -07:00
abf85b7f19
Bulletsim: Create AvatarTerminalVelocity to BulletSim like what ODE and SL has. Before this falling from really high caused the avatar to fall faster then the veiwer can handle and cause camera issues.
2014-06-27 23:34:34 +01:00
a93799d03b
add LSL constants PRIM_SPECULAR and PRIM_NORMAL
2014-06-23 20:06:22 -07:00
ca2379ee83
Bug fix in map teleports in varregions. The cherry was missing from the ice-cream Sunday: the packet itself was hardcoding the size of the region...
2014-06-21 15:38:38 -07:00
481b7c71c3
BulletSim: add some locking for collision lists to prevent collsions
...
from locking up when running BulletSim on a separate thread.
2014-06-20 21:42:08 -07:00
159fcbf150
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
2014-06-21 00:39:55 +02:00
527c2cdb1e
Merge commit '68c8633ba18f0a11cfc0ed04d1d0c7c59e6cec76'
2014-06-21 00:23:11 +02:00
5908e7d0c2
Merge commit '69bc37acd66e9ac9938d4a657dc6b9a0ba9f021e'
2014-06-21 00:22:51 +02:00
e0f360e495
Merge commit '4153cfbf14132931b981168b7b3e7c5b8d5be8b5'
2014-06-21 00:22:29 +02:00
711441f922
Merge commit '84eb25da23765b3a4f7ae5513e8a238680bb99f2'
2014-06-21 00:21:29 +02:00
94650c43cd
Add forgotten file
2014-06-21 00:08:39 +02:00
c90b986d8b
Improved line map heuristics.
...
If the C# column can't be found in the positionMap (but the line can),
use the map immediately after it while correcting for the offset,
unless that results in an LSL position before the previous LSL position
in the positionMap.
The idea behind this heuristic is that in most, if not all cases C#
consumes more characters than LSL (for example LSL_Types.LSLInteger
instead of just 'integer').
Thus if the distance between the columns of two markers differ in
the C# and LSL file, the distance in the C# file will be larger.
Moreover, we can assume that every time this happens we will have
a marker at the beginning of the longer 'keyword', because those
keywords were generated by us in the first place.
For example:
C#: LSL_Types.LSLInteger f2(LSL_Types.LSLString s)
^ ^
1 2
will always have markers at the beginning of the long keywords
'LSL_Types.LSLInteger' and 'LSL_Types.LSLString'.
If an error is generated in between (for example at the beginning
of the function name 'f2') then the correct position is found
by using an offset relative to 2 rather than 1.
Note that a case where this isn't working correctly is
when the user adds extra spaces. For example:
LSL: integer f2( string s)
would still use the start of 'string' as reference and
then go backwards 3 characters only because the corresponding
C# still looks like
C#: LSL_Types.LSLInteger f2(LSL_Types.LSLString s)
^ ^
only 3 chars difference
and the reported error at 'f2' would be here:
LSL: integer f2( string s)
^
This can only be fixed by generating a mapping for 'f2' itself, or
generating a mapping whenever the amount of spaces is changed.
2014-06-19 23:52:51 +01:00
3fe9c7c49d
Fix looking up line number and colum when there is no exact match.
...
When a compile error reports a colum/error that is not an exact
match in the positionMap dictionary, the last position in the
map with a line number and position before the reported error
should be returned.
The old code had the following problems:
1) It returns l,c - which are line and column of the C# file, not LSL.
2) It doesn't set l to 'line' when the map has an entry with 'line'.
3) It sorts the map without taking columns into account, which may
result in a random order of the columns. With my mono implementation
the columns were reversed in order.
For example, if the map contains the following lines:
99,5,49,10
100,30,50,10
100,40,1,0
101,5,51,10
and a translation of 100,35 was requested,
then the old code would compare '100' with the keys in
the first column - setting l to that key while it is
smaller. Hence, l is set to 99.
Then it finds the key 100 and doesn't update l.
Because of the reversed sort order, it first compares
the column 35 with 40, finding that it is smaller
and therefore it stops; returning 99,1 instead of finding
the correct 100,30 entry and returning 50,10.
This patch causes 50,10 to be returned.
The remaining problems after this patch are:
1) The sorting might not be necessary at all.
2) The is code duplication (I fixed both instances,
but really there should be no code duplication
imho).
2014-06-19 23:52:51 +01:00
4651cd1f50
BulletSim: stop processing linkset child when it is discovered that the
...
child doesn't have a physical shape. Another attempt at fixing Mantis 7191.
2014-06-18 23:01:39 -07:00
f348928590
BulletSim: more tweeks to AliciaRaven's flying mods. Added parameters
...
AvatarFlyingGroundMargin and AvatarFlyingGroundUpForce set to 5.0 and
2.0 respectively which seems to give about the same action as in SL.
Also moved force addition to before the velocity to force computation
so the upward velocity is properly applied to the avatar mass.
2014-06-18 22:39:28 -07:00
3cbdf3bfe0
refactor: Simplify compilation result tests by factoring out common code.
2014-06-18 23:04:31 +01:00
7b2f125fb6
In compiler regression tests, setup and teardown structures for each test to avoid any possibility of inter-test inter-ference
2014-06-18 22:46:54 +01:00
a0d6705fe6
Fix issue with LSL jumps screwing up the C# compiler error -> LSL code position map and leading to invalid error line numbers/columns
...
This is because jump statement generation was mistakenly inserting its own line without updating the csharp positions in CSCodeGenerator.
This is Aleric Inglewood's patch in http://opensimulator.org/mantis/view.php?id=7195 but applied to opensim itself rather than the defunct code generation in opensim-libs. Thanks!
This patch also adds a regression test for this case from myself.
2014-06-18 22:24:36 +01:00
db0c41501c
Fix previous commit to ignore water height and allow flying underwater (swimming)
...
Signed-off-by: Michael Cerquoni <nebadon2025@gmail.com>
2014-06-17 23:06:49 -04:00
ff892b5bcf
Add upward force to flight when close to the ground. Prevents current belly flop to the floor when flying with bullet physics and acts more like ODE and SL flight.
...
Signed-off-by: Michael Cerquoni <nebadon2025@gmail.com>
2014-06-17 21:47:36 -04:00
5450b1b024
Change assembly versions to 0.8.1
2014-06-17 18:37:15 +01:00
602587b8d5
Update dev version to 0.8.1
2014-06-17 18:32:26 +01:00
b59812b4e3
If MaterialsModule unexpected sees a part with DefaultTexture of null, log this with a warning.
2014-06-16 22:20:30 +01:00
4374ce9fbf
If processing a queued request fails up to the top of the stack, log the exception and move to the next request rather than terminate the simulator.
2014-06-16 22:11:34 +01:00
696df33e5c
In materials module, if a texture entry somehow has no default entry then don't try to extract materials data rather than throw an exception
2014-06-16 21:47:34 +01:00
c5f7184d1b
Behavior change: only local users can set home in any parcel of a grid. Setting it for foreign users does not make sense, since cntrl+shift+H always teleports them back to their original grid.
2014-06-15 16:29:25 -07:00
dcd8e74584
Manual change as per patch in mantis #7212 . (the patch failed to apply, but the fix was good) Thanks FreakyTech.
2014-06-15 07:26:27 -07:00
7f0adfd203
Add [Startup]LogShowStatsSeconds=n parameter which controls the interval
...
that simulator statistics is output to the console. Setting to zero turns
stats logging off.
2014-06-13 21:27:07 -07:00
31096fb1fe
Add rc3 flavour option
2014-06-10 20:19:19 +01:00
807fb8339b
Revert "Let HG users be gods too, if they have local permission to be so."
...
HG gods are not safe at this point. It's better to disallow this until
they can be made safe.
This reverts commit e86c765be3
2014-06-09 22:00:10 -07:00
e86c765be3
Let HG users be gods too, if they have local permission to be so.
2014-06-09 21:46:24 -07:00
c915791824
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2014-06-08 12:18:49 -07:00
7f45ac72e1
Don't try to package null invites.
2014-06-08 12:18:26 -07:00
3552cfb1a5
BulletSim: fix exceptions while rebuilding linksets with mesh children.
...
This should get around the exception reported in Mantis 7191 and 7204
by checking for the unbuilt child and rebuilding the linkset the next tick.
A warning message is output when this rebuild happens and this message is
clamped to 10 times in case there is a problem with a loop.
2014-06-08 09:03:38 -07:00
fe779128b0
Added simulation version compatibility check so that agents coming from 0.7.6 to a varregion running in 0.8 and above will be denied teleport, rather than be allowed and crash the viewer.
2014-06-06 11:04:53 -07:00
733763c4e2
Amend to previous commit -- write down the problematic Profile server URL.
2014-06-05 20:06:01 -07:00
5bb95a8a55
May fix mantis #7133
2014-06-05 18:59:30 -07:00
c1bdd22274
Fix AutoBackupModule and include option to skip saving assets.
...
Signed-off-by: Michael Cerquoni <nebadon2025@gmail.com>
2014-06-04 22:01:55 -04:00
f8fe4dee8f
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2014-06-02 08:46:00 -07:00
77913eb679
Added a ResetLand method to RemoteAdmin, whereby all land is reset with the given parameters.
2014-06-02 08:45:39 -07:00
0aa0dad478
Send multiple terrain patches per terrain update packet if terrain
...
draw distance optimization is enabled. Makes terrain editting a lot
snappier.
2014-06-01 19:23:49 -07:00
3aa99b9a7f
Fixes a permissions bug where a user with group powers to always rez was not being given permission to rez on group land.
2014-06-01 16:45:37 -07:00
14a31c3e9b
Correct minor bug regarding packing of estate bans
2014-06-01 12:01:49 -07:00
94d0ae0d91
This may fix mantis #7200 , but I am unable to test because I don't have any old viewers around anymore.
2014-06-01 10:18:53 -07:00
0eaca7aafb
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2014-06-01 10:06:59 -07:00
2ff9ea3f80
Fixed a few things pertaining to interfacing with the estate service. Specifically, StoreEstateSettings was not being used anywhere; instead EstatSetting.Save was being called, but that method is a trigger to the DB-layer code directly, which, besides being wrong, was making it impossible to replace the service with a remote connector.
...
Also added more packing/unpacking code.
2014-06-01 10:06:26 -07:00
a2ea844494
Move the generation of the multi-resolution map tiles off the main
...
region creation thread. For varregions or simulators with many regions,
this will speed up simulator startup and elimiate some thread timeout
warnings.
2014-05-31 14:21:39 -07:00
0300ec45eb
Modifications to debugging printouts. No functional changes.
2014-05-31 12:19:51 -07:00
22dade6463
varregion: More tweeking to only sending patches within avatar draw distance.
...
Still has problems with child avatars.
2014-05-31 12:19:50 -07:00
db5a42ffac
varregion: send terrain patches from where the avatar outward if the parameter
...
[Terrain]SendTerrainUpdatesByViewDistance=true.
This tracks which patches have been sent to each client and outputs the
patches as the avatar moves.
2014-05-31 12:19:49 -07:00
eaf595c008
Fix a bug where estate not found would result in a dummy estate record with erroneous information.
...
Also, added conversion of EstateSettings from/to key-value pairs in preparation for robust net work connectors.
2014-05-31 11:40:54 -07:00
d6f9f690e5
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2014-05-31 08:22:56 -07:00
bf5320eb26
minor: rename velocidyDiff -> velocityDiff
2014-05-30 22:21:13 +01:00
3c992b028c
minor: Add some commented out logging to ScenePresence.SendTerseUpdateToAllClients() which is extremely helpful when investigating presence update triggers.
2014-05-30 22:18:07 +01:00
a755c57b44
Fix issue with BulletSim avatar level flight jitter by commenting out RawVelocity update threshold for now in BSCharacter.UpdateProperties().
...
For some reason as yet unidentified (feedback?) a threshold above 0.4 here causes the RawVelocity to move between a lower and upper bound rather than remaining constant.
The RawVelocity increased until it triggered the threshold update, at which point it started to decrease until it again triggered the threshhold update.
This delta-v was enough to exceed the checks in ScenePresence.SendTerseUpdateToAllClients() and produce jittery avatar flight because of the fluctuating velocity.
With a threshold of 0.4 (or 0, as with ODE), the RawVelocity remains constant in BulletSim and so avatar flight becomes mostly smooth - remaining occasional glitches appear to be a result of errors in distance extraploation.
There are no obvious problems with commenting out the threshold.
Misterblue, if this is wrong or I've missed some subtlety here, please feel free to revert and/or correct.
The same considerations may or may not apply to object velocity updates.
2014-05-30 22:12:23 +01:00
9ced61fbc2
Add a 0 parameter overload for RestClient.Request() for use when no auth is required. This preserves API compatibility for external modules using this function.
2014-05-30 13:47:19 -07:00
0eede1467f
Moved these two estate-related interfaces to the projects where they belong.
2014-05-30 13:11:46 -07:00
35c7fb2038
minor: Comment out log line in Groups V2 GroupsServicePostHandler for now which logs every request it receives.
2014-05-30 19:45:05 +01:00
8656b5e948
Fix bug where setting a parcel in a varregion for sale would make sale bitmap generation in WorldMapModule throw an exception on next startup.
...
This commit replaces the hardcoded region sizes in WorldMapModule.GenerateOverlay() with numbers pulled from m_scene.RegionInfo
2014-05-30 19:40:10 +01:00
27597463da
Change Assembly verson of OpenSim.Data.PGSQL.dll to 0.8.0.* to match all other assembly versions
2014-05-27 23:40:29 +01:00
c32ccfb520
minor: Comment out 2 error level debugging message in authentication code
2014-05-27 23:18:33 +01:00
9ca86664bb
Make RegionReady login disabled during initialization message a console messages instead of a warning message.
...
Same justification as earlier commit 996a6c2
2014-05-27 23:15:50 +01:00
5622cf68aa
In compiler tests, remove the ResolveEventHandlers after test exit
2014-05-27 18:47:42 +01:00
394ec508f6
Make CompilerTest add same AssemblyResolver as XEngine to see if this solves the issue with different AppDomain BaseDirectory in local and Jenkins test runs
2014-05-27 18:37:16 +01:00
bcaacb4e41
Temporarily print regression TestCastAndConcatString() script compile errors out to console to get a handle on what's going wrong.
...
Does not fail for me locally and I failed to notice this test was failing on Jenkins.
2014-05-27 18:19:08 +01:00
d131c57978
Update regression TestInventoryDescendentsFetch() to account for recent commit 1fa3a6f
...
This was hidden in continuous integration because of another regression test issue.
2014-05-27 18:14:36 +01:00
987c56984d
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2014-05-27 10:13:43 -07:00
e19c830a6c
Fixes a bug where map search results pertaining to varregions would only send the SW-most corner of the varregions; the other areas, when clicked, would result a blue circle, meaning that the viewer didn't know about those areas. This is still not quite right, as all the areas appear to be in the same coordinates, but it's good enough for now.
2014-05-27 10:13:24 -07:00
fab0389cb1
BulletSim: add locking of PhysObjects while processing simulation
...
step updates and collisions. This is an attempt to fix a crash reported
by Justin when doing high velocity teleports.
2014-05-26 20:29:45 -07:00
d2877b9cd4
Don't report NPC presences.
2014-05-26 10:28:31 -07:00
b778bd9423
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2014-05-26 08:14:34 -07:00
449548d7a4
Adds an optional redirect URL to the asset server handler for when assets are not found locally.
2014-05-26 08:13:49 -07:00
33cc847c4a
When saving an OAR in "Publish" mode, also discard Group information
2014-05-26 15:33:13 +01:00
5aeaa7fcdd
Prevent login to a region if the Telehub or Landing Point are in a banned parcel
2014-05-25 15:37:28 +01:00
e68867c9b6
When taking an object into inventory, set the inventory item's "Next Owner" permissions according to the permissions of the items in the object
2014-05-25 15:35:00 +01:00
1fa3a6f1bd
When creating a new user, create the folders "Current Outfit", "Favorites", and the standard subfolders of "Calling Cards".
...
(If we don't create them now then they'll be created later by the viewer, but why wait.)
2014-05-25 15:34:49 +01:00
ff9da24465
Added HTTP Authentication also to Groups and offline IM.
2014-05-23 17:31:39 -07:00
227685bea4
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2014-05-23 16:20:04 -07:00
20f20895cf
Adds optional HTTP Basic Authentication to Robust service connectors.
2014-05-23 16:19:43 -07:00
9bae636ff0
Fix issues where reported LSL compiler error line numbers do not match the script.
...
This is probably due to changes in the layout of the generated script preamble (using statements etc, ) in c8afc852
2014-05-24 00:12:23 +01:00
cf95b65c10
Get regression test TestUseUndeclaredVariable() functional again, though not yet enabled.
...
This reveals the position map problems and will make the fix (and subsequent continual checking) easier.
2014-05-23 22:29:47 +01:00
250ea09328
Reactivate regression test TestCastAndConcatString() in CompilerTests.
2014-05-23 22:12:49 +01:00
f55e153636
Compile the regex that extract categories for colourization just once rather than on every single log.
...
Compiling every time is unnecessary since Regex is thread-safe.
2014-05-23 21:09:48 +01:00
fbcb76383d
Allow console output to be multiline by making colourization regex RegexOptions.SingleLine
2014-05-23 20:57:50 +01:00
72c67c5091
Fix possible infinite recursion in MessageTransferModule.SendGridInstantMessageViaXMLRPCAsync() whilst preserving retry lookup behaviour.
...
This is based on heavily mikemig's original patch in http://opensimulator.org/mantis/view.php?id=7149
but instead of exiting after the first IM delivery failure to presence information retrieved from the presence service
it will retry the lookup until the result matches the previous lookup.
This is to deal with the case where the agent is sent an IM whilst they are teleporting.
2014-05-23 20:14:49 +01:00
5015b0b485
If one is sitting on a child with an unset camera-eye and so using one set in a root prim, the focus should remain on the root prim.
...
Matches behaviour just tested on the Linden grid.
2014-05-23 01:55:05 +01:00
c78a8271c4
Add any camera at compensation for sat upon child prims to any existing camera-at value, rather than replace.
2014-05-23 01:38:05 +01:00
fbed245596
Compensate camera-at and camera-eye for child prim rotation when sitting on child prim with camera-eye set
2014-05-23 01:34:02 +01:00
174df94172
If a script calls llSetCameraAtOffset() or llSetCameraEyeOffset() on a child prim and the root prim has no corresponding value set, then also set the root prim.
...
This matches behaviour just tested on the Linden Lab grid.
2014-05-22 23:58:28 +01:00
3fbaef9275
If the root prim has a camera-at or camera-eye setting and a sat upon child prim does not, use the root prim offsets.
...
This matches behaviour just tested on the Linden Lab grid.
2014-05-22 23:52:28 +01:00
16bf38e1ab
Fix issue where llSetCameraAtOffset() and llSetCameraEyeOffset() in non-root prims moved camera/focus to wrong position.
...
For non-root prim, eye offsets now need to be made relative to root prim if either camera-at or camera-eye are set.
Probably a regression since November 2013 when all sits were made relative to root prim to match viewer expections (and fix other bugs).
Addresses http://opensimulator.org/mantis/view.php?id=7176
2014-05-22 23:39:22 +01:00
f8b8241239
Add regression test for north-south chat across neighbour regions.
2014-05-22 20:28:26 +01:00
bffc9ad184
Extend regression TestInterRegionChatDistanceEastWest() to test out of range chat
2014-05-22 20:04:32 +01:00
15b50ae737
Extend regression TestInterRegionChatDistanceEastWest() to test in range chat both ways.
2014-05-22 19:55:34 +01:00
65a135f4d3
Simplify regression TestInterRegionChatDistanceEastWest() by making the child presence connection directly rather than routing through TestClient.
...
This code isn't relevant to this test and is already exercised by other tests.
2014-05-22 19:47:33 +01:00
1b156b7fe8
Add regression test for in-range chat between neighbouring regions from east to west.
2014-05-22 19:18:24 +01:00
b7c7293c7a
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2014-05-22 10:16:19 -07:00
f7b2aa0f49
Fixed a problem with detaching attachments in situations where the user's asset server is not the same as the simulator's asset server. Unfortunately this still continues to be wasteful -- new assets are created every time an attachment is detached, but the process of storing the new asset goes through the InventoryAccess module, which does all sorts of checks regarding the users' inventory.
2014-05-22 10:16:01 -07:00
04aa13a086
Fix mantis 6973. Prevent BOM being prefixed to message XML which was causing an exception when the service tried to read the data later on.
...
Signed-off-by: Oren Hurvitz <orenh@kitely.com>
2014-05-22 13:16:14 +01:00
251b93d97e
Store the Teleport Flags in the Circuit. This doesn't seem to be necessary, because everything has worked so far, but it's the right thing to do.
2014-05-22 13:16:06 +01:00
a1b291c889
Allow map searches for regions that contain the characters "!+|"
...
These characters are used as placeholders for other characters: ": /". But we should search first for the exact string the user entered, and only if that fails then replace the characters and search again.
2014-05-21 07:39:23 +01:00
5b433e101d
minor: Comment out currently unused log setup in TerrainCompressor
2014-05-20 23:59:08 +01:00
d93275745b
minor: Remove some unused fields in ScenePresence
2014-05-20 23:57:03 +01:00
32070fa5f4
minor: remove compiler warning in SceneObjectPartInventory
2014-05-20 23:54:49 +01:00
9479f64778
Fix issue where avatar and script chat could sometimes be heard from anywhere in neighbouring regions.
...
This was due to a silent uint overflow in ScenePresence.UpdateChildAgent() corrupting child agent positions
when the child agent was in a region with a greater x or y map co-ord than the root agent region
Probably introduced in beeec1chttp://opensimulator.org/mantis/view.php?id=7163
2014-05-20 23:52:07 +01:00
5ec3429843
On verbose groups messaging logging, count all operations in reported time when sending group messages, not just those after get group members and get presence status, as applicable
2014-05-19 23:01:48 +01:00
b46be88db6
Split verbose groups messaging logging into its own setting separate from that of the groups module.
...
This is to allow us to get useful information on messaging without being overwhelmed by the rest of groups debug.
Enabled with [Groups] DebugMessagingEnabled = true in config (default false)
Or "debug groups messaging verbose true|false on the console" (similar to existing groups setting).
Done for both xmlrpc and V2 groups.
2014-05-19 22:45:17 +01:00
3a6f312484
Fix recent regression from 77e7bbc where an attachment on a received group notice with XmlRpcGroups messaging did not appear in the user's inventory.
...
This was because the "session ID" when the message template was copied was always replaced with the group ID, whereas a notice requires this to be the notice ID.
Instead just copy the "session ID" as is - other callers already have this set properly so replacing with group ID was redundant anyway.
Relates to http://opensimulator.org/mantis/view.php?id=7037
2014-05-19 22:06:41 +01:00
47b84875fd
Tell QueryAccess explicitly whether the user is coming in via Teleport or Cross, because the permission checks are different.
...
Previously we used a heuristic of checking if the entry position is 0 to differentiate between Teleport and Cross, but that doesn't work anymore since we've started providing the precise entry position for cross, too. That's required in order to ensure that the user is allowed to enter the parcel that he's walking into.
2014-05-19 11:19:11 +01:00
78733b979f
Log the user when an inventory operation is blocked because the item/folder isn't in the Suitcase
2014-05-19 11:12:53 +01:00
dd30a29ba0
Return more specific error messages if an attempt to enter a region fails due to permissions (in QueryAccess and IsAuthorizedForRegion)
2014-05-19 11:11:30 +01:00
882af7195c
Better error-handling and logging in case User Profile requests fail
2014-05-19 11:11:06 +01:00
96e5836b50
When can't rez, show only one error message; not two. And show more specific error messages.
2014-05-19 10:54:27 +01:00
ab1472e5b7
Don't trigger ItemUploaded when no item has been uploaded.
2014-05-18 23:01:55 -07:00
922f76a3a7
Don't fetch assets from the server when doing simple inventory operations like copy-paste items in inventory.
2014-05-18 07:49:01 -07:00
0be9e3b079
BulletSim: adjust avatar step up parameters to better walk up small
...
staircases. This change is required because of the change in the
avatar default shape from the capsule to the rectangle.
2014-05-17 20:11:22 -07:00
4a74c4533c
minor: eliminate now unnecessary string.Format in postgresql RetrieveGroups method
2014-05-15 22:51:47 +01:00
d2c738fc09
Don't warn on not seeing [Groups] Robust section for core groups as this does not contain any mandatory parameters and won't be present on older installations.
2014-05-15 22:48:05 +01:00
6dc1b113d0
Escape find string in PgSQL core groups plugin
2014-05-15 22:45:01 +01:00
d32d25634d
Escape find string in MySQL core groups plugin
2014-05-15 22:09:37 +01:00
7c12dfe185
On ScenePresence.MakeChildAgent(), reset the m_originRegionID as this is currently being used as a flag to orchestrate destination simulator threads on teleport.
...
If not reset, it's possible that teleports back and forth between simulators may not restart scripts in attachments.
2014-05-14 22:08:06 +01:00
2f7539a25b
Remove a race where the client's SP.CompleteMovement() thread could attempt to restart attachment scripts before the source simulator's SP.UpdateAgent() thread had added them.
...
This commit changes the order of code so that attachments are re-added before the CompleteMovement() thread is released.
Relates to http://opensimulator.org/mantis/view.php?id=7148
2014-05-14 21:49:29 +01:00
0c0ee95bd8
minor: Clean up and make consistent some log file messages in EstateManagementModule relating to RAW file uploading.
2014-05-14 19:22:55 +01:00
c23d37a509
Fix recent asset request timeout issue by commenting out (for now) the m_maxAssetRequestConcurrency mistakenly passed in as a timeout to SynchronousRestObjectRequester.MakeRequest()
...
For a long time, possibly forever, the m_maxAssetRequestConcurrency was mistakenly passed in as a 30 ms timeout rather than as a concurrent connection limiter.
This didn't come to light until the timeout was actually used in recent commit faf9ba53http://opensimulator.org/mantis/view.php?id=7165
2014-05-14 00:11:07 +01:00
4569c595bf
Fix behaviour change in recent commit bbc1dc6 so that SynchronousRestObjectRequester.MakeRequest() calls with no timeout specified use the default HttpWebRequest timeout as previously.
...
I mistakenly thought that that default request timeout was inifite rather than 100 seconds, restoring previously behaviour.
As per http://msdn.microsoft.com/en-us/library/system.net.httpwebrequest.timeout%28v=vs.100%29.aspx
Relates to http://opensimulator.org/mantis/view.php?id=7165
2014-05-13 22:21:20 +01:00
484aa72ff8
minor: Add some method doc to IMessageTransferModule
2014-05-12 23:49:37 +01:00
8ad29fc5c8
Make offline IM delivery to URL (pre recent Addons code) have a 10 second rather than infinite timeout.
...
This both signals a problem with the URL and eventually frees the thread, rather than hanging indefinitely with no information.
2014-05-12 23:42:47 +01:00
87e2668529
For XmlRpcGroups (Flotsam) module, when MessageOnlineUsersOnly = true, handle notices to offline users directly as known undeliverable messages rather than discarding or attempting delivery.
...
Offline notices can still be controlled with the [Messaging] ForwardOfflineGroupMessages setting.
Looks to address more of http://opensimulator.org/mantis/view.php?id=7037
Only for Flotsam now for testing, but if approach works should be possible with core offline notices as well.
2014-05-12 23:38:48 +01:00
515d373a8e
Add send group notice regression test for when MessageOnlineUsersOnly=true
2014-05-12 22:54:54 +01:00
bbc1dc6bce
Replace existing 0 timeout in internal overloaded SynchronousRestObjectRequester.MakeRequest() methods with proper Timeout.Infinite (-1) instead.
...
Triggered by recent faf9ba53
2014-05-12 22:37:07 +01:00
8457044b2f
Eliminate subsequently unused scene finding in UndeliveredMessage() method of xmlrpc and core offline IM modules
2014-05-12 22:23:24 +01:00
19d8f05584
minor: eliminate unused UUID in xmlrpc GroupsMessagingModule.ProcessMessageFromGroupSession()
2014-05-12 22:15:01 +01:00
7db4336f1c
minor: Add method doc to SynchronousRestObjectRequester.MakeRequest() methods
2014-05-12 22:05:02 +01:00
faf9ba53fc
In SynchronousRestObjectRequester.MakeRequest<TRequest, TResponse>(string verb, string requestUrl, TRequest obj, int pTimeout, int maxConnections) actually set timeout on WebRequest if given.
...
Previously, we were doing nothing with this parameter.
No effect on current code since none of the 6 callers attempt to use the timeout.
2014-05-12 19:20:00 +01:00
bf8f64e40e
Fixed error if a user didn't have a "Current Outfit" folder in their suitcase.
...
This fixes http://opensimulator.org/mantis/view.php?id=7161
2014-05-12 08:54:31 +03:00
73891c7fd3
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2014-05-09 11:06:33 -07:00
667a272cce
This little sucker had evaded my attention forever. As a consequence some assets associated with foreign users were being missed.
2014-05-09 11:06:03 -07:00
f41809e07d
minor: Capitalize Hypergrid help category like others
2014-05-08 22:39:52 +01:00
afb938e579
Fix test breakage
2014-05-08 11:30:45 -07:00
a31393ba0b
Make the URL for texture redirects match the path of the resource that we use in OpenSim.
2014-05-08 11:18:17 -07:00
a845c1a893
Finished implementing redirects in GetTexture.
2014-05-07 19:38:33 -07:00
093705efd1
Delete extraneous console message in the Configger.
2014-05-07 17:19:57 -07:00
f4cba27105
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2014-05-07 17:00:12 -07:00
3db9b847bf
Allow Tools.Configger to take -inifile as argument
2014-05-07 16:59:11 -07:00
e44450cce1
Revert "fix infinite recursion loop in SendGridInstantMessageViaXMLRPCAsync()"
...
There is a problem here with infinite recursion, but this patch loses the 'hunting' behaviour where the code will attempt multiple lookups if the avatar is teleporting rapidly around different simulators.
This patch only does a single lookup before giving up.
This reverts commit cecb446e0e
2014-05-06 19:53:35 +01:00
78015bbbdc
Console commands for Estate Mgmt
2014-05-06 18:55:42 +01:00
9e83b43009
new version of patch to add default-user switch new version :qw :wq updated version of default user switch for load oar :q :q
2014-05-06 18:48:59 +01:00
8b3c2f7d0c
updated version of default user switch for load oar :q :q
2014-05-06 18:48:42 +01:00
cecb446e0e
fix infinite recursion loop in SendGridInstantMessageViaXMLRPCAsync()
2014-05-06 17:52:32 +01:00
0faba7dc33
Fix avatars going to corner of region when they are sitting on a child prim and the prim is deleted.
2014-05-06 17:41:13 +01:00
e245638f24
Change llUnSit to be able to unsit any avatar that is currently sat on the object, not just avatars sitting on the sittarget in the object containing the script. or when the object is owned by the parcel, land group or estate owner.
2014-05-06 17:35:34 +01:00
c9742c826d
Mantis 7146 The lsl function llGetMassMKS is not implemented
...
This patch implements llGetMassMKS as it is described in the wiki
http://wiki.secondlife.com/wiki/LlGetMassMKS
2014-05-06 17:31:21 +01:00
95eeb4dde8
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2014-05-06 17:22:47 +01:00
ef262799ca
Better error handling in AssetServerPostHandler. Invalid XML causes an InvalidOperationException, not an XmlException
2014-05-06 09:43:07 +03:00
614b9e14c4
When moving an item from a prim to a user's inventory, don't delete the item from the prim until it was successfully copied to the user
2014-05-06 07:28:46 +01:00
eb79c882ea
Show more meaningful error messages when failed to move an item from a prim to a user's inventory.
...
Also, actually show the error to the user in more cases. (Previously, sometimes the operation failed without telling the user anything.)
2014-05-06 07:28:45 +01:00
1e5cff32fc
Show more meaningful error messages when failed to give an item to another user
2014-05-06 07:28:44 +01:00
df49196e17
Log whenever an inventory operation is blocked because the item/folder isn't in the Suitcase
2014-05-06 07:28:43 +01:00
0fe08c8799
- When sending the "My Suitcase" folder to the client, always claim it has Folder Type 8. (Previously we had used Folder Type -1 in one place, and LLClientView didn't even bother changing Folder Type 100 to anything else.)
2014-05-06 07:16:37 +01:00
7862d1e20d
Added range-checking for the parameters to PRIM_POINT_LIGHT (used in llSetLinkPrimitiveParamsFast() )
2014-05-06 07:14:58 +01:00
13b2ac1425
Makes it possible to support grids in which all the simulators share all central services of a Robust server EXCEPT assets. In other words, grids where the simulators' assets are kept in one DB and the users' inventory assets
...
are kept on another. When users rez items from inventory or take objects from world, an HG-like asset copy takes place between the 2 servers, the world asset server and the user's asset server. This makes the simulators independent of the central asset server.
Note that this an advanced configuration and requires some security strengthening coming up.
2014-05-04 20:54:42 -07:00
7f570636f8
Please note: older simulators (0.7.6) still send the info about gzip in ContentType
2014-05-04 11:41:52 -07:00
5a10da3ee8
Added a optional key between the group remote connectors, sim and service. This allows for more secure group services, to be used by collections of mutually-trusting grids.
2014-05-03 17:13:53 -07:00
53b72ab4b8
minor: Comment out Cacheitems debug log lines for now
2014-05-02 13:31:58 +01:00
3a2c099169
Mantis 7144 missing ATTACH_AVATAR_CENTER constant
...
This patch adds ATTACH_AVATAR_CENTER and ATTACH_NECK
2014-05-01 23:20:31 +01:00
c31d93cb6f
Fix issue where only one of multiple attachments on the same attachpoint for NPCs would be seen by other viewers.
...
It appears that at least Singularity 1.8.5 (but probably others) rely on attachment FromItemIDs being different to display more than one.
This commit resolves this by generating random IDs instead of always using UUID.Zero for NPCs.
Resolves http://opensimulator.org/mantis/view.php?id=7110
2014-05-01 22:24:21 +01:00
f0411dc128
minor: Use Vector2.Zero constant and only set in condition branch where it was missing in TryParseConsole2DVector(). xbuild still compiles.
2014-04-30 21:50:18 +01:00
7c121a2acc
Change XEngine to call StateChange rather than RemoveScript on state changes
2014-04-30 20:56:49 +01:00
f0eeb47262
Add the "StateChange" function to the async comand manager to differentiate
...
between state changes and script exit/reset.
2014-04-30 20:54:34 +01:00
44f533d95a
Assign value to 'vector' to fix building under xbuild and Monodevelop
2014-04-30 15:45:00 -04:00
7bb673a854
minor: Correct mistake in terrain flip error message from previous commit 5d01a1f
2014-04-30 19:41:11 +01:00
5d01a1ff4d
minor: Print output in response to terrain console commands on the console rather than in the log.
2014-04-30 19:24:17 +01:00
253110293a
Add "terrain show" console command which outputs terrain height for a given region co-ordinate.
...
For debug purposes.
2014-04-30 18:04:47 +01:00
5fc61942e0
minor: convert back some tabs to spaces that got into ScenePresence via recent patch bc969a6b
2014-04-29 20:15:29 +01:00
d4eee213a9
Restore terrain height and flying adjustments that were eliminated from non-megaregion paths in ScenePresence.MoveToTarget() by recent patch bc969a6b
2014-04-29 20:05:08 +01:00
2dbc18054e
Add regression test for NPC movement on a variable region.
...
Extends basic physics to allow av movement on a varregion (basic physics is only really useful for regression test purposes).
2014-04-29 19:29:16 +01:00
88f7a833dc
Improved HTTP logging
2014-04-29 07:59:17 +01:00
06e4fcd260
Fixed the UpdateAgentInformation CAP: the viewer expects the simulator to echo back the maturity that it sent
...
Without this change, attempts to change the maturity rating in the viewer's Preferences don't work.
2014-04-29 07:59:10 +01:00
df89e15290
BulletSim: non-functional changes to debugging statements and formatting.
2014-04-28 18:36:50 -07:00
63aea3a5f2
BUlletSim: move safeynet ground plane to lower altitude. Define new BulletSim
...
parameter 'TerrainGroundPlane' which defaults to -500.
BulletSim had assumed altitudes never went negative but that is not true. The
ground plane is just a safety net so things wouldn't fall to infinity.
2014-04-28 11:08:47 -07:00
cb8c3ba023
Removed dependency on Linq in OpenProfileClient
2014-04-28 16:41:02 +01:00
d97896d39a
Differentiate between requests only the owner should be able to do and those
...
that managers can do when setting parcel data
2014-04-26 20:32:27 +02:00
1d1e444aed
Convert region loading to new format
2014-04-26 02:43:13 +02:00
5c661baf6c
Allow opening a https port using only http so that nginx can be used for ssl
2014-04-26 02:42:30 +02:00
2e216aa056
Add missing [Test] decorator to actually get the basic scene creation test from 2227f51b to run
2014-04-25 23:35:20 +01:00
9664273df6
Add basic regression test for creating a var region
2014-04-25 23:34:30 +01:00
2227f51b29
Add basic sanity regression test for creating a scene.
2014-04-25 23:16:07 +01:00
38acda9f29
Add regression test for terrain fill at two digit height and max ll height.
2014-04-25 23:01:24 +01:00
904baa6da6
Fix issue where terrain height values > 327 caused chaotic spiked terrain.
...
Per http://wiki.secondlife.com/wiki/Tips_for_Creating_Heightfields_and_Details_on_Terrain_RAW_Files#Notes_for_Creating_Height_Field_Maps_for_Second_Life
terrain heights up to 508 are possible on the LL grid (and were available on previous releases of OpenSimulator).
The obvious way to allow both this and equivalent -z values, is to rewiden the internal terrain height storage from short to int.
The memory tradeoff is most noticeable on the maximum 8192x8192 var region (equiv to 1024 normal regions), where it adds 128mb to resident use (128k on a normal region)
This is still better than the double used in previous releases.
This does not affect physics or data storage since they already use float and double respectively.
This may not be the final solution if we actually want to sacrifice -z, >327 or something else.
Relates to http://opensimulator.org/mantis/view.php?id=7076
2014-04-25 22:56:25 +01:00
a108fcac95
Restore overload mode accidentally disabled in a prior commit. Add a new
...
config option, LogOverloads, to log when a thread pool overload occurs.
This option defaults to "True" because the logging data is useful for
diagnosing threading issues.
2014-04-25 21:34:29 +01:00
2572ed9ed9
Adjust permissions to work hand in hand with what the viewer believes they are.
...
This fixes the issue of "Show in Search" seeming resetting at random.
2014-04-25 00:35:53 +01:00
cf54df3ecf
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2014-04-24 14:12:04 -07:00
1d9a9e6004
Fixes a long-standing bug related to god-mode change ownership of objects permissive, where the permissions of the children prims' inventory items were not changed. As a consequence, we couldn't control some of the objects imported via HG and OARs even in god mode.
2014-04-24 14:11:42 -07:00
0d898d8d8a
Revert "When linking a Hypergrid region, set the region's flags on the in-memory GridRegion immediately."
...
This reverts commit 463d0b2f8f
2014-04-24 19:08:50 +03:00
463d0b2f8f
When linking a Hypergrid region, set the region's flags on the in-memory GridRegion immediately.
...
(When using llTeleportAgent() this *specific* object is used for the teleport, so it should have the correct flags.)
2014-04-24 16:58:16 +01:00
bc06db3df4
- Created a standard function to send XML-RPC requests, which logs them like we do for other types of HTTP activity.
...
- Changed OpenProfileClient to use the new XML-RPC sending function
- Improved logging in WebUtil
2014-04-24 15:58:43 +01:00
e8a2eff2e8
Changed how UserProfile performs a fallback call using the OpenProfile API, because now JsonRpcRequest() returns an error result instead of throwing an exception
2014-04-24 15:58:43 +01:00
d62f0bc35d
Refactored: moved OpenProfileClient to a location where it can be used by both the Simulators and Robust
2014-04-24 15:58:42 +01:00
d15a3b10a3
When sending JSON-RPC calls (for UserProfile), use WebUtil instead of constructing the HTTP requests manually. This allows the calls to be logged when using "debug http all 6".
2014-04-24 15:58:41 +01:00
6efc203ce8
Fixed: hypergrid-linking stopped accepting the following format: " http://grid.example.com " (without a region name)
...
Fixes http://opensimulator.org/mantis/view.php?id=7128
2014-04-24 06:19:57 +01:00
98c1940820
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2014-04-24 01:48:05 +01:00
5dc0298f83
Apply logging flag to a spammy message that may have been overlooked.
...
No one needs to see every thread launch.....
2014-04-24 01:44:11 +01:00
7180690a14
Show Group name when land is group-owned
2014-04-23 23:29:17 +01:00
c77cd6adc7
minor: Remove unused System.Linq reference and use ParcelFlags.None instead of 0 from previous commit cb1f28
2014-04-23 22:59:28 +01:00
fb321a0573
Prevent sending Land Properties for unprivileged users
2014-04-23 22:59:13 +01:00
5092cbd77e
minor: Remove unused System.Linq reference and use ParcelFlags.None instead of 0 from previous commit cb1f28
2014-04-23 19:55:51 +01:00
cb1f2886cd
Prevent sending Land Properties for unprivileged users
2014-04-23 19:50:59 +01:00
7a5699224e
Fix regression test break on previous commit 328bc3b
2014-04-23 19:46:58 +01:00
328bc3b76e
Adjust avatar sit positioning on a target to pretty much exactly match that of the LL grid.
...
This uses an offset of 0.05 on the up vector of the sit orientation, after extensive analysis on
http://opensimulator.org/mantis/view.php?id=7096 and https://wiki.secondlife.com/wiki/Talk:LlSitTarget
This supersedes the previous adjustment in 5b73b9c4
2014-04-23 19:19:09 +01:00
b01e73cf27
Dynamic textures shouldn't be saved in the assets service (only in the simulator cache)
2014-04-23 14:42:40 +01:00
7eb12f96ec
Hypergrid: don't send Local assets to other grids
...
This commit also contains other changes, but they're all just for clarity. The only actual behavior change is to avoid Posting local assets.
2014-04-23 16:42:23 +03:00
018832522c
Removed GetUserInventory(). It wasn't being used, and was creating warnings because it's Obsolete.
2014-04-23 14:38:33 +01:00
ca78c8326e
Eliminated 'Obsolete' warning: don't call do-nothing function SetPreviousAppearance()
2014-04-23 14:38:04 +01:00
998d7009a6
Eliminated many warnings
2014-04-23 16:37:36 +03:00
617bc4710a
Workaround for SRAS: if Store Asset returns 'null' then assume the asset already exists, and this isn't an error
2014-04-23 14:19:24 +01:00
2c9859314f
Changed table 'im_offline' to use UTF8 characters. This fixes a problem with Offline IM V2 (only relevant to MySQL).
...
This fixes http://opensimulator.org/mantis/view.php?id=7123
Users that use MySQL should change their MySQL configuration to support UTF8. In the config file /etc/my.cnf (Linux) or my.ini (Windows), add these settings:
[mysqld]
character-set-server=utf8
[client]
default-character-set=utf8
And then restart MySQL (on Linux: "sudo service mysqld restart").
2014-04-23 16:18:28 +03:00
a893fd90cd
Fixed KeyframeMotion to work with very slow movement.
...
Previously, if the movement speed was below 0.05/sec then it didn't work correctly.
Fixes http://opensimulator.org/mantis/view.php?id=7117
2014-04-22 10:19:11 +01:00
93a9ed2a6d
Changed the maximum asset name and description lengths to constants. Also, pre-truncate the description of dynamic textures.
2014-04-22 12:18:54 +03:00
4cac87d9f4
Fixed: when a user logged-in, sometimes he didn't get notified of the Online status of friends, so they continued to appear Offline.
...
This happened because these notifications (the UDP packets) can only be sent to Root Agents. But the notifications were done in OnClientLogin(), at which point the client is still a Child Agent. Since a FireAndForget is used, it became a race condition as to whether the packets would be sent before or after the client became a Root Agent.
To fix this, we now only send the notifications once the client becomes a Root Agent for the first time.
2014-04-21 16:56:49 +01:00
538ff31b28
Better error handling when retrieving offline IMs
2014-04-21 16:56:26 +01:00
06db136fbc
Removed an attempt to set a user's presence to "Region 0" when they HG teleport to another grid.
...
a) This shouldn't have been done because at that point the user is still logged-in to the current grid. b) It's not necessary because the user will soon be logged-out completely. c) And it didn't even work because the MySQL database layer prevents setting the region to 0.
2014-04-21 16:56:14 +01:00
acc2c42a79
Better logging in PresenceService, to help diagnose presence problems.
2014-04-21 18:55:53 +03:00
bc969a6b46
Possible solution for #7120 and #7051
...
Signed-off-by: Robert Adams <misterblue@misterblue.com>
2014-04-21 05:58:29 -07:00
f93dac9239
Implement Oren's fix to prevent a privilege escalation with groups
2014-04-20 10:47:31 +02:00
3f76f72137
Better error-handling when storing assets: recognize that 'null' is an error value
2014-04-20 06:23:38 +01:00
52f8669169
Stopped setting the Service URL "GatekeeperURI" on users' accounts. It isn't actually used.
2014-04-20 06:23:37 +01:00
853c0fccc8
Fixed: when any avatar changed his Active Group, it was set as the active group for *all* the avatars in the scene (not permanently)
2014-04-20 06:23:37 +01:00
090f9bcece
Fixed: once a user has rezzed an object, they could then duplicate it as much as they wanted even if the parcel's permissions had since been changed to disallow rezzing
2014-04-20 06:23:36 +01:00
3185db7f94
Fixed: if a user belonged to the parcel's group then he was allowed to rez object in the parcel even if the flag "Create Objects by Group" was disabled
2014-04-20 06:23:36 +01:00
a780e01a54
Fixed: the parcel flag "Allow Scripts from Group" should only check if the parcel has a Group set; it doesn't have to be *deeded* to the group
...
Also some cleanup of the use of Group ID's (with no change to functionality).
2014-04-20 06:23:35 +01:00
63fd027494
Catch empty url error
2014-04-19 22:25:21 -04:00
b3ebec184f
In teleports, when sending the Source region, set its ServerURI to the Gatekeeper URI (which is used with Regions); not the Home URI (which is used with Users)
2014-04-13 12:58:37 +03:00
e1dd228f18
Better error checking when creating hyperlinks: a) Reject invalid strings; b) Default port is 80, not 0
...
The change of default port may fix http://opensimulator.org/mantis/view.php?id=7108 , where a user was able to create a Hyperlink to OSGrid from inside OSGrid.
2014-04-13 09:54:56 +01:00
c8914d22eb
BulletSim: reduce the terrain collison margin to be the same as other
...
objects in the world.
This was originally changed in an attempt to make vehicles work better
but the effect was not that large and it causes avatars to float
above the terrain.
2014-04-12 17:37:57 -07:00
574a11558d
Refactor: Rename GetOtherSetting to GetSetting and make SetOtherSetting private
2014-04-12 17:32:16 +01:00
5d964a6424
Remove the old XML format parsing. Now additional region params can just be
...
added as they are already exposed through an API when using Nini. That will
remove the need to always edit RegioInfo just to add a region based setting.
2014-04-12 16:58:07 +01:00
18b91fdbe9
Tweak to PrimLimits and add missing Regions.ini example
...
Signed-off-by: Melanie <melanie@t-data.com>
2014-04-12 14:40:34 +01:00
f0998a9222
Add per-user checking to PrimLimitsModule
...
Signed-off-by: Melanie <melanie@t-data.com>
2014-04-12 09:28:29 +01:00
7c148d9b2f
minor: use constants instead of magic numbers in llRequestAgentData() where possible
2014-04-11 00:52:28 +01:00
de0ab04d00
Actually add the llRequestAgentData() test class for commit 530c86
2014-04-11 00:36:50 +01:00
530c86335d
Fix the presence info caching used in llRequestAgentData(), which was completely inoperative.
...
This means the presence info may be out of date by up to 20 seconds, but this avoids scripts potentially triggering constants requests to user accout and presence info services.
Relates to http://opensimulator.org/mantis/view.php?id=7088 though I fixed in a different way.
Adds regression test for this case.
2014-04-11 00:29:06 +01:00
562a3cb338
BulletSim: small tweek to avatar height reduce feet embedded into prims.
...
This adjustment makes a default, shoeless avatar stand properly on a prim
for the various heights (0% to 100% in the appearance adjustment).
2014-04-10 06:53:36 -07:00
32ad66c274
Allows to sell objects on a parcel of land together with that parcel of land. The objects that are sold together with the parcel of land need to fulfill the following preconditions: owned by the current parcel owner, not set to a group, transferrable. This feature does not work for group owned parcels or land bought by a group.
2014-04-10 11:47:46 +02:00
c725ad1577
Fixed: when teleporting between grids, the avatar name wasn't always updated.
...
When an avatar is in their home grid, their name appears as "First Last". In other grids the name appears as "First.Last @grid.example.com". However, viewers have a bug and they don't always show the new name. We use a trick (changing the Group Title briefly) in order to make the viewers show the new name. This is only done after a Hypergrid teleport.
2014-04-09 15:00:54 +01:00
06e0528d0b
In teleports, pass the source region to the destination (similar to an HTTP referrer)
2014-04-09 09:22:20 +01:00
cf1686335f
Log when the presence service logs-out all the users in a region
2014-04-09 06:06:52 +01:00
af406748a2
Improved error messages when a teleport fails. The viewer's dialog already says "Teleport failed", so adding "Teleport refused" is redundant.
2014-04-08 08:11:30 +01:00
e00f1a0410
Allow invalidating the users cache
2014-04-08 08:11:29 +01:00
86105a1533
Better (amend to previous commit)
2014-04-07 19:51:26 -07:00
c0fd09b445
Avoid calling HELO service on malformed URLs. This is in response to an exception reported by danbanner.
2014-04-07 19:41:25 -07:00
85d51e57a9
When sending QueryAccess to a region, also send the user's Home URI
2014-04-07 07:32:36 +01:00
55cc8044cb
Refactored: use Scene.GetAgentHomeURI() to get the Home URI of a user
2014-04-07 07:26:44 +01:00
bb841ea9ce
Change OfflineMessageModule to support more differentiated return values and allow support for mobile devices and other non-viewer logins
2014-04-06 23:22:37 +02:00
f3508649f5
Fixed: during a teleport we always sent the error "The teleport destination could not be found" to the client. This happened on both success and failure.
...
On successful teleports this error wasn't actually shown to the user. But on failed teleports this error could hide the true cause of the failure. For example, attempting to use a Landmark that's more than 4095 regions away would result in two warnings appearing in the viewer: "Region too far" and "Destination could not be found". The second message hid the first one, so it wasn't obvious to the user what is actually the problem.
2014-04-06 15:42:33 +01:00
abe0f4a088
When preparing a Hypergrid teleport, tell the receiving grid which user is entering the grid.
...
This can affect which region to use. E.g., returning users may be allowed to enter any region, whereas users from other grids will have to enter a gateway region. Previously per-user decisions were only made later, but by then it's too late to change which region the user enters.
2014-04-06 15:40:45 +01:00
d4acaf25af
Pass the correct position to QueryAccess() instead of UUID.Zero (it was wrong in one place)
2014-04-06 15:40:45 +01:00
cacbb5c165
Don't re-retrieve sit part in SP.HandleAgentSit() when we already have it (this time with the right code change)
2014-04-05 02:16:14 +01:00
86a2cd915c
Revert "Don't re-retrieve sit part in SP.HandleAgentSit() when we already have it."
...
This reverts commit 2c00b73cd2
2014-04-05 02:11:36 +01:00
2c00b73cd2
Don't re-retrieve sit part in SP.HandleAgentSit() when we already have it.
2014-04-05 02:09:44 +01:00
8b8e1b88ec
fixed object-collision issue after uncheck phantom-flag
...
Signed-off-by: Michael Cerquoni <nebadon2025@gmail.com>
2014-04-04 12:29:44 -04:00
aec723b955
Fix sp.AbsolutePosition when agent is sitting on a child prim, which in turns fixes llDetectedPos(), llGetLinkPrimitiveParams() and similar functions.
...
Add regression test for this case.
In relation to http://opensimulator.org/mantis/view.php?id=7043
2014-04-03 23:22:57 +01:00
6b1d09813e
remove some whitespace that snuck in with last patch
2014-04-03 13:25:32 -04:00
50eec6df52
Add Varregion support to Terragen Handler
...
Signed-off-by: Michael Cerquoni <nebadon2025@gmail.com>
2014-04-03 13:14:13 -04:00
3c5b7d7b79
BulletSim: Minor Fix to vehicle hovering, add more ways to disable it.
...
Signed-off-by: Michael Cerquoni <nebadon2025@gmail.com>
2014-04-03 13:07:48 -04:00
4aa483777b
Move new Estate commands to OpenSim.cs
...
Signed-off-by: Michael Cerquoni <nebadon2025@gmail.com>
2014-04-03 12:45:43 -04:00
672bd9fc98
Reduced log levels for REST 404 errors to DEBUG
2014-04-03 15:04:26 +01:00
01daa74adf
Better error messages in RestClient
2014-04-03 14:13:22 +01:00
6d2893be67
When teleporting using Hypergrid, show more informative error messages in case of error
2014-04-03 14:13:03 +01:00
65c4cb48ac
BulletSim: make avatar physical shape to be a rectangle rather than
...
a capsule. Set the default to be the rectangle shape and adjust the
parameters in OpenSimDefaults.ini for the new shape.
The rectangle shape will perform better and avatar height can be
computed more accurately.
2014-04-02 21:53:58 -07:00
9406db3047
Fix problem with floating avatar by passing avatar size information
...
to the physics engine.
This operation was accidentally removed while in the middle of improving
the computation of the avatar height. This is a temp fix until the real
solution is added.
2014-04-02 21:52:24 -07:00
e756457703
Remove redundant part.SitTargetAvatar setting from SP.MakeRootAgent as part.AddSittingAvatar already does this.
2014-04-03 01:21:50 +01:00
6ac9c9c972
refactor: Use m_sittingAvatars to maintain the list of sitting avatars instead of two independent structures that do exactly the same thing
...
m_sittingAvatars code also already properly handles locking to avoid races.
2014-04-03 01:14:39 +01:00
91b7679db9
minor: Fix warning in AvatarFactoryModule
2014-04-03 00:35:42 +01:00
17929abd28
Wrap contents of ETM.CrossAgentToNewRegionAsync() in try/catch to avoid a failure terminating simulators running on Windows
...
In relation to http://opensimulator.org/mantis/view.php?id=7050
2014-04-03 00:34:20 +01:00
5cb4044539
Don't clear avsToCross in SOG.AbsolutePosition.set(), this is unnecessary since the structure is local and never reused after the clear
2014-04-03 00:26:55 +01:00
e6d0dcd4e8
Fix bug where crossing to a neighbouring region and back again would trigger an exception, and a second recross would stop the user moving until relog
...
Also fixes an issue where sitting avatar counts became inaccurate after any cross.
Part of the problem was due to cloning code using MemberwiseClone() but not resetting certain collection structures.
Adds regression test for this case.
In relation to http://opensimulator.org/mantis/view.php?id=7050
2014-04-03 00:19:53 +01:00
2051535ce1
String matching in REST handlers: must allow '-' as a separator, because the "/map" handler uses it
2014-04-02 15:11:54 +01:00
0301c81b01
Made GetScenePresence() case-insensitive when searching by user name. This makes it easier to use console commands such as "show appearance".
2014-04-02 13:08:31 +01:00
9211361b19
Fixed AssetsExist in SQLite
2014-04-02 10:00:09 +03:00
6b65895736
Made the SQLite unit tests work on Windows (sqlite3.dll wasn't being loaded)
2014-04-02 09:49:57 +03:00
aa217cf90f
Better string matching when searching for REST handlers: must match an entire path component (ending with '/' or a similar character).
...
For example, these should match: "/assets" and "/assets/12345", but these shouldn't match: "/assets" and "/assets_exist".
2014-04-02 08:52:44 +03:00
bbfda8e19e
Fixed last-resort sending of error response (HTTP 500) when an error occurs while handling a request.
...
The previous code didn't actually send the response, so the caller was stuck until the timeout (100 seconds).
2014-04-02 06:32:41 +01:00
fad0fd7f75
Fixed the "Update Asset" handler: it was looking for the Asset ID in the wrong parameter.
...
This doesn't actually matter because the "Update Asset" operation isn't implemented in AssetsServer. But still, the handler should do the right thing...
2014-04-02 06:32:40 +01:00
d1c3f8eef5
Added assets service method AssetsExist(), which returns whether the given list of assets exist.
...
This method is used to optimize sending assets with embedded assets: e.g., when a Hypergrid visitor takes an item into the inventory.
2014-04-02 06:30:57 +01:00
ac16a667e1
fix orphaned code in sun module per mantis 7068
2014-04-01 19:48:03 -07:00
7bafee28fa
Removing warning from SceneObjectLinkingTests.TestLinkDelink2SceneObjects() by actually checking whether delinked grp3 is not null
2014-04-02 01:26:58 +01:00
46095c058e
minor: comment out currently unused RegionCombinerModule.LogHeader
2014-04-02 01:24:40 +01:00
e5a5b69b08
remove EstateManagmentCommands.m_commander that has been unused for some time
2014-04-02 01:23:40 +01:00
43eab5e163
Console command to rename Estate
2014-04-02 01:17:41 +01:00
444737c830
minor: Only calculate fetched usedPrims and simulatorCapacity info in PrimLimitsModule.CanObjectEnter() when we know for sure that we need them.
2014-04-02 01:05:37 +01:00
7cb1690589
minor: disable logging in recently added scene object crossing tests and remove some unnecessary test config
2014-04-02 01:01:53 +01:00
0af8886400
Fix problem where moving an object to another region on the same simulator was failing, with the object returning to its original position.
...
Root cause was that PrimLimitsModule was not properly handling the case where the parcel it was asked to check was outside the current region's bounds.
If this is the case, we can abort the check since the receiving region will perform it.
Added a regression test for this case.
2014-04-02 00:58:33 +01:00
4cbd45f3d5
Merge branch 'master' of /home/opensim/src/opensim
2014-03-31 15:50:27 -04:00
59d0e3c3c8
Add check to prevent the return of a wrong value when key is NULL_KEY
2014-03-31 15:49:53 -04:00
635f3f77ab
Console command to change Estate owner
...
Signed-off-by: Michael Cerquoni <nebadon2025@gmail.com>
2014-03-29 00:59:15 -04:00
6557eba235
Removed default timeout when starting scripts after Load OAR
2014-03-28 13:04:19 +03:00
1fe504fee5
Better skipping of "SculptData" when parsing XML
2014-03-28 12:52:06 +03:00
f360b687d6
Removed "SculptData" from the serialized XML format of prims
2014-03-28 07:51:21 +01:00
ba5a236922
Profiles local StorageProvider fix, round 3
2014-03-27 13:41:20 -04:00
20640357ab
Fix to local StorageProvider override
2014-03-27 13:27:46 -04:00
45ada5ca2d
Merge branch 'master' of /home/opensim/var/repo/opensim
2014-03-27 12:56:12 -04:00
9c7b28341c
Add support for specifying non-default StorageProvider
2014-03-27 12:36:30 -04:00
a15282f023
Merge branch 'master' into m_test
2014-03-27 12:21:38 -04:00
161c827a44
Fixed a case where logging an HTTP response failed because the stream was non-seekable
2014-03-27 17:46:37 +02:00
76add0fdb0
Log errors in MakeRequest() as INFO, not ERROR. Some communications problems are benign (e.g., can't send Friend status update to a region that is down), so don't log them as ERROR so soon. We rethrow the exception, so the caller can still decide to log the error as an ERROR.
...
Resolves http://opensimulator.org/mantis/view.php?id=7077
2014-03-27 15:00:42 +01:00
1247174db4
Fix MSSQLInventoryHandler.IncreementFolderVersion where sql accidentally used a MySQL style ?folderID insted of @folderID
...
Thanks to LuciusSirnah in http://opensimulator.org/mantis/view.php?id=7075 for this fix
2014-03-26 21:02:26 +00:00
de941d2ec7
minor: remove compiler warning from NullEstateData
2014-03-26 21:00:57 +00:00
b0bae62c30
refactor: Actually use MaptileStaticFile in RegionInfo rather than having both a public field and a get property
2014-03-26 20:58:58 +00:00
7a4c5b067d
Add MSSQL EstateStore.migrations VERSION 10 transaction to add AllowLandMark, AllowParcelChanges and AllowSetHome columns to estate_settings table.
...
Taken from http://opensimulator.org/mantis/view.php?id=7074 by LuciusSirnah. Thanks!
2014-03-26 20:42:53 +00:00
6c447f892e
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2014-03-26 20:36:33 +00:00
5e8dfb4f7e
Fix extra physics params MSSQL migration (version 39).
...
This was failing because it used MySQL syntax
This is taken from Lucius Sirnah's entry in http://opensimulator.org/mantis/view.php?id=6593
But with the column existence checking removed, as this should not be necessary in a migration and is inconsistent with all other migrations, though I can see a case for doing it.
2014-03-26 20:34:04 +00:00
7a47c15edb
- Increased the threadpool timeout to 10 minutes
...
- Changed a few places that launch long-lasting threads to skip the timeout altogether
2014-03-26 20:34:55 +01:00
2fbb906ff6
Reinsert code to extract size_x and size_y parameters from GetHomeRegion response in UserAgentServiceConnector.
...
This is actually code from commits afb2e07cf61cdf
2014-03-26 02:34:22 +00:00
62a03a5cac
Also take YP/commented out JS references from script engine CodeTools.
...
Fixes build break from d3387d591a
2014-03-26 01:20:49 +00:00
d3387d591a
Remove unmaintained and unused YieldProlog scripting language
...
This hasn't been mainntained since 2008 and has not been kept up with the rest of the language infrastructure.
Hence, it almost certainly doesn't work and has never been used, afaik
If this is wrong, please say on the opensim-users/dev mailing list.
Removing to reduce maintenance burden (since it still needs to be made to compile).
2014-03-26 00:59:57 +00:00
99308d64c6
minor: Add some doc to Scene.Backup() detailing its direct invocation if the indepedent backup thread is not running (e.g. in a regression test)
2014-03-26 00:43:17 +00:00
6d1d58b654
Use the "X-Content-Encoding" header to indicate gzipped data, because old OpenSims fail if they get an unknown "Content-Encoding"
2014-03-25 18:09:23 +01:00
14836e60ff
Fix issue with user picks creation. The snapshot id is UUID.Zero in new parcels.
2014-03-25 11:10:48 -04:00
9aec36156e
Sync code that has moved in development branch with changes in master
2014-03-25 11:09:27 -04:00
542bef20e8
Move JsonRpc request code out for general availability
2014-03-25 11:08:27 -04:00
dba33fee39
Move from UserProfileModule for general availability
2014-03-25 11:08:11 -04:00
b1d8aa0b64
Use the "Content-Encoding" header to indicate gzipped streams
2014-03-25 15:36:59 +01:00
368b29a680
In Core Profiles: as a fallback, try to get profiles from foreign grids using the OpenProfile protocol
...
Resolves http://opensimulator.org/mantis/view.php?id=6954
2014-03-25 09:37:18 +01:00
f90aee696a
Always throw an exception if MakeRequest (used for HTTP POST) fails. (Previously many exceptions were ignored)
...
Resolves http://opensimulator.org/mantis/view.php?id=6949
2014-03-25 09:37:10 +01:00
f901a38204
Improved logging of HTTP requests
...
- MemoryBuffer isn't seekable, so we can't log it. Log the string instead.
- Handle compressed streams
- Don't attempt to dump binary data. Either don't log it at all (if we know it's binary), or at least convert non-ASCII characters to ASCII.
- Log responses to HTTP requests
- Use the same log prefix for all of these log messages ("[LOGHTTP]"), to make them easy to see at a glance
- Increased the snippet length to 200 (80 doesn't show enough), and add "..." only if the message was actually truncated
Resolves http://opensimulator.org/mantis/view.php?id=6949
2014-03-25 09:36:53 +01:00
4289b71141
Fixed unit tests due to changes in the threadpool
2014-03-25 10:04:52 +02:00
e131e73652
Run slow operations in a separate thread, instead of using FireAndForget (which has a 1-minute timeout)
...
Resolves http://opensimulator.org/mantis/view.php?id=6945
2014-03-25 08:01:55 +01:00
84d7227dfd
Changed LogThreadPool to have 4 logging levels. Added console command "debug threadpool level" to set the logging level.
...
Resolves http://opensimulator.org/mantis/view.php?id=6945
2014-03-25 08:01:50 +01:00
b13214af27
Added a watchdog to abort slow threads in the main thread pool
...
If a task in the thread pool hangs then it will permanently take up
one of the threads. If this happens repeatedly then the thread pool will
become exhausted and OpenSim will fail. This watchdog terminates threads in the
thread pool that have been executing for over a minute (which probably
means they're hung).
Resolves http://opensimulator.org/mantis/view.php?id=6945
2014-03-25 08:01:45 +01:00
e735f76553
LogThreadPool: when the thread is for ProcessPacketMethod, also log the packet type
...
Resolves http://opensimulator.org/mantis/view.php?id=6945
2014-03-25 08:01:41 +01:00
4031933475
Refactored DebugFlagsEnum
...
Resolves http://opensimulator.org/mantis/view.php?id=6945
2014-03-25 08:01:37 +01:00
8555e54e22
Automatically start logging FireAndForget activity if the threadpool is full
...
Resolves http://opensimulator.org/mantis/view.php?id=6945
2014-03-25 08:01:32 +01:00
7c0ebcb984
Added debug flag: LogThreadPool. It makes us log every use of the main threadpool.
...
Resolves http://opensimulator.org/mantis/view.php?id=6945
2014-03-25 08:01:13 +01:00
a30ad71651
Guard against Scene being null in attachments it the wearing avatar is in the process of logging out.
2014-03-25 03:17:44 +01:00
075cf2baa3
Remove the spammy "voice not enabled" message some viewers trigger in non voice parcels
2014-03-25 03:17:04 +01:00
17aeec8860
Reinstate the timed region change signal
2014-03-25 03:16:37 +01:00
091f3a8000
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2014-03-25 00:20:38 +00:00
e12c044eab
Don't fail to enable permissions modules correctly if there is any leading or trailing whitespace between comma separate module combinations.
2014-03-25 00:19:24 +00:00
8276a9e5f7
Fixed Debug command for Groups. (Use of wrong capitalization caused *two* "debug" options to appear in "help")
...
This is a (small) part of http://opensimulator.org/mantis/view.php?id=6949
2014-03-24 18:27:18 +01:00
6a477e044d
If prim region crossing fails then don't delete the prim from the original region
...
Resolves http://opensimulator.org/mantis/view.php?id=6946
2014-03-24 18:24:50 +01:00
1769e93c42
Fixed parsing of coalesced objects if the XML starts with an XML Declaration ("<xml ...>")
...
Resolves http://opensimulator.org/mantis/view.php?id=6944
2014-03-24 18:18:29 +01:00
1a32b35279
In Load OAR, correctly restore group-owned objects
...
Resolves http://opensimulator.org/mantis/view.php?id=6943
2014-03-24 18:18:23 +01:00
305f5110c6
In Load OAR: Zero isn't a valid Group ID
...
Resolves http://opensimulator.org/mantis/view.php?id=6943
2014-03-24 18:18:08 +01:00
35078e03e5
During Load OAR, fix the User and Group ID's in objects that are embedded in assets (previously only rezzed objects were fixed)
...
Resolves http://opensimulator.org/mantis/view.php?id=6942
2014-03-24 18:17:59 +01:00
5fd9411143
Refactored Load IAR: created a generic mechanism to modify the SOG's as they are being loaded
...
Resolves http://opensimulator.org/mantis/view.php?id=6942
2014-03-24 18:17:35 +01:00
0ff61341e4
HGAssetService searches for the "HomeURI" setting in several sections: Startup, Hypergrid, HGAssetService
...
Resolves http://opensimulator.org/mantis/view.php?id=6940
2014-03-24 18:02:22 +01:00
8cec0b3fa1
If updating a user's profile notes fails then return an error
...
Resolves http://opensimulator.org/mantis/view.php?id=6938
2014-03-24 18:02:17 +01:00
1b30ae81b5
Fixed updating usersettings in the database
...
Resolves http://opensimulator.org/mantis/view.php?id=6938
2014-03-24 18:02:05 +01:00
b9e0d0fdb2
Don't show hidden groups in search results
...
Resolves http://opensimulator.org/mantis/view.php?id=6937
2014-03-24 18:01:56 +01:00
1d4551e52f
Check settings for groups module
...
Resolves http://opensimulator.org/mantis/view.php?id=6937
2014-03-24 18:01:47 +01:00
c8583e566d
When searching for users, don't add users from the local cache if they have an invalid UUID
...
Resolves http://opensimulator.org/mantis/view.php?id=6935
2014-03-24 18:01:37 +01:00
a2dd8f31de
Trim search queries (for users, groups, etc.). I have found that sometimes the viewer adds a space at the end, which causes searches to fail.
...
Resolves http://opensimulator.org/mantis/view.php?id=6935
2014-03-24 18:01:28 +01:00
6edc446780
Fixed: OnRegionInfoChange was never triggered
...
Resolves http://opensimulator.org/mantis/view.php?id=6934
2014-03-24 18:01:22 +01:00
bf68dbabd7
Save to database these parcel updates: Force Owner, Abandon Request, Reclaim. (Previously these updates only changed the parcel in memory)
...
Resolves http://opensimulator.org/mantis/view.php?id=6934
2014-03-24 18:01:08 +01:00
89945f8829
Refactored: ExternalRepresentationUtils should be the only place where the "CreatorData" field is calculated, to ensure uniformity
...
Resolves http://opensimulator.org/mantis/view.php?id=6933
2014-03-24 18:00:59 +01:00
edc04d4184
When updating the CreatorId of an inventory item, automatically update the CreatorIdAsUuid field as well
...
Resolves http://opensimulator.org/mantis/view.php?id=6933
2014-03-24 18:00:39 +01:00
5b2af7f99e
Moved the linkage between LoginService and HGInventoryService to the config file
2014-03-24 18:33:18 +02:00
df9845a283
When a user logs-in, automatically create the Suitcase folder
...
This is only done if the Suitcase Inventory Service is used.
Previously the Suitcase was created at a later time, which meant that it wasn't shown in the viewer until the viewer was restarted.
2014-03-24 17:02:13 +01:00
7496d0b0f7
Fixed unit tests for delinking objects
2014-03-24 15:05:39 +02:00
4bccfed80c
When logging in UserAgentServiceConnector, always log the original server URL (the hostname), not the IP
...
This resolves http://opensimulator.org/mantis/view.php?id=6955 (that patch was modified a bit)
2014-03-24 14:20:19 +02:00
921f0052f4
Get the full viewer name even if it's (incorrectly) sent in the 'Channel' field
...
Recent versions of Firestorm and Singularity have started sending the viewer name in the 'Channel' field, leaving only their version number in the 'Viewer' field. So we need to search both of these fields for the viewer name.
This resolves http://opensimulator.org/mantis/view.php?id=6952
2014-03-24 12:26:52 +01:00
6734b94761
Better error messages
...
This resolves http://opensimulator.org/mantis/view.php?id=6936
2014-03-24 12:22:32 +01:00
773ffcafc3
Removed "hacktastic" code that is no longer needed.
...
We no longer set the object's AbsolutePosition in this place, so the IsAttachment hack doesn't do anything anymore.
This resolves http://opensimulator.org/mantis/view.php?id=6936
2014-03-24 12:05:25 +01:00
62b3bdf0fc
When linking two groups, and then deleting the combined group: delete *all* of the combined group's prims, including those that came from the second subgroup
...
This fixes http://opensimulator.org/mantis/view.php?id=6175
2014-03-24 11:44:48 +01:00
b0cb0ec02f
BulletSim: fix problem where axis constraints were also constraining
...
linear motion.
The code was limiting linear motion to be only in the positive direction
for any axis that was constrained.
2014-03-23 13:08:31 -07:00
db83208794
Fix negative stat for Active Scripts
...
Signed-off-by: Michael Cerquoni <nebadon2025@gmail.com>
2014-03-22 23:02:10 -04:00
ff5c38534d
Reverting "Set default name for mute list" that was pushed by mistake.
...
This reverts commit 58def34dbe
2014-03-22 16:38:48 -04:00
58d7e3b8ed
Reverting "Pass method to offline.php" commit that was pushed by mistake.
...
This reverts commit fe16a72a9a
2014-03-22 16:31:36 -04:00
fe16a72a9a
Pass method to offline.php using ?blah instead of /blah/. Avoids issue with Apache web servers running PHP via CGI.
2014-03-22 15:13:03 -04:00
58def34dbe
Set default name for mute list module as shown in OpenSim.ini.example
2014-03-22 15:13:03 -04:00
d4dad75a3c
BulletSim: Fix jumping while running. Was unintentional taking way all upward target motion for avatar when running.
...
Signed-off-by: Michael Cerquoni <nebadon2025@gmail.com>
2014-03-22 15:00:48 -04:00
ebe7726cd7
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2014-03-22 01:49:28 +00:00
a4d322dcd1
Allow the setting from the environment to take effect if no explicit setting is given.
...
This is done by calling the constructor only with a directory if one is actually given.
2014-03-22 01:47:48 +00:00
ccf18fd2ef
Rename SOG.InSceneBackup to CanBeBackedUp to reflect its actual functionality.
...
It does not indicate that a SOG has been set to be backed up or not. It indicates that a SOG can be backed up in principle.
In practice, this was added by lbsa71 in 2007 and is set to always true, albeit as a virtual property.
2014-03-22 01:36:21 +00:00
3d0778bcd6
Allow Mono Plugin Registry setting for Regions
...
Signed-off-by: Melanie <melanie@t-data.com>
2014-03-22 01:29:51 +00:00
a5800f479e
If an object has it's temporary flag unset after being set, put it back in the persistence list.
...
Effectively uses the patch in http://opensimulator.org/mantis/view.php?id=7060
But also adds a regression test and exposes the necessary property to allow this to work.
2014-03-22 00:29:13 +00:00
178a5a5585
rename prefix of scene-inventory.<scene-name>.ProcessedFetchInventoryRequests and QueuedFetchInventoryRequests to inventory.httpfetch.*
...
Actual inventory processing is done with a single set of static structures rather than per scene.
2014-03-21 23:29:31 +00:00
fb312279c9
Mantis 6922: No particles are generated if their size exceeds the maximum allowed size.
...
This patch ensures that no particle scal value can exceed 4.0
2014-03-21 23:13:34 +00:00
47e7febebc
Add monitored thread last update times as stats in "show stats all"
...
These have the format server.thread.<thread-name>
2014-03-21 02:06:10 +00:00
da25903300
Adding a way to disable/enable the in built Dwell Module
2014-03-20 22:35:50 +00:00
7f027552ec
If we find an existing suitcase folder in HGSuitcaseInventoryService.GetRootFolder(), then return that as a response rather than null.
...
Fixes a regression from commit 346644016chttp://opensimulator.org/mantis/view.php?id=6969
But I'm assuming that was a mistake since clearly we should be returning this data - this was original behaviour
2014-03-20 20:36:47 +00:00
d04bb3ca9b
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2014-03-20 20:15:57 +00:00
bd6f734d3a
Mantis 6974 PERMISSION_TRACK_CAMERA should be implicit on attach.
...
http://wiki.secondlife.com/wiki/Run_time_permissions
This change makes PERMISSION_TRACK_CAMERA implicit on attach
2014-03-20 20:11:26 +00:00
b5f94c72b9
Allow MaptileStaticFile path to be set to anywhere and not force it to bin/maptiles
2014-03-19 11:16:52 -04:00
61353dde80
Allow Region specific static maptiles to be loaded from file.
2014-03-18 22:18:50 -07:00
cf97535d9e
Revert "Simplify DoubleQueue to eliminate redundant sempahore work."
...
This reverts commit 52b7b40034
2014-03-19 01:40:56 +00:00
52b7b40034
Simplify DoubleQueue to eliminate redundant sempahore work.
...
Exclusion is already guaranteed by the lock on m_syncRoot.
Semaphore could not allow more than one thread in these sections anyway since the underlying SDK structures are not thread-safe.
2014-03-19 00:48:13 +00:00
1497b75361
minor: Put ProcessedFetchInventoryRequests and QueuedFetchInventoryRequests in stats category "scene-inventory" instead of "scene"
...
To distinguish from general scene stats
2014-03-19 00:37:06 +00:00
9858766516
minor: Make "stats show" an alias for "show stats" command.
2014-03-19 00:35:49 +00:00
e6080a38c5
Rename "debug stats record" command to "stats record" for consistency. Move from debug to general command category
2014-03-19 00:29:36 +00:00
1d0a9e521c
Allow a snapshot of stats to be dumped to a file with a "stats save" command
2014-03-19 00:28:57 +00:00
fad1d70180
Add httpserver.<port>.QueuedPollResponses and httpserver.<port>.ProcessedPollResponses statistics
2014-03-18 23:47:33 +00:00
9e0d419239
minor: Correction to description of QueuedPollResponses since this covers long poll and other 'poll' types
2014-03-18 23:24:22 +00:00
eed343ed8a
Add httpserver.<port-number>,QueuedPollResponses stat
...
This shows the number pf poll responses queued for processing.
2014-03-18 23:21:07 +00:00
7df325c275
Extend locking in BlockingQueue to cover operations that are not guaranteed to be thread-safe
2014-03-18 23:05:49 +00:00
a660c0a750
Add scene.<scene-name>.ProcessedFetchInventoryRequests
...
This shows the number of requests that have been processed.
These have not necessarily been sent back to the request since this is done separately by the PollServiceRequestManager
2014-03-18 20:59:11 +00:00
8ce3fa646b
Allow "show stats" console command to take a full stat name and display only that stat.
...
For example, scene.test.RootAgents will show only the RootAgents stat in the scene named "test"
2014-03-18 20:21:47 +00:00
e82d394ddf
Add scene.<scene-name>.QueuedFetchInventoryRequests stat
...
This is to aid in detecting whether there are fetch inventory requests remaining to be processed.
2014-03-18 20:10:41 +00:00
d5f5649750
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2014-03-18 20:09:15 +00:00
c605c7a7b7
Lock m_syncRoot on DoubleQueue.Count. This is not documented as a thread-safe operation
2014-03-18 19:54:07 +00:00
c0cdc6b74f
Add delete maptile ability to MapImageService - yet untested
2014-03-18 02:16:00 +01:00
a53272c5fb
Add delete maptile ability to MapImageService - yet untested
2014-03-18 00:50:00 +00:00
ae56b946cf
Fix a bug in previous commit 01520bb where I accidentally saved OtherCleanTime instead of Dwell
2014-03-18 00:34:40 +00:00
01520bbb3e
Save and load dwell parcel stat in MySQL DB adaptor. Field in table already exists!
...
The SQLite database adaptor was loading and saving dwell whilst MySQL was not, even though the field already exists in the db table.
2014-03-18 00:02:55 +00:00
f3e177814a
Add regression test for http inventory fetch.
...
Involved some restructuring to allow regression tests to dequeue inventory requests and perform poll responses synchronously rather than async
2014-03-17 20:51:35 +00:00
873eee5431
Implement osForceBreakAllLinks().
...
Identical to llBreakAllLinks() except that it doesn't require the script to have link permissions.
2014-03-13 00:04:20 +00:00
6a279feb2f
Only allow llBreakAllLinks() to work if script has received PERMISSION_CHANGE_LINKS
...
As per http://wiki.secondlife.com/wiki/LlBreakAllLinks
Same as existing llCreateLink() and llBreakLink()
2014-03-12 23:54:20 +00:00
296d63e20b
Implement osForceCreateLink() and osForceBreakLink()
...
These are identical to llCreateLink() and llBreakLink() except that they don't require script permissions.
However, osForceCreateLink() still requires that linked and linkee still have the same owner.
There's also an AutomaticLinkPermission setting in [XEngine] that could be set to true to prevent the LSL function checks.
But this doesn't allow the finer control over which users/scripts, etc. can do this that the OSSL functions provide.
2014-03-12 23:05:16 +00:00
beba20846f
When sending group notices through group messaging, allow the agent ID to use for fetching group data to be different from im.fromAgentID
...
This is because xmlrpcgroups currently always checks visibility for the requesting agent ID (unlike Groups v2, which can accept UUID.Zero)
But group notice IMs have a from agent which is the group rather than the sending agent.
Further addresses http://opensimulator.org/mantis/view.php?id=7037
2014-03-12 19:31:04 +00:00
7112ee0015
Enable MapImageServiceModule with no refresh
2014-03-11 23:52:11 +00:00
86630a1b70
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2014-03-11 23:39:07 +00:00
d975b42f6a
Instead of auto-creating a parcel on request if one doesn't cover a given location, fill in gaps or extend existing parcel right after initial data load.
...
This is in line with simpler and still existing behaviour where a default parcel is created if no parcels are in storage at all.
Making this change as another step to address current problems with spurious parcels occasionally being created.
Also adds regression tests for different load behaviours depending on existing stored parcel data.
Relates to http://opensimulator.org/mantis/view.php?id=7035
2014-03-11 23:38:22 +00:00
8edf4225f3
varregion: remove serialization of region terrain to floats when sending patches.
...
This should eliminate much memory thrashing and CPU usage while sending initial
terrain.
The old way of passing terrain was to convert it to an array of floats. This is
really bad for large terrain (think 4096x4096 floats). This change passes a dummy
float array since the real region info is used anyway and the floats are ignored.
(The ignoring the terrain floats is a kludge so as to not change IClientAPI.)
2014-03-11 07:12:47 -07:00
742f505440
Change terrain update sending to be triggered by frame tick rather
...
than everytime terrain is changed.
The TerrainModule now hooks the frame event and, if terrain has changed,
sends terrain updates to the clients. This polling pattern replaces
the previous push on change pattern and will make it easier to do per
client throttling and per scene presence terrain update ordering.
2014-03-10 22:05:18 -07:00
0237d9113d
Don't start KeyframeMotion timers until all the regions are ready. This prevents problems in megaregions (prims that think they've crossed over to other regions).
2014-03-11 00:55:58 +00:00
120f872d2b
After an object with KeyframeMotion is copied into inventory, resume the motion (previously it remained stopped)
2014-03-11 00:43:22 +00:00
932c9e757b
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2014-03-11 00:16:31 +00:00
77e7bbcbf7
Send group notices through the same messaging module mechanism used to send group chat to avoid timeout issues when sending messages to large groups.
...
Only implementing for XmlRpcGroups initially to test.
May require MessageOnlineUsersOnly = true in [Groups] to be effective.
In relation to http://opensimulator.org/mantis/view.php?id=7037
2014-03-11 00:11:18 +00:00
9de3fe9410
Add Varregion support to osGetRegionSize OSSL function
...
Signed-off-by: Michael Cerquoni <nebadon2025@gmail.com>
2014-03-07 17:48:07 -05:00
8225e3f40c
Remove try/catch in LandManagmentModule.GetLandObject() - this is very old code and the caught exceptions can no longer occur.
2014-03-07 01:41:31 +00:00
3c05d67094
Lock m_landlist whilst loading parcels from storage to prevent a race against any parcel auto-creation in GetLandObject()
2014-03-07 01:36:06 +00:00
6b7625a56b
Only auto-create a land parcel when there is none in a specified tile if there is more than 1 existing land parcel.
...
This is because there are still issues with bad parcels being generated in http://opensimulator.org/mantis/view.php?id=7035
Theorizing now that it's possible that something is calling GetParcel() before any parcel data has been loaded from persistence.
2014-03-07 01:23:19 +00:00
71918eeab4
Add regression test for sending group notices via xmlrpc groups connector.
2014-03-07 01:04:54 +00:00
ddd38a3dea
Add scene name to bad parcel add logging
2014-03-06 19:12:16 +00:00
58c0ed78d4
refactor: Simplify land object by using c# get/set auto-properties where applicable.
2014-03-06 02:12:58 +00:00
470d053443
minor: slightly simplify code in LandObject.ContainsPoint()
2014-03-06 00:51:39 +00:00
ed14e97bb4
Remove array initialize calls in LMM - these are unnecessary as the VM already does this.
2014-03-06 00:46:16 +00:00
aa2fb1ec25
minor: Increase size of parcel name field in "land show" console command output. Construct table using CDT rather than string formats
2014-03-06 00:40:24 +00:00
14569992e1
Prevent adding a land object if it overlaps any existing objects that have not had their bitmaps adjusted.
...
This is to prevent an immediate problem in http://opensimulator.org/mantis/view.php?id=7035 where a development code bug occasionally overlays all the existing parcels with a blank parcel owned by the estate manager and to gather more data.
My guess is that this parcel is being created by the new code in LandManagementModule.GetLandObject(), probably some race between threads since this only happens occasionally.
Adds regression tests for this case and for parcel subdivide.
2014-03-06 00:11:13 +00:00
4e6f7435d0
Add UUID and ready status (whether region has finished starting up) to "show regions" console output.
2014-03-05 01:23:48 +00:00
39ed382ddf
Don't request a terse update after local teleport - this will be done by the main frame loop anyway and has the potential to race that thread.
2014-03-05 00:59:27 +00:00
c9415fd763
If an avatar is sitting, send out position updates to clients for any change, not just those outside the usual tolerances.
...
This is to allow small adjustments of less than 0.05m in functions such as llSetPrimitiveLinkParams() to work
This is another fix for http://opensimulator.org/mantis/view.php?id=7044
Extends regression test for this case.
2014-03-05 00:38:38 +00:00
31de7b845f
When positioning agent with PRIM_ROTATION in llSetLinkPrimitiveParams(), set the global rotation rather than the local rotation
...
Functionally the same as the patch in http://opensimulator.org/mantis/view.php?id=7044 , thanks Aleric.
This commit also extends the regression test
2014-03-03 23:35:21 +00:00
5038a59ef3
Maybe slightly reduce warp3d memory leakage by disposing of decoded bitmap in Warp3DImageModule.GetTexture()
...
However, this still appears to be leaking massively, at least for me. Possible cause is warp3D using GDI objects internally and not disposing of them.
2014-02-28 00:16:06 +00:00
88b1fc1382
Set up a StreamReader and call ReadToEnd() instead of using the GetStreamString() extension method
...
This eliminates some stream seeking that was never necessary and makes disposable of the StreamReader consistent with other code
2014-02-27 23:13:26 +00:00
94ad69faf2
Remove long unused UntrustedWebRequest class
...
This purports to check web requests but doesn't appear to actually do that.
2014-02-27 22:58:44 +00:00
5fafea6631
refactor: More consistently use using construct within WebUtil to match other existing code there.
2014-02-27 22:52:43 +00:00
1f4f09ad69
Add more details to InvalidOperationException logging in SychronousRestFormsRequest.MakeRequest().
2014-02-27 20:35:56 +00:00
91333b9267
Stop LSL_Api.GetLinkEntities() from creating an unused list on every parameter except LINK_THIS. Simplify code.
2014-02-27 00:23:24 +00:00
ed760f2586
minor: remove unused variable from recent commit 0e23374
2014-02-27 00:14:16 +00:00
d7c9725ec0
refactor: Make osGetPrimtiveParams() and soSetPrimitiveParams() use common get/set params code in LSL_Api rather than an old copy&pasted section.
2014-02-27 00:11:50 +00:00
6955190c7d
Add Util method to load OpSys env vars
2014-02-26 23:39:45 +00:00
ce5d308d23
Add some regression tests for previous commit 0e23374
2014-02-26 23:13:56 +00:00
0e23374aa2
Implement PRIM_ROTATION, PRIM_ROT_LOCAL, PRIM_POSITION and PRIM_POS_LOCAL when manipulating avatars via llSetLinkPrimitiveParams()
...
Combination of core parts of Freaky's patch at https://github.com/ft-/opensim-patches/blob/master/opensim-llsetlinkprimitive-agent-fix.patch plus further adjustments from myself.
Resolves Mantises 6121, 6421, 6573, 6657
2014-02-26 23:07:13 +00:00
26fe59c35e
Improve regression test TestSetAppearance()
2014-02-24 19:43:06 +00:00
bc9952f901
Re-enable regression TestSaveBakedTextures()
2014-02-24 19:30:33 +00:00
fd1b2a1c57
Stop mesh avatars that specify the alpha texture in their bake slots from causing the simulator to continually request that they rebake
...
This is because the alpha texture is not in the cache, we must continue to have the fallback of looking for these and other persisted bakes in the asset service.
Relates to http://opensimulator.org/mantis/view.php?id=6927
2014-02-24 19:20:50 +00:00
0f03c64a0c
Make Scene.DefaultDrawDistance to be the max of the region size and the
...
user setting. Seems this parameter has many side effects.
2014-02-23 21:56:37 -08:00
0b213af675
Fix problem of hurricane speed winds. Thanks Vegaslon.
2014-02-22 15:04:28 -08:00
cddf1ec0dc
Added 2 new behaviors to pCampBot
2014-02-21 10:06:08 -08:00
97c74afca8
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2014-02-21 10:05:06 -08:00
d27e188fe2
Added 2 new behavirors to pCampBot. These are part of a systematic study I'm doing for understanding the load that AgentUpdate packets incur on the server.
2014-02-21 10:04:12 -08:00
11b4f534c2
If texture decode fails in Warp3D map maker, log uuid of asset that failed to decode along with exception
2014-02-20 23:36:50 +00:00
d50d169441
If GetFolderContent called by WebFetchInvDescHandler.Fetch() fails for some reason and returns null, log and return empty contents rather than throwing an exception that ends up terminating the simulator.
2014-02-20 22:35:41 +00:00
28419251bf
minor: Add some method doc to AFM,SetAppearanceAssets()
2014-02-20 19:30:47 +00:00
d1bb73d068
In core.groups GroupsServiceRemoveConnector, if GetGroupRecord() or UpdateGroup() do not have a RESULT parameter in the result message, return null rather than fail with NullReferenceException
...
This check was already done by other methods.
Looks to resolve http://opensimulator.org/mantis/view.php?id=7012
2014-02-20 19:17:21 +00:00
4d1426e77d
For now, do not replacing missing wearables with default wearables if itme details cannot be found.
...
This is causing many issues on OSGrid, possibly due to teleporting timing differences with simulators hosted in different places or HG teleports
Added a bit more logging for debug purposes.
See http://opensimulator.org/mantis/view.php?id=6939
2014-02-20 18:40:21 +00:00
a2866b85f3
add newRegion parameter to CrossAgentToNewRegion event and trigger the event after crossing thread is invoked
2014-02-20 00:18:28 -08:00
269a6410a0
add EventManager event OnCrossAgentToNewRegion
2014-02-19 17:52:38 -08:00
c26f01ff8c
varregion: make scene default draw distance to be the maximum size of the
...
region. This is a temp fix for the use of draw distance to compute child
regions. Eventually must use the draw distance from the viewer for the
computation.
2014-02-19 09:51:49 -08:00
fc9930e420
Repair check for if in region position (I mean || is kinda like &&).
2014-02-15 18:49:40 -08:00
79200ed270
Fix displacement and location operations on legacy trees and grass in
...
the 'load oar' and 'scene' commands. Before they were ignored but the
code now relies on the SOG.IsAttachment function for attachmentness.
2014-02-15 17:10:20 -08:00
7fc289c039
Properly restore position on crossing failure for mega-regions.
...
Fix odd "cannot cross into banned parcel" viewer error message when crossing
into non-existant region. Proper permission failure messages are now returned.
2014-02-15 17:02:53 -08:00
877bdcdce1
Rewrite of mega-region code to use new form of border checking.
...
This commit eliminates all of the 'border' class and list code and replaces
it with testing if in the current region.
Impacts: can make a mega-region out of varregions of the same size; and
mega-region combinations must be rectangular (not square but rectangular)
2014-02-15 16:01:43 -08:00
bdbbeaa494
Non-functional changes of numbers into symbolic references and a few
...
comments on what variables really mean.
2014-02-15 16:01:01 -08:00
f6913e911e
Merge branch 'justincc-master'
2014-02-15 01:18:10 +00:00
f74aafaf63
In GridUserService, if a UUID is given consistently use the longest matched entry (as already done by GetGridUserInfo()) in order to avoid problems with multiple entries.
...
This is to avoid issues where LoggedIn, SetHome, etc were always using the exact UUID match but GetGridUserInfo() would use the longest.
Looks to address http://opensimulator.org/mantis/view.php?id=6986
2014-02-15 01:13:58 +00:00
4fed301e65
Don't request group information in SP.MakeRootAgent() if the presence belongs to no group (UUID.Zero)
...
This was trigger the XmlRpcGroups errors described in http://opensimulator.org/mantis/view.php?id=6986
Introduced in commit 5b73b9c4
2014-02-14 23:43:07 +00:00
733e067958
Log information about which function, request data and agent ID triggered an XmlRpcGroupsServiceConnector error
2014-02-14 21:28:45 +00:00
ffd0da23fb
Merge branch 'justincc-master'
2014-02-14 00:16:17 +00:00
f49d513089
Change warns associated with UserAgentServiceConnector to debugs, as this is not necessarily a problen with the source simulator (e.g. someone else's remote simulator cannot be contacted).
...
This is Oren Hurvitz's second patch from http://opensimulator.org/mantis/view.php?id=6956 with a small amount of correction
2014-02-14 00:08:13 +00:00
fc35b45e21
If calls to UserAgentServiceConnector fail then throw an exception. This lets the caller decide whether to discard the error or not.
...
This is Oren Hurvitz's 0001 patch from http://opensimulator.org/mantis/view.php?id=6956 but I ended up doing some tweaking to resolve patch application issues.
2014-02-14 00:01:12 +00:00
bc7fda39b4
Merge branch 'justincc-master'
2014-02-12 23:23:56 +00:00
e10012a7a6
If a caller tries to queue a CAPs message to a scene presence that has no event queue (e.g. an NPC), only warn if event queue debugging is greater than zero.
...
Removes the spurious log warnings if groups are active when NPCs are used.
Adds more regression tests associated with adding messages to the event queue
2014-02-12 23:18:10 +00:00
3a7c8d1f32
BulletSim: the minimum vehicle velocity was set too low so moving slow
...
was getting zeroed too easily. Added VehicleMinVelocity parameter.
2014-02-11 21:07:55 -08:00
c0cc5e0fa4
varregion: Send large region patches for wind and clouds.
2014-02-11 21:07:55 -08:00
b83a224147
Add JsonRezAtRoot script function. Operation is very similar to
...
llRezAtRoot except that the start parameter is a Json string that will
be unpacked into a json store identified by the objects uuid. This
makes a much more expressive (and simpler) way of passing initial
parameters to a rezzed object.
2014-02-09 18:07:49 -08:00
cf61cdf58c
Fix - Viewer crash during HG Teleport
...
Signed-off-by: Robert Adams <misterblue@misterblue.com>
2014-02-06 11:33:17 -08:00
1913ab5ad5
Update the SimianMaptile uploader to accommodate varregions.
2014-02-05 21:26:39 -08:00
29c8461631
Remove the added whitespace, test concluded
2014-02-04 05:54:28 +00:00
8f372b8ac8
Bot test
2014-02-04 05:52:22 +00:00
342be228c6
Remove compile error from returning value in void function
2014-02-03 21:53:14 -08:00
1b41ec0a85
Fix raw32 terrain heightmap reader so it estimates terrain size from
...
the size of the input stream. This is required since the raw heightmap
format (.r32) does not contain any size information.
The estimation relies on terrain being square.
2014-02-03 21:23:32 -08:00
31cba5aa66
Add one check for a blank URL because the module wasn't quite sure not to work when unconfigured :|
2014-02-04 04:20:37 +00:00
f0f852b27f
Final code drop for appearance. Adding Avination's baked texture storage server.
2014-02-04 02:29:02 +00:00
1197658233
Adding the Avination XBakesModule, the client for the persistent bakes system
2014-02-04 02:09:39 +00:00
e1d1c27965
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2014-02-04 01:55:41 +00:00
49c2213a01
Dropping the rest of Avination's modified appearance code for core.
...
Module to follow.
2014-02-04 01:54:16 +00:00
41b6602a77
Add "--no-objects" parameter to 'load oar'.
2014-02-02 22:16:01 -08:00
8c6a0cb44a
Really add the old parameter names to load oar to keep downward compatibiliy
2014-02-02 17:18:08 -08:00
2a4dd34616
Change new 'load oar' parameters to be hyphenated to be consistant with
...
existing parameters. ('--forceterrain' becomes '--force-terrain').
The old forms have been kept for downward compatiblity.
2014-02-02 12:21:18 -08:00
9c97fb8e12
Implement terrain merging in TerrainChannel.
...
Modify archiver to use terrain merging when loading oars.
This makes displacement AND rotation properly work on terrain when loading oars.
Especially useful when loading legacy region oars into large varregions.
2014-02-02 11:17:49 -08:00
a8e64cd59a
Overload INPCModule.CreateNPC() to allow agentID to be specified. Note: this is intended for use in region modules and is not exposed to scripts.
2014-02-01 04:09:20 -08:00
abb193ec94
In UuidGatherer, gather materials referenced in the prim's TextureEntry
...
Signed-off-by: dahlia <dahlia@nomail>
2014-02-01 02:56:15 -08:00
b2878eb773
Merge branch 'justincc-master'
2014-01-31 00:51:22 +00:00
b8e22f02e7
Make sure Web streams are disposed after use
2014-01-31 00:44:22 +00:00
1380b37d71
Made error messages more consistent
2014-01-31 00:24:52 +00:00
3d62f4369d
Replaced throwing exceptions with calls to Error()
2014-01-31 00:24:47 +00:00
d405254971
Replaced llSay()ing LSL errors with calls Error()
2014-01-31 00:24:43 +00:00
9db4090c07
Replaced LSLError() calls with calls to Error()
2014-01-31 00:24:40 +00:00
c9550e473d
Updated "deprecated" LSL errors to use Deprecrated()
2014-01-31 00:24:36 +00:00
257f9cec40
Updated "not implemented" LSL errors to use NotImplemented()
2014-01-31 00:24:31 +00:00
13bb9ea682
Updated ShoutError() calls to use new LSL error methods
2014-01-31 00:21:22 +00:00
67ec95bde8
Updated methods for handling LSL script errors, deprecated, and not implemented
2014-01-31 00:20:10 +00:00
c467dfcd81
Merge branch 'justincc-master'
2014-01-30 00:42:20 +00:00
b73baeb4a4
Record whether login to home fails because no home set (UUID.Zero) or region not found.
2014-01-30 00:40:56 +00:00
b50e5704b8
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2014-01-30 00:06:09 +00:00
7807b19a89
Merge branch 'justincc-master'
2014-01-30 00:05:12 +00:00
bdab05df0e
Add "show grid user" robust/standalone console command for debug purposes.
...
Shows all data on entries which match or start with a given ID.
This would usually be a UUID.
2014-01-30 00:03:22 +00:00
0842e2e15b
BulletSim: default physical terrain implementation to heightmap.
...
It originally looked like mesh terrain would perform better for vehicles
but, after much use, heightmap is the clear winner.
Force terrain implementation to heightmap if the physics region is
larger than legacy region size. This solves running out of memory for
very large regions.
2014-01-29 06:44:14 -08:00
fbf33ef1de
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2014-01-28 22:42:35 -08:00
3f5c6c897f
One more run at fixing the sun module. Parameter setting fixed to
...
work through the OSSL interface. And setting the parameters now
adjusts all the dependent variables correctly so the sun moves
at the modified rate.
2014-01-28 22:40:39 -08:00
1900254e77
Restore brush tests with correct values and adjustments for new terrain height
...
rounding characteristics.
2014-01-28 21:43:18 -08:00
678c107915
Temporarily disable brush test. It will come back when tuning is complete.
2014-01-28 16:58:27 -08:00
dde0e547a7
Change area of brush test to account for rounding errors in terrain implementation
2014-01-28 16:48:34 -08:00
226b5e4d75
Increase the strength of brushes in brush test in an attempt to overcome rounding
...
introduced with new terrain height class.
2014-01-28 16:36:56 -08:00
cfe1bced7d
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2014-01-28 16:34:49 -08:00
2877c7d94d
Actually make the parameter updates change the behavior of
...
sun movement.
2014-01-28 16:34:22 -08:00
0c3493f619
clear land tainting when tested. Then testing, pass scene to LandObject as now needed to get region size
2014-01-28 16:25:01 -08:00
d25265ae82
Fix terrain tests by properly initializing low detail terrain to zero height.
...
Also remove PI heightmap test as new heightmaps only have two significant digits.
2014-01-28 15:58:45 -08:00
1d533b0f01
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2014-01-28 15:47:24 -08:00
bfb0011cd3
Some major surgery on the sun module. Updates to the client were gated
...
by a "mode" check. That mode check has been removed (it didn't result
in any change of behavior anyway). Also added a command line variable
update to set the sun position time offset (offset from the system
clock). Default is no offset to preserve existing behavior.
2014-01-28 15:43:47 -08:00
e5d59dc696
Repair database routines so they properly return null when asked for
...
the heighmap of a region that does not exist.
2014-01-28 15:29:06 -08:00
c6e9db5866
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Framework/RegionSettings.cs
OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
OpenSim/Region/Framework/Interfaces/IInterregionComms.cs
OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs
2014-01-28 21:02:20 +00:00
4ccb15290e
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2014-01-28 20:47:36 +00:00
8eec717f5f
Merge branch 'master' into varregion
2014-01-28 08:50:28 -08:00
4faf11e001
varregion: fix for teleporting by double clicking on a map location.
...
Thanks Garmin.
2014-01-28 08:49:22 -08:00
cd35d298fa
Merge branch 'justincc-master'
2014-01-28 00:23:10 +00:00
2cf224166f
Added osGetRegionSize(), which returns the region size in meters and recognizes megaregions
2014-01-28 00:11:50 +00:00
f7172095e0
Convert tabs to spaces from previous commit 8c2b41b01
2014-01-28 00:04:55 +00:00
8c2b41b01d
Make inidirectory files supercede distro files
2014-01-27 23:56:10 +00:00
a4017ee1eb
Reinsert attachments list taking code in SP.MakeRootAgent()
...
Locking attachments then launching script instances on a separate thread will not work, attachments will simply be unlocked and vulnerable to race conditions.
2014-01-27 23:47:43 +00:00
1b86239f79
refactor: Remove identical part.ParentGroup.AddAvatar(UUID); calls which occur no matter which branch of the conditional is executed
2014-01-27 23:17:09 +00:00
e2fbc88d98
Re-enabled NPCModuleTests.TestCreate()
2014-01-27 22:56:51 +00:00
49af6b53e7
varregion: enable teleporting to a varregion by clicking on the map and
...
pressing the 'teleport' button.
This commit adds returning region map info for all the subregions of a
varregion. This also handles the selection of the extra region and then
the displacement of the postion so the teleport is to the correct location.
2014-01-26 19:32:28 -08:00
13a9d5409c
Merge branch 'master' into varregion
...
Conflicts:
OpenSim/Region/CoreModules/World/LegacyMap/MapImageModule.cs
OpenSim/Region/CoreModules/World/LegacyMap/ShadedMapTileRenderer.cs
OpenSim/Region/CoreModules/World/LegacyMap/TexturedMapTileRenderer.cs
2014-01-26 07:56:47 -08:00
6831e58616
varregion: modify MapImageModule structure so it will better merge
...
with changes made in master.
2014-01-26 07:38:28 -08:00
0eda7dd1c7
Merge branch 'justincc-master'
2014-01-24 19:41:41 +00:00
fea8345f56
minor: remove long unused state queue from "show queues" console reports
2014-01-24 19:40:14 +00:00
c9b5ba78d9
minor: correct the usage statement on the "show image queues" console command - should not have been "image queues show"
2014-01-24 19:36:12 +00:00
4a9796a506
Skip IClientAPIs that don't implement IStatsCollector (such as NPCAvatar) from the "show queues" console report to stop screwing up formatting.
...
"show pquques" already did this
2014-01-24 19:31:31 +00:00
afb2e07111
varregion: pass region size in more HG services.
2014-01-24 06:30:38 -08:00
674a3a5639
Enable the simulator to handle region size information returned from
...
a hypergrid gatekeeper. Fields are "size_x" and "size_y". Server side
will be updated separately.
2014-01-23 16:20:18 -08:00
966ab21839
Merge branch 'justincc-master'
2014-01-24 00:17:39 +00:00
a2d5d810e0
Properly dispose of drawing objects to reduce/stop memory leakage on generating map tiles with the MapImageModule and TexturedMapTileRenderer (the current defaults)
2014-01-24 00:14:58 +00:00
a859464e91
Add "generate map" console command to allow manual regeneration and storage of maptiles
...
Primarily for test purposes though could be useful if one prefers to manually update the map tile
2014-01-23 23:44:21 +00:00
4c362a83f9
Merge branch 'master' into varregion
2014-01-21 11:31:51 -08:00
83626e60e6
Adds a configuration option to cannibalize bandwidth from the
...
udp texture throttle and move it to the task throttle. Since most
viewers are using http textures, the udp texture throttle is holding
onto bw that could be used for more responsive prims updates. See
the documentation for CannibalizeTextureRate in OpenSimDefaults.ini.
Option is disabled by default.
2014-01-20 18:59:43 -08:00
7bd42fc42f
Add back code to UuidGatherer to retrieve UUIDs for materials stored in DynAttrs. This is unfortunately still necessary until a better solution for handling existing legacy materials can be implemented
2014-01-20 15:01:18 -08:00
af58631f00
rather than converting existing materials to assets, just retrieve them and make them available for viewing. Any new materials added to the scene will become assets.
2014-01-20 13:57:14 -08:00
719810e9d8
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2014-01-20 11:54:36 -08:00
1cae3664a5
add null texture entry face check before converting legacy materials
2014-01-20 11:53:33 -08:00
5fc871027e
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2014-01-20 19:38:47 +00:00
2cf7478b9a
Merge branch 'justincc-master'
2014-01-20 19:34:55 +00:00
2e78e89c36
Clean up orphaned json stores. This can happen when an object is
...
removed, when a script is removed, or when a script is reset. Also
added a stats command to track the number of json stores used by
a region. Will probably add some more commands later.
2014-01-20 11:33:49 -08:00
8e72b53edc
Stop exceptions being generated on agent connection if a telehub object has been deleted or has no spawn points.
2014-01-20 19:16:19 +00:00
36d8a24a86
force SOG update when converting legacy materials to ensure changes are persisted
2014-01-20 03:11:01 -08:00
95c926b2cd
delay texture entry parsing until absolutely necessary while converting legacy materials
2014-01-20 03:02:30 -08:00
28723beb0c
Add code to convert legacy materials stored in DynAttrs to new asset format and store them as assets
2014-01-20 02:57:08 -08:00
d1f16c4b4b
Check agent permissions before modifying an object's materials. Also, when creating a Material asset, set the current agent as the Creator.
2014-01-20 00:38:44 -08:00
68d83425c6
When asked to change the Material for one face, change only that face; not the default material
2014-01-20 00:38:43 -08:00
3018b2c5d7
Materials module: a) Store materials as assets; b) Finalized it (removed the "Demo" label; removed most of the logging); c) Enabled by default
...
Changed UuidGatherer to use 'sbyte' to identify assets instead of 'AssetType'. This lets UuidGatherer handle Materials, which are defined in a different enum from 'AssetType'.
2014-01-20 00:38:42 -08:00
ca0336d834
Renamed MaterialsDemoModule to MaterialsModule
2014-01-20 00:38:41 -08:00
e8273fa8ad
- Materials: support the viewer removing the material (in which case matsMap["Material"] is missing) - Reduced logging
2014-01-20 00:37:26 -08:00
90fa3202c6
varregion: remove debugging splat file saving that fills up the
...
maptile dir and causes errors.
2014-01-19 13:37:51 -08:00
5e6a47f13f
varregion: remove --noterrain and --noparcel parameters in 'load oar'.
...
Add --forceterrain and --forceparcel to 'load oar'. In order to not change
the operation of --merge (which does an object merge and suppresses terrain
and parcel information loading), added the --force* parameters to be used
when loading multiple oars to build up a varregion.
Added --rotation and --rotationcenter parameters to 'load oar' which apply a rotation to
the loaded oar objects before displacing. The rotation is in degrees (pos or neg)
and the center defaults to "<128, 128, 0>".
2014-01-19 12:45:16 -08:00
6fbfb47b92
varregion: add --noterrain and --noparcel to 'load oar'.
...
--noterrain suppresses the loading of the terrain from the oar.
--noparcels suppresses the loading of parcel information from the oar.
2014-01-19 11:03:08 -08:00
dd6db72939
varregion: add --displacement parameter to 'load oar'.
...
Adds displacment to all objects and terrain loaded from the oar.
As an example, if you have a 512x512 region and an old 256x256 oar, doing
load oar --displacement "<128,128,0>" oarFile.oar
will load the object (and terrain) into the middle of the 512x512 region.
If displacement is not specified, 'load oar' works like it always has.
If you have a 5
2014-01-19 10:09:43 -08:00
f127e4b4ee
Merge branch 'master' into varregion
2014-01-19 07:38:53 -08:00
4fb3d314b8
Fix casting error for float type INI file parameter parsing.
2014-01-19 07:37:14 -08:00
54a4b9eab4
varregion: Update Warp3D to properly handle varregions.
...
This includes additions to Warp3D:
Optional rendering of mesh and scupltie prims (INI parameter. Off by default)
Texturing of large prims (INI parameter. On by default)
Better garbage collection
2014-01-19 07:33:56 -08:00
813f0da00b
Add J2K decoder routine that converts directly to an image.
2014-01-19 07:32:41 -08:00
08fa0a6a8a
Fix casting error for float type INI file parameter parsing.
2014-01-19 07:26:55 -08:00
60de0bc3c2
varregion: split up generated maptile images for storage in map. This
...
makes maps for varregions show up properly.
2014-01-19 05:09:03 -08:00
d466446df3
Merge branch 'justincc-master'
2014-01-18 01:39:45 +00:00
e9454d4672
Following on from 50ea2e0, only fetch scene presence for check if lightscript function has failed initial IsEstateManagerOrOwner() check
2014-01-18 01:36:40 +00:00
50ea2e0d67
Fixed: Windlight functions caused an error if called when the script's owner isn't in the scene
2014-01-18 01:26:30 +00:00
0cbe5f8424
Remove redundant methods in FlotsamAssetCache
2014-01-18 00:55:49 +00:00
b9453a8f6f
implement CoreAssetCache.Check()
2014-01-18 00:52:36 +00:00
427ffd3387
implement GlynnTuckerAssetCache.Check()
2014-01-18 00:48:20 +00:00
fc7ccfdafa
Properly implement CenomeAssetCache.Check()
2014-01-18 00:30:23 +00:00
ee8ba1ab9a
Simplify FlotsamAssetCache.CheckFromMemoryCache()
2014-01-18 00:21:53 +00:00
d381da81d6
minor: Add method doc to IImproveAssetCache
2014-01-18 00:15:38 +00:00
97fbb8ed45
Elminate some copy/paste in FlotsamAssetCache.CheckFromFileCache() and use using() construct to ensure filestream is always closed
2014-01-18 00:12:12 +00:00
12bfce7b9f
elminate unnecessary asset != null check in FlotsamAssetCache.UpdateFileCache()
...
Passed in asset is always not null
2014-01-18 00:06:12 +00:00
b52b50ee56
minor: reinsert some method doc back into IEntityTransferModule
2014-01-17 23:36:23 +00:00
9fefbcf7fc
minor: since structs are values, assigning them to another variable copies it. Instantiation is unnecessary.
2014-01-17 23:32:37 +00:00
14c72d4a5b
Revert "Fixed: Windlight functions caused an error if called when the script's owner isn't in the scene"
...
This reverts commit 39e5785c0f
2014-01-17 01:58:10 +00:00
39e5785c0f
Fixed: Windlight functions caused an error if called when the script's owner isn't in the scene
2014-01-17 01:47:37 +00:00
4fa843ff19
Reorder checks in SP.CompleteMovement() to fix test failures
2014-01-16 23:44:17 +00:00
f467121c51
Merge branch 'justincc-master'
2014-01-16 23:33:30 +00:00
3bc669ffc7
Actually put IsChildAgent = true inside the lock, otherwise there is still a small window for race conditions on duplicate CompleteMovement calls
2014-01-16 23:31:50 +00:00
3ffd90496a
Prevent duplicate invocations or race dontision in SP.CompleteMovement()
...
This can happen under poor network conditions if a viewer repeats the message send
If this happens, physics actors can get orphaned, which unecessarily raises physics frame times
2014-01-16 20:23:31 +00:00
1a8b56fa87
Merge branch 'justincc-master'
2014-01-16 00:33:04 +00:00
2d9d6fe922
Can delete the Offline Messages sent to/from a user.
...
This is useful if the user is deleted.
2014-01-16 00:24:51 +00:00
46c2791fe2
In the offline message table, store the sender.
...
This data is useful for preventing abuse (e.g., someone who sends too many messages), or for deleting message if their sender has been deleted.
2014-01-16 00:16:33 +00:00
21bc799a17
Fixed offline IM
2014-01-16 00:10:10 +00:00
e99a7d879e
Remove old IInterRegionComms and references. This hasn't been used since 2009 and was superseded by ISimulationService
2014-01-16 00:05:04 +00:00
321bde8a3a
Minor: Add prentheses to make a condition clearer
2014-01-15 22:20:42 +01:00
cc5cffc212
varregion: properly pack the region size parameters so he viewer will parse them.
...
This gets rid of the viewer crash when teleporting into varregions and allows
multiple, adjacent varregions (of the same size) with border crossings.
2014-01-11 22:00:52 -08:00
1eea6fd452
varregion: Debug messages for region crossing debugging.
2014-01-11 22:00:24 -08:00
3760d10cd0
varregion: remove unnecessary border checking code in ScenePresence.
2014-01-11 21:59:22 -08:00
1cf17a3cf7
Merge branch 'master' into varregion
...
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
OpenSim/Region/Framework/Scenes/SceneBase.cs
OpenSim/Services/Interfaces/IGridService.cs
OpenSim/Services/LLLoginService/LLLoginResponse.cs
(conflicts were debug statements that are commented out in master branch)
2014-01-11 08:52:23 -08:00
239b85d7ce
Fix crash in BulletSim which sometimes happens making a linkset physical
...
(like sitting on and activating a vehicle) and crossing borders.
This keeps better bookkeeping on compound shapes so BulletSim can
identify them when being freed.
2014-01-10 22:52:31 -08:00
b5ef585069
Merge branch 'justincc-master'
2014-01-11 01:22:42 +00:00
bc0ff5e7d4
Allow Boolean nodes in XML to be specified as "0/1". AuroraSim does that.
2014-01-11 00:54:41 +00:00
09e800f4b1
Merge branch 'justincc-master'
2014-01-10 20:46:00 +00:00
08f2fc63cd
Fixed llTextBox error message text
2014-01-10 20:43:24 +00:00
68cbccb288
Merge branch 'justincc-master'
2014-01-10 20:37:14 +00:00
9050c152b4
Dynamically adjust to the number of visual params sent.
2014-01-10 20:31:52 +00:00
da47bcae3e
When moving the root prim of an attachment: a) Change the attach position; b) Move the other prims in the reverse direction to compensate
2014-01-10 20:24:11 +00:00
5e72de1908
Merge branch 'justincc-master'
2014-01-10 20:19:38 +00:00
88f01a4130
When creating a coalesced object, set its permissions to the lowest-common-denominator of all the sub-objects
2014-01-10 20:01:08 +00:00
a94e1e0e08
When creating a coalesced object, set its Creator ID if all the objects have the same creator
2014-01-10 19:54:17 +00:00
91fd9c4670
Refactored: use a single function to apply an object's folded permissions to its main permissions
2014-01-10 19:50:03 +00:00
13f31fdf85
Refactored setting permissions when rezzing items: use the same function when rezzing from user inventory and prim inventory.
...
Also, fixed a bug: when rezzing a coalesced object from a prim's inventory, apply the coalesced object's name and description only to the first sub-object; not to all the objects in the coalescence. (This was already done correctly when rezzing from a user's inventory.)
2014-01-10 19:37:59 +00:00
32e9c16957
Merge branch 'justincc-master'
2014-01-08 01:04:26 +00:00
0155d42b80
If an agent is sitting, then do send the rotation in the agent update instead of zeroing it to resolve mouselook camera problems
...
Addresses http://opensimulator.org/mantis/view.php?id=6892
Thanks to tglion for this spot.
This resolves a recent regression from 17b32b764a
2014-01-08 00:54:39 +00:00
1eecb34e62
Remove the core module extra profile settings support carried in with the latest
...
patches. We don't need it.
2014-01-05 21:16:30 +00:00
e79fab91db
Intermediate commit. Sill errors.
...
Merge branch 'master' into careminster
Conflicts:
OpenSim/Data/SQLite/SQLiteUserProfilesData.cs
OpenSim/Framework/RegionInfo.cs
OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueHelper.cs
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
OpenSim/Services/UserProfilesService/UserProfilesService.cs
2014-01-05 20:12:32 +00:00
31279a3308
Merge commit '08750501617ca332ab196b2f25030e3c635c9dd6' into careminster
2014-01-05 20:03:48 +00:00
38148bd4b6
Some missing definitions needed for successful compilation.
2014-01-04 19:01:05 -08:00
8ff2ff1a36
Remove some chatty DebugFormat statements. No functional changes.
2014-01-04 19:01:04 -08:00
7e32313a49
varregion: Add region size to teleport event messages (EnableSimulator,
...
CorssRegion, TeleportFinishEvent).
Have Simian grid service return the region size.
Many teleport related debug log messages. Can be removed when teleport
works (like that's ever going to happen).
Conflicts:
OpenSim/Framework/RegionInfo.cs
2014-01-04 19:01:04 -08:00
004ecee314
varregion: send region size in LLLoginResponse.
2014-01-04 19:01:03 -08:00
d9848943a9
Add routines in Util.cs for conversion of region handles to region
...
locations and for the conversion of region world location to region
'region' location. These routines will replace all the arithmatic
scattered throughout OpenSimulator.
2014-01-04 19:01:03 -08:00
dd96fef940
Dynamically adjust to the number of visual params sent.
2014-01-04 21:18:37 +00:00
fd045d520e
Merge branch 'master' into varregion
...
Conflicts:
OpenSim/Framework/Constants.cs
OpenSim/Framework/RegionInfo.cs
OpenSim/Services/GridService/GridService.cs
OpenSim/Services/Interfaces/IGridService.cs
Most conflicts had to do with Util routines not in master branch yet.
2014-01-04 08:57:51 -08:00
9984ecf862
varregion: Add region size to teleport event messages (EnableSimulator,
...
CorssRegion, TeleportFinishEvent).
Have Simian grid service return the region size.
Many teleport related debug log messages. Can be removed when teleport
works (like that's ever going to happen).
2014-01-03 07:41:06 -08:00
eab9390e05
Initialize default region size in GridRegion in the no parameter constructor
...
as is used by the grid connector tests.
2013-12-28 07:20:14 -08:00
6869633d76
Add serialization/deserialization of region size to RegionInfo, GridRegion, and RegionData.
...
This does not modify interfaces or handling of variable sized regions. This only
enables the loading and storing of the region size and the reporting of the
region size in grid service responses.
The database tables already have the code to load and store the region size.
2013-12-28 06:58:15 -08:00
01c0bbf181
varregion: extract banned region logic into a class for cleanlyness.
...
Add 'not found' caching in EntityTransferModule.GetRegionContainingWorldLocation
so hitting borders and bad teleports do not continuiously hammer on the GridService.
2013-12-27 08:23:37 -08:00
2d2bea4aa7
varregion: many more updates removing the constant RegionSize and replacing
...
with a passed region size. This time in the map code and grid services code.
2013-12-26 22:45:59 -08:00
e5f7c8b6e8
varregion: add lots of DEBUG level log messages. Especially for teleport.
2013-12-24 12:31:26 -08:00
b40b57776b
varregion: remove unused Scene.HaveNeighbor routine. Its computation
...
was wrong for large regions anyway.
2013-12-24 12:28:54 -08:00
5c9fa15f30
varregion: fix bug where destination region is not found and object is
...
not restored to its original location.
2013-12-24 11:51:50 -08:00
540fa84842
Merge branch 'justincc-master'
2013-12-21 01:12:45 +00:00
2f94165dcc
Add lsl arg syntax checking for control event
2013-12-21 01:00:50 +00:00
f1cd813a29
refactor: rename internal lsl parser VectorDeclaration -> VecDeclaration for consistency
2013-12-21 00:49:01 +00:00
871ac5b16c
Add arg checking for at_target lsl event
2013-12-21 00:46:34 +00:00
a5e4780547
Add lsl event arg checking for at_rot_target
2013-12-21 00:37:56 +00:00
b757ab2586
Add lsl event argument checking for attach and on_rez
2013-12-21 00:08:36 +00:00
a01862509e
Merge branch 'master' into varregion
2013-12-20 06:52:28 -08:00
68773ee7c4
Merge branch 'justincc-master'
2013-12-19 01:41:04 +00:00
e298bf41ff
Add missing viewer param elements for butt and breast physics.
...
Patch from http://opensimulator.org/mantis/view.php?id=6864 except with tabs replaced by spaces
Thanks cinderblocks!
2013-12-19 01:24:36 +00:00
a5ca15c428
Create regression test TestSendAgentGroupDataUpdate() for groups agent data sending
2013-12-18 23:35:38 +00:00
6937eec258
Merge branch 'master' into varregion
...
Add new region crossing code to varregion
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2013-12-17 06:18:13 -08:00
141d771a93
Fix issue with editing notes for other avatars
2013-12-16 17:36:21 -05:00
b03ec6137f
Populate user preferences with UserAccount email if it is present, else return an error indicating no email is on record for the user.
2013-12-16 17:36:04 -05:00
fe01e7d1cc
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2013-12-16 22:11:03 +00:00
f69e91dc2d
This is the acutal sitting avatar crossing code. This commit implements the
...
actual crossing mechanics for seated avatars, using the supporting code from
the previous commits. Physics is not supported yet, although some few bits
for them are already in place due to the earlier code drops. With this commit,
crossing sitting avatar by "editing" the prim across the border, by using
llSetPos or keyframe motion may already be possible. Vehicles will come next.
2013-12-16 22:08:02 +00:00
13a9a4b653
varregion: rename 'LegacyRegionLocX' back to 'RegionLocX' and same for Y and Z.
...
Rename 'RegionWorldLocX' to 'WorldLocX' and same for Y and Z.
This keeps the downward compatibility and follows the scheme of 'region'
and 'world' location naming that is happening in the Util module.
2013-12-14 07:53:01 -08:00
00e632ec3a
Merge branch 'justincc-master'
2013-12-14 02:49:23 +00:00
51da52f904
Extend TestLlGetNotecardLine() regression test to contain chars that are two bytes in utf8
2013-12-14 02:48:29 +00:00
38d7d46c17
Merge branch 'justincc-master'
2013-12-14 02:33:08 +00:00
957449e62c
ParseNotecardToList() returned data past end of notecard text (mantis #6881 ).
2013-12-14 02:25:28 +00:00
ee163b5751
Merge branch 'justincc-master'
2013-12-14 02:23:12 +00:00
e7a294e739
Wrap analysis of the particle system in the UUID Gatherer in a separate try/catch as sometimes it appears that this can be corrupt.
...
As per Oren's suggestion.
2013-12-14 01:48:03 +00:00
996a6c2eea
After previous discussion, put eye-catcher 'SCRIPT READY' messages to console rather than log as warning
...
The problem with logging at warn is that these aren't actually warnings, and so are false positives to scripts that monitor for problems.
Ideally, log4net would have a separate "status" logging level, but currently we will compromise by putting them to console, as they are user-oriented
2013-12-14 01:34:28 +00:00
63ccc3dbf5
Convert if-blocks to return statements in small functions such as GetStartParameter().
2013-12-14 01:20:24 +00:00
bf826699a5
Merge branch 'justincc-master'
2013-12-14 01:13:17 +00:00
d656ec2a07
Make WindParamSet success a console message rather than a log message.
...
This effectively disables the log message as requested by http://opensimulator.org/mantis/view.php?id=6890
2013-12-14 01:07:37 +00:00
5ddd818238
minor: Make wind console commands print out to console rather than log
2013-12-14 00:50:06 +00:00
bcb8c4068e
Comment out sit position checks in TestSitAndStandWithSitTarget() in SP and NPC tests until positions are known to be stable.
...
Also resolve issues with NoSitTarget() tests where I was trying to use a destroyed PhysActor
2013-12-14 00:36:25 +00:00
d2d4ae541b
Fix build break in test from previous commit 54cc229 - hadn't realized ScenePresence inst var name was slightly different
2013-12-14 00:19:04 +00:00
54cc229768
Fix TestSitAndStandWithNoSitTarget NPC and SP tests.
...
These stopped working because current code calculates sit heights based on avatar physics rather than appearance data.
Also changed BasicPhysics to not divide Z param of all set sizes by 2 - there's no obvious good reason for this and basicphysics is only used in tests
2013-12-14 00:10:32 +00:00
11f177d6a8
Eliminate unnecessary line from my previous commit 1d605642
2013-12-13 23:30:08 +00:00
1d605642f7
Refix sitting on child prims by reinserting relevant code back into SP.HandleAgentSit()
2013-12-11 23:59:52 +00:00
82ebb86d58
Replace proprietary file header with BSD one
2013-12-11 01:51:57 +00:00
92aad6f1bb
Add missing files *blush*
2013-12-11 01:44:03 +00:00
5b73b9c4a8
Committing the Avination Scene Presence and related texture code
...
- Parts of region crossing code
- New bakes handling code
- Bakes now sent from sim to sim without central storage
- Appearance handling changes
- Some changes to sitting
- A number of unrelated fixes and improvements
2013-12-11 01:39:56 +00:00
3df8990e6f
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2013-12-11 00:14:16 +00:00
97934e00e6
This is the Avination Entity Transfer Module. Surprisingly, it still compiles
...
but I don't know if it runs. Will probably crash and burn as the supporting
code isn't there yet.
2013-12-11 00:12:36 +00:00
0875050161
Add console utility commands "scale scene" and "translate scene". Note that repeated use of these commands will induce floating point accumulation errors. Please back up your region before using.
2013-12-10 13:57:18 -08:00
958a8f274b
Revert "Add support for user preferences (im via email)"
...
This reverts commit 1842388bb4
2013-12-07 01:29:15 +00:00
ba48816fb6
Merge branch 'master' into careminster
2013-12-07 01:19:20 +00:00
6d6b9ab791
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2013-12-07 01:08:49 +00:00
8f221a3077
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-12-06 16:25:26 -08:00
c0380d1bfe
apparently mono DeflateStream has no CopyTo method =(
2013-12-06 16:24:44 -08:00
5047bd7b44
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-12-06 16:02:03 -08:00
4058e5f709
Fixed misleading comment
2013-12-06 16:01:29 -08:00
aba2a44453
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-12-06 15:58:51 -08:00
1496de7ce9
use System.IO.Compression.DeflateStream for mesh decompression in an attempt to reduce mesh asset decoding failures
2013-12-06 15:58:19 -08:00
1842388bb4
Add support for user preferences (im via email)
2013-12-06 02:52:13 -05:00
4eb52eb19e
Merge branch 'master' into varregion
2013-12-05 21:07:44 -08:00
04f8fc1ce9
Adding profile partners fix to SQLite and PgSQL drivers
2013-12-05 20:25:28 -05:00
823a175f07
Stop writing partner id to record when updating profile data. This should be changed only by admin in backend.
2013-12-05 20:06:04 -05:00
9b76a46df0
Reversing back to the row["ColumnName"] case field name. http://opensimulator.org/mantis/view.php?id=6868
2013-12-06 00:41:02 +00:00
bb4f4d9480
minor: Use enums for setting inv/asset types on data upload rather than magic numbers
2013-12-06 00:38:18 +00:00
16aaba77d4
Properly set InventoryType.Snapshot when a snapshot is uploaded
...
Resolves http://opensimulator.org/mantis/view.php?id=6857
This prevents the inventory service complaining later about an attempt to change an invariant
2013-12-06 00:30:44 +00:00
17b32b764a
Fix regression where mouse look flight direction no longer worked by zeroing x/y rot before sending agent updates, instead of before any agent update processing
...
It turns out that the x/y rot data in mouselook is needed to implement this and to push the avatar against the ground if walking in mouselook.
Doing this in the terse send so that we preserve mouselook rotation information
2013-12-05 02:10:46 +00:00
62a2d7836f
Ignore X and Y body rotations when sent by mouse look.
...
Fixes http://opensimulator.org/mantis/view.php?id=3274
When not in mouselook, avatar only sends rotations around the Z plane (since that's the only way an avatar can rotate).
However, in mouselook it also sends X and Y information. But sending X and Y in terse updates causes issues with wrong camera movement in mouselook.
So strip out X and Y components for now. If this is an issue, then could strip out before sending avatar terse update, though this generates more cpu work.
Thanks to mirceakitsune for suggesting an initial fix
2013-12-03 02:27:40 +00:00
31bacfbb63
Merge branch 'master' into varregion
2013-12-01 15:51:42 -08:00
6cd0d7a62b
varregion: Add MaxRegionSize constant and enforce in RegionInfo.
...
Intermediate checkin of changing border cross computation from checking
boundry limits to requests to GridService. Not totally functional.
2013-11-30 15:28:39 -08:00
8ebad90800
Actually use the SP.AgentControlStopSlowWhilstMoving parameter intoroduced for slow walk/run in 4cfe02a rather than the magic number
2013-11-30 01:56:46 +00:00
96018afab4
Remove unused SP.Updated flag, which appears unused for many years and was only set true once and never reset
2013-11-30 01:52:45 +00:00
4cde02a2a3
Implement most effects of AGENT_CONTROL_STOP
...
AGENT_CONTROL_STOP is specified to SP.HandleAgentUpdate if the user holds down the space bar on a viewer.
For a stopped avatar, this prevents fly or walk/run (though not rotate) until released.
For a walking/running avatar, this reduces movement to half speed.
For a flying avatar, this stops the avatar.
These are observed behaviours on the LL grid - there was no previous OpenSimulator implementation
This commit introduces an optional parameter to SP.AddNewMovement(), which means that it will no longer compile on .NET 3.5 or earlier versions of Mono than 2.8
Currently, this does not work for jumping, and if used whilst flying the avatar continues the fly animation even though it does not move
2013-11-30 01:44:30 +00:00
4bd4f1cd83
Remove nudgehack from SP.HandleAgentUpdate by making MovementFlag a uint rather than a byte
2013-11-30 01:14:12 +00:00
8b3a4367ea
Still send CameraEyeOffset in UDP SendSitReponse even if at offset is Vector3.Zero
2013-11-29 02:51:35 +00:00
5f0e763062
Remove unused sp.ParentPosition, which has not been used for some time
2013-11-29 02:48:59 +00:00
84bfde3bdf
Comment out debug sit message accidently left active
2013-11-29 02:45:14 +00:00
ca079c378a
Merge branch 'link-sitting'
2013-11-29 02:41:32 +00:00
868c0c2746
Fix regression where sitting on ground stopped working.
...
This was due to the PhysicsActor no longer being recreated on stand from ground.
2013-11-29 01:56:49 +00:00
f9193e3c51
Restore SP.AbsolutePosition to properly return actual absolute position when sitting
2013-11-29 01:50:12 +00:00
a64377149d
Add parameter checking for land_collision, land_collision_start and land_collision_end lsl events
...
Wrong number of parmeters now generates syntax error on compile, as seen on LL grid
2013-11-29 00:44:53 +00:00
109136c074
varregion: add ITerrainChannel.GetHeightAtXYZ() for eventual mesh terrain.
...
Implementation of same in TerrainChannel.cs.
Check for bounds in TerrainChannel[x,y] to prevent array access exceptions.
2013-11-28 08:22:41 -08:00
7aa00632b9
varregion: many replacements of in-place arithmetic with calls to
...
the Util functions for converting world addresses to region addresses
and converting region handles to locations.
2013-11-28 08:20:16 -08:00
73dadef8df
Change the log level for the LOGIN DISABLED and LOGIN ENABLED messages is
...
the RegionReady module to be warn so that the message will show up in the
log for simulators running in a more production mode (knowing when logins
are functional is useful).
2013-11-27 12:01:09 -08:00
e52a8d388f
"rotate scene" command now uses Constants.RegionSize / 2 to pick the center of rotation and center can be optionally overridden in the command line
2013-11-26 21:07:37 -08:00
0785210e29
Fix stand positions rather than having the stand jump to the root prim.
2013-11-27 02:08:22 +00:00
5a9ec0748b
add a "rotate scene" console command. Seems to work for prims/sculpts/mesh but not for foliage, don't know why. Also doesn't work on terrain. Successive use of this command will likely introduce floating point error accumulation. Back up your region before using it :)
2013-11-26 17:18:44 -08:00
a3c72dafe6
Only translate linked prim specified offset pos by the link prim rotation, not any specified avatar rotation as well.
...
Don't translate root prim position by avatar rotation.
2013-11-26 01:40:55 +00:00
36d146bf27
fix position changes when sitting on a prim with position and/or orientation explicitly specified
2013-11-26 00:43:35 +00:00
0ad45531a1
Corrected case to get columns from Regions table from PostgreSQL http://opensimulator.org/mantis/view.php?id=6865
...
Signed-off-by: Michael Cerquoni <nebadon2025@gmail.com>
2013-11-25 18:33:49 -05:00
3193bcaae1
Merge branch 'master' into varregion
2013-11-24 07:23:12 -08:00
3589acdab1
Merge branch 'master' into careminster
...
Conflicts:
.gitignore
OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
prebuild.xml
runprebuild.bat
2013-11-23 19:13:22 +00:00
60e049ea39
Revert "Fix issue where sitting on non-root linked prims would send camera to wrong position in third-person and mouselook"
...
Reverting to place on separate branch
This reverts commit ff4e7de776
2013-11-23 02:31:39 +00:00
1999b218fd
Revert "Add line accidentally left out of recent non-root prim sit fix"
...
Reverting to place on new branch
This reverts commit ed1029712a
2013-11-23 02:31:17 +00:00
a68d1fad73
Revert "Still send CameraEyeOffset in UDP SendSitReponse even if at offset is Vector3.Zero"
...
This reverts commit 9bdd3dc7de
2013-11-23 02:29:14 +00:00
eb172be541
Revert "Fix non-root prim sit positions for prims where a sit target has been specified as well."
...
Revert to place on separate branch for now
This reverts commit 70e651a8d1
2013-11-23 02:28:30 +00:00
910f07dffa
Revert "Refix fix for sitting on non-root linked prims with explicit sit targets."
...
This reverts commit 78649eb099
2013-11-23 02:27:26 +00:00
5aa3236ebe
Revert "fix avatar rotation when sitting on a linked part"
...
Reverting for now to place on separate branch
This reverts commit 65304260af
2013-11-23 02:27:03 +00:00
b9e42aeb6e
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-11-23 02:09:54 +00:00
65304260af
fix avatar rotation when sitting on a linked part
...
Need to take into account rotation of linked prim now that we are always specifying sits wrt the root prim
2013-11-23 02:09:03 +00:00
f3f3d390f7
Fixed the update StoreRegionWindlightSettings() wasn't updating regionwindlight table, raising PrimaryKey violation;
...
Signed-off-by: Fernando Oliveira <fernando@oliveira.eti.br>
Signed-off-by: Michael Cerquoni <nebadon2025@gmail.com>
2013-11-22 20:48:12 -05:00
78649eb099
Refix fix for sitting on non-root linked prims with explicit sit targets.
...
I forgot that m_post is being set inconsistently between non-explicit and explicit ragets
2013-11-23 01:35:08 +00:00
70e651a8d1
Fix non-root prim sit positions for prims where a sit target has been specified as well.
2013-11-23 01:32:29 +00:00
ed1029712a
Add line accidentally left out of recent non-root prim sit fix
...
Original commit is ff4e7de7
2013-11-23 01:18:07 +00:00
9bdd3dc7de
Still send CameraEyeOffset in UDP SendSitReponse even if at offset is Vector3.Zero
...
As far as I can see it's valid to change the eye offset even if you aren't changing the at target.
2013-11-23 01:12:20 +00:00
9f4a548a49
Fix false positive test failure in TestRepeatSameDrawContainingImageReusingTexture() and TestRepeatSameDrawContainingImage() if localhost has a webserver set up.
...
Use 0.0.0.0 instead of localhost
2013-11-23 01:04:31 +00:00
ff4e7de776
Fix issue where sitting on non-root linked prims would send camera to wrong position in third-person and mouselook
...
We now specify sits as offsets from the root prim, as the viewer expects.
2013-11-23 00:53:09 +00:00
c896b4179e
Added admin_authenticate_user command
2013-11-20 00:09:32 +00:00
b44c69807d
Fix bug where "show modules" would accidentally list all the shared modules again as "non-shared"
...
Addresses http://opensimulator.org/mantis/view.php?id=6860
2013-11-19 23:53:15 +00:00
f9984a9685
rename private field ACD.ViewerInternal to m_viewerInternal in line with conventions used elsewhere in code
2013-11-19 23:39:52 +00:00
b71952df49
Stop AgentCircuitData.Viewer.get() from throwing an error if no Viewer has been set.
...
Continue to return null instead.
2013-11-19 23:36:44 +00:00
9ba5a7e190
Normalize viewer version string to accomodate new style version reporting in the viewers
2013-11-19 23:29:10 +00:00
f94d07f2e2
Add regression test to check that specifying a non-existent event raise a syntax error
...
This was the case before any of the recent changes
2013-11-16 03:02:57 +00:00
79c1ed8cb9
Add syntax checking for no_sensor() no-arg event
2013-11-16 03:00:03 +00:00
ec4d96acc9
refactor common code out of no argument LSL event regression tests
2013-11-16 02:58:06 +00:00
edd7e19463
If anything other than a single integer is specified for events that only take a single integer, generate a syntax error on LSL script compile rather than an exception later on.
...
This applies to events changed, collision, collision_start, collision_end, on_rez, run_time_permissions, sensor, touch, touch_start, touch_end
2013-11-16 02:50:14 +00:00
62006baaef
Make state_exit, moving_end, moving_start, not_at_rot_target, not_at_target and timer LSL events generate a syntax error if inappropriately given arguments.
...
This matches behaviour seen on the LL grid and a previous change for state_entry.
These are all the events which should take no arguments
2013-11-16 01:30:23 +00:00
d728c1beb2
refactor LSL_EventTests.TestStateEntryEvent into single method to test compile
2013-11-16 01:25:25 +00:00
ecfb78dd16
minor: Use default(UUID) in rez attachment failure error logging rather than (UUID)null
...
Patch from http://opensimulator.org/mantis/view.php?id=6843
Thanks Kira.
2013-11-15 23:16:12 +00:00
346644016c
If HGSuitcaseInventoryService.GetRootFolder() fails to create a suitcase folder when required, then don't try to store the null and perform other operations on it.
...
Patch from http://opensimulator.org/mantis/view.php?id=6844
Thanks Kira.
2013-11-15 23:10:59 +00:00
604b39cea9
Merge branch 'master' into varregion
2013-11-15 14:56:13 -08:00
7cab41f422
refactor: replace verbose checks with String.IsNullOrEmpty where applicable.
...
Thanks to Kira for this patch from http://opensimulator.org/mantis/view.php?id=6845
2013-11-15 21:45:08 +00:00
b4932bda2a
If a local land ID is given to the "land show" command, then output to console the full details of that parcel.
...
Using "land show" without a land ID still outputs a summary of parcels in the region
2013-11-15 00:16:33 +00:00
d67236c09d
Merge branch 'master' into varregion
2013-11-13 16:10:25 -08:00
8114ae0f8b
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-11-13 23:27:25 +00:00
7da10850b0
Fix bug where removing a physical linkset would only decrement the Active Objects statistic by 1 instead of by the number of prims removed.
...
Unlike LL, OpenSimulator currently uses this stat to record the number of prims in the physics simulation, even when they are at rest.
Added regression test for this case.
2013-11-13 23:25:54 +00:00
869a23e223
Update OpenSim.32BitLaunch.exe and Robust.32BitLaunch.exe to .NET 4 versions.
...
Also fixes some issues in associated solution files
2013-11-13 01:07:14 +00:00
e2a1fa806d
varregion: extend TerrainModule to use the region size from RegionInfo
...
rather than using Constants.RegionSize. This allows loading and saving
of terrain heightmaps that match the size of non-legacy sized regions.
2013-11-10 21:12:17 -08:00
c12e68e34d
varregion: fix GetLandObject error return and initialization of square
...
land object bitmaps. This fixes creation of child presences and the
editing of parcels.
Also lots of commented out debugging messages.
2013-11-10 19:52:31 -08:00
7061784cc6
Merge branch 'master' into varregion
2013-11-08 20:55:28 -08:00
beeec1c467
varregion: elimination of Constants.RegionSize from all over OpenSimulator.
...
Routines in Util to compute region world coordinates from region coordinates
as well as the conversion to and from region handles. These routines have
replaced a lot of math scattered throughout the simulator.
Should be no functional changes.
2013-11-08 20:53:37 -08:00
a7a837550e
varregion: Massive work to LandManagementModule and LandObject to
...
handle variable sized regions. Many changes for both the region and parcels.
Most of the constant "4" (for the 4x4 parcel units) have been replaced
with symbols and math.
2013-11-08 20:51:09 -08:00
fd24147afa
Add initial test for checking that specifying a parameter in LSL state_entry() generates a syntax error.
...
Same for other events to follow at a later date.
2013-11-09 00:36:05 +00:00
91b70bf3fe
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
2013-11-08 17:55:01 +00:00
5cef8bf64e
Make admin_save_oar request submit a request ID and log this for tracking.
...
Previous behaviour of always logging 'name' is unhelpful since this actually an error message parameter which is only filled out if an error has occurred
2013-11-08 00:31:26 +00:00
f7bd0da026
Merge branch 'master' into varregion
2013-11-06 06:32:11 -08:00
0b4577d5b0
add support for particle glow LSL functions
2013-11-05 23:48:44 -08:00
709814c194
add support for particle blending LSL functions
2013-11-05 23:38:43 -08:00
a75ce7423c
Merge branch 'master' into varregion
2013-11-05 21:42:27 -08:00
d0854e4ace
varregion: properly sense size of terrain heightmap and store as
...
compressed 2D database blob if a varregion.
2013-11-05 21:33:02 -08:00
26fd29622d
Added sending (for now hard-coded) sim isze in SendMapBlockSplit()
2013-11-06 03:52:04 +01:00
8e1bf55e7b
Add IncomingPacketsResentCount clientstack statistics
...
This records how many packets were indicated to be resends by clients
Not 100% reliable since clients can lie about resends, but usually would indicate if clients are not receiving UDP acks at all or in a manner they consider timely.
2013-11-06 01:02:20 +00:00
caf2abe311
Record individual region bot disconnects in pCampbot log
2013-11-05 23:32:26 +00:00
fb23f78928
minor: comment out "SetLastPosition" GridUserService debug message for now.
2013-11-05 23:18:09 +00:00
2d315ec207
Fix a race condition where pCampbot actions could continue even if a bot had disconnected.
2013-11-05 20:58:52 +00:00
c931b16c1f
Merge branch 'master' into varregion
2013-11-04 22:12:57 -08:00
f2810bf03a
varregion: add plumbing to pass region size from Scene down to the
...
physics engine.
Older physics engines will default to the legacy region size.
Update BulletSim to use the new region size information.
2013-11-04 22:10:54 -08:00
cd1a23fc14
varregion: remove uses of region size constant. In particular, update scene
...
to check for border crossings based on the size of the region.
2013-11-04 22:09:52 -08:00
ac94dc8a14
varregion: remove unused terrain serialization code in SQLite and PGSQL modules
2013-11-04 22:06:20 -08:00
ba203ed94f
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2013-11-03 21:34:36 +00:00
9bf363e9be
varregion: send the proper terrain patch layer code for large terrain.
...
Code cleanups.
2013-11-03 08:14:51 -08:00
79b031bd0c
varregion: send region size in LLLoginResponse.
2013-11-02 15:42:26 -07:00
6df7d4219d
varregion: add linkage for region size in creations and conversions
...
of GridRegion. New variables for size and code to initialize same.
2013-11-02 15:40:48 -07:00
f66737fe56
varregion: Enforce the configuration of square regions in RegionInfo.cs.
2013-11-02 15:36:16 -07:00
2b069a3b1e
If the LSL state_entry() event definition contains any parameters, then generate syntax error as seen on the LL grid
...
This is done through the parser and so generates the same syntax error message if any parameters are wrongly specified for this event.
We were already enforcing event names in the parser.
This is only for state_entry so far as an initial test of the approach - appears to work correctly.
2013-11-02 00:39:12 +00:00
92c06a5d0b
varregion: fix lawn-mower terrain fill so it works for non-square regions.
...
Add some debugging logs on region creation to report region size.
2013-11-01 16:37:27 -07:00
976530569a
varregion: enforce multiple of 256 for region size when parameters fetched from user.
...
Output info and warning messages for non-legacy region sizes.
2013-11-01 16:06:19 -07:00
7faf286d00
add null check for jpeg2000 sculpt image decode failure. Note: the j2kDecodeCache folder should be cleared after updating to this revision so that sculpts containing alpha can be re-decoded and successfully meshed.
2013-11-01 13:45:09 -07:00
ff5885ab23
varregion: push TerrainData implementation up and down the database storage stack.
...
Implement both LoadTerrain and StoreTerrain for all DBs.
Move all database blob serialization/deserialization into TerrainData.
2013-11-01 11:35:31 -07:00
ce94f990bb
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-11-01 01:42:43 -07:00
f4ded3af63
discard alpha in 4-plane sculpt textures before generating physics proxy mesh
2013-11-01 01:40:56 -07:00
db32e5d304
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-11-01 02:05:12 +00:00
c6395240f0
For individual bots, seed random number generator with a random number from BotManager rather than Environment.Tickcount
...
Otherwise, since bots are now created all at once, a bunch will get exactly the same tickcount and hence number sequences
2013-11-01 02:04:04 +00:00
cc73ef4eb9
add new particle system blending rule enumerations
2013-10-31 17:49:01 -07:00
cc7065f9ee
minor: change "bot" pCampBot help cateogry to "Bots"
2013-11-01 00:04:18 +00:00
4c4a1cf715
Start counting resent packets in the places that I missed when the stat was first added a few commits ago
2013-10-31 23:59:22 +00:00
50794c9008
minor: remove mono compiler warnings in AvatarPickerSearchModule and UploadBakedTextureModule
2013-10-31 23:51:01 +00:00
3d5a7e9b19
Add OutgoingPacketsResentCount clientstack stat.
...
This allows one to monitor the total number of messages resent to clients over time.
A constantly increasing stat may indicate a general server network or overloading issue if a fairly high proportion of packets sent
A smaller constantly increasing stat may indicate a problem with a particular client-server connection, would need to check "show queues" in this case.
2013-10-31 23:45:52 +00:00
b7c57294cc
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-10-31 23:45:19 +00:00
eb52d346c0
add new LSL constants associated with new "ribbon", "glow", and "blend" particle system functionality. Note that this does *not* complete required server side changes for implementing the new particle system
2013-10-31 16:13:03 -07:00
0e07fad2e1
minor: update pCampbot usage/help statement
2013-10-31 20:19:57 +00:00
39777db8ef
varregion: fix problem of X/Y dimensions swapped and incorrect terrain
...
compression base computation.
Complete replacement of float[] for terrain heightmap with TerrainData instance.
2013-10-31 09:24:06 -07:00
fdd1c63c3c
Make "fcache status" command also display information on disk/mem cache hit rate that is currently only displayed if LogLevel >=1 in [AssetCache] config
2013-10-30 18:57:51 +00:00
28f36d8db5
Put fcache commands output to console, not log
2013-10-30 18:32:53 +00:00
edaf0a98d6
Give the caller AddMapTile a valid reason response if this failed due to blank response from server or connection failure.
...
Raise log lines which indicate problems to warning from debug
2013-10-29 23:37:22 +00:00
26c2d9e627
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-10-28 23:48:43 +00:00
39de7614ec
Remove legacy sqlite lines added internally by OpenSimulator to the [Startup] section.
...
These are long unused but confusingly will be seen in the [Startup] section on a "config save".
2013-10-28 18:03:34 +00:00
2be0347f50
Merge branch 'master' into varregion
2013-10-28 09:30:26 -07:00
93d5d66fbd
BulletSim: update collision flags to make sure they fit in the shorts provided.
2013-10-26 21:20:19 -07:00
df76e52310
minor: Add commented out code for apparent passing of texture IDs in ObjectProperties UDP replies to viewer
...
Not yet shown that this is used or resolves a bug where not all textures appear on objects with an "XML with textures" upload from singularity 1.8.3
Proper texture entries are actually present and appear properly on relog, but not on select from viewer until at least one face texture is changed.
2013-10-24 23:00:02 +01:00
31989bd51e
Show texture ids for full object/part info console commmds
2013-10-24 21:29:57 +01:00
cccdfcb59e
Comment out LLUDPServer.BroadcastPacket() to reduce code complexity. Appears to be a never used method.
2013-10-24 00:37:49 +01:00
5d61c4039d
Only set the data present event if we actually queued an outoing packet (not if we sent immediately)
2013-10-24 00:33:14 +01:00
511122834b
BulletSim: change collision flags for groundplane to not interact with static objects.
...
Reorder collision flag setting code for terrain to fit pattern used elsewhere.
2013-10-23 16:07:03 -07:00
84a149ecbf
Call ScriptSleep() instead of llSleep() in routine for llEmail.
...
Signed-off-by: teravus <teravus@gmail.com>
2013-10-18 14:30:05 -05:00
0094971186
After finishing to edit an attachment, let other avatars see the changes. (The changes weren't visible before because updates to attachments aren't sent while the attachment is selected.)
2013-10-17 23:10:16 +01:00
67ffb64764
Corrected estateID to EstateID on getEstates function at PGSQLEstateData.cs
2013-10-16 21:58:22 -05:00
f83343d302
* One More thing, add an appdomain data element to ensure that we don't duplicate the assembly resolving.
2013-10-16 21:20:11 -05:00
8fdf70b87e
* Fixes mantis mantis 0006803 [PGSQL] - Simulator crashes - Mono.Security.dll missing. The root of the issue is that the Postgres driver relies on Mono.Security.dll from the mono project. Unfortunately, when using Mono, including the dll in the distribution causes conflicts. This solution puts Mono.Security.dll in bin/lib/NET/ and, if windows .NET is the runtime, informs the assembly loader to load bin/lib/NET/Mono.Security.dll when .NET is scanning for the Mono.Security namespace. On Mono, the included Mono.Security assembly is ignored.
2013-10-16 20:16:29 -05:00
c581506058
varregion: update PGSQL driver for storing variable terrain size blobs.
2013-10-16 08:13:06 -07:00
8937a2244d
Merge branch 'master' into varregion
2013-10-16 07:53:44 -07:00
97bc5263de
varregion: move the compressed heighmap compression factor from
...
Constants into TerrainData.
Save compression factor with the terrain blob in the database.
2013-10-16 07:52:30 -07:00
766a31431e
BulletSim: implement the SL bug where VEHICLE_HOVER_UP_ONLY disables
...
the vehicle buoyancy if the vehicle is above its hover height.
This is a known misfeature of this vehicle flag which has been accepted
since it would break too many implementations. The problem is noticed
when creating a jetski-like vehicle that jumps over sand bars. A boat
normally is configured with neutral buoyancy and hovering at water
height. When it jumps the sandbar, it needs to have gravity applied
to get back to water level.
2013-10-15 17:02:22 -07:00
d0c1780839
Fixed rezzing coalesced objects from a prim's inventory
...
Previously only the first object in the Coalesced Object was rezzed. Now all the objects are rezzed.
2013-10-15 23:59:16 +01:00
d82d6bb1ec
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-10-15 23:18:50 +01:00
5ca7395e17
Added support for attachments to group notices when using Flotsam groups.
2013-10-15 23:07:49 +01:00
3e1ca2bd21
* Fixes mantis #6802 Simulator crashes whist loading (lighshare enabled)
...
* Please test
2013-10-15 11:55:08 -05:00
f106ba87ca
Made terrain uploads thread-safe
2013-10-15 00:12:56 +01:00
ff8a768258
Fernando Oliveira's Postgress SQL Server Data Connector as a single commit.
...
* Added PostGreSQL support
* Added MySQL/MySQLXGroupData.cs
* PostgreSQL data access implementation
* PostgreSQL dll binarie and RegionStore.migrations
* Migrations Scripts from MSSQL to POSTGRES
* Postgres SQL Type fixes
* Postgres SQL Connection string
* Data type issues
* more fixes
* tests and +tests
* UUID x string - FIGHT!
* Fixed PG types to internal csharp types
* More data type fix (PostgreSQL fields are case sensitive) :(
* more field case sensitive fixes
* changed the migration files to be case sensitive for fields.
* fixed fields case
* finished converting, now search for hidden bugs.
* some more fixes
* bool type fixed
* more case fixes;
* creatorID case fixed
* case fields fixed
* fixed default now() for TMStamp fields with don't allow nulls.
* fix case sensitve for Region name and Estate name
* fixed case for names for search
* fix class name Error
* Bug fixed on select and migrations
* Un-Reverting my change due to Postgres issue with the ILIKE function
* Fixed some issued for Diva Distro
* Fixes for integration with Diva Distro
* Added System.Core to prebuild.xml for PG project
* Configured to make DIff for Push to OpenSim Project
* Diffs only to PostgreSQL mods.
2013-10-12 16:33:45 -05:00
8b5e2f2cd2
BulletSim: Fix snap back from edge of region problem. Mantis 6794.
2013-10-11 13:29:43 -07:00
75f63ecfcd
* Add a session concurrency option per key. Allows developer/config to specify number of concurrent requests on a service.
2013-10-09 22:21:25 -05:00
e7ea053c4a
* Remove a test *cleanup*
2013-10-07 23:52:44 -05:00
1df58d04b1
* Move the BasicDOSProtector.cs to OpenSim.Framework (all useful classes belong there.....)
...
* Add an IsBlocked(string Key) method so it can be used more generically. (think.. if we want to rate limit login failures, we could have a call in the Login Service to IsBlocked(uuid.ToString()) and ignore the connection if it returns true, if IsBlocked returns false, we could run the login information and if the login fails we could run the Process method to count the login failures.
2013-10-07 23:48:24 -05:00
75fdd6054d
* Refactor
...
* Break out common BasicDOSProtector code into separate class.
2013-10-07 23:19:50 -05:00
f76cc6036e
* Added a Basic DOS protection container/base object for the most common HTTP Server handlers. XMLRPC Handler, GenericHttpHandler and <Various>StreamHandler
...
* Applied the XmlRpcBasicDOSProtector.cs to the login service as both an example, and good practice.
* Applied the BaseStreamHandlerBasicDOSProtector.cs to the friends service as an example of the DOS Protector on StreamHandlers
* Added CircularBuffer, used for CPU and Memory friendly rate monitoring.
* DosProtector has 2 states, 1. Just Check for blocked users and check general velocity, 2. Track velocity per user, It only jumps to 2 if it's getting a lot of requests, and state 1 is about as resource friendly as if it wasn't even there.
2013-10-07 21:35:55 -05:00
86bf79aa2b
Merge branch 'master' into varregion
2013-10-07 13:58:17 -07:00
7416809077
varregion: plug in TerrainData class and modify TerrainModule and LLClientView to use same. This passes a terrain info class around rather than passing a one dimensional array thus allowing variable regions. Update the database storage for variable region sizes. This should be downward compatible (same format for 256x256 regions).
2013-10-07 13:57:40 -07:00
25ae59b9eb
varregion: remove scattered use of Constants.RegionSize by having routines reference RegionInfo.RegionWorldLoc?.
2013-10-07 13:57:30 -07:00
9b150194f6
varregion: add new TerrainData and TerrainCompressor routines. TerrainCompressor needed to replace the one in libopenmetaverse that doesn't know about the larger terrain packets.
2013-10-07 13:57:16 -07:00
9800c6fa6c
Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster
2013-10-06 18:33:49 +01:00
69054ad134
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Framework/Servers/VersionInfo.cs
OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
2013-10-06 18:32:20 +01:00
ece2d24077
* Fixes cases where Last Attachment Point gets overwritten with 0 when it shouldn't
...
* Fixes cases where Last Attachment Point doesn't get written when it should.
* Fixes Null Reference in BaseHttpServer when shutting down, null path provided.
* Drop then Wear retains Last Attachment Point
2013-10-05 17:36:58 -05:00
31246ecd04
* Added a unique and interesting WebSocket grid login processor by hijacking the LLSD login code. This sends the data through the normal login channels and spits out a JSON object back that mimics the login response. Feel free to comment on the best way to set this up as a config option.
2013-10-04 20:53:01 -05:00
85593d8d25
* Add an initial complete frame timeout to the WebSocket processor to make it easier to write WebSocket service code that is resistant to Denial of Service attacks.
2013-10-04 20:37:59 -05:00
083eb7679b
Added SimulatorFeatures/OpenSimExtras: say-range, whisper-range, shout-range, at the request of Singularity dev Liru-Dargon
2013-10-04 17:32:17 -07:00
44580e2233
Update an AssmblyVersion property that I missed to 0.8.0
2013-10-04 23:36:28 +01:00
42bdf44658
Bump OPenSimulator version and assembly versions up to 0.8.0 Dev
2013-10-04 23:33:47 +01:00
28d704599e
Merge branch 'master' of careminster:/var/git/careminster
2013-10-04 16:52:55 -05:00
75c68fa29e
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Data/MySQL/MySQLSimulationData.cs
OpenSim/Data/MySQL/Resources/RegionStore.migrations
OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
OpenSim/Region/CoreModules/World/LightShare/LightShareModule.cs
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
OpenSim/Region/Framework/Scenes/Tests/ScenePresenceCapabilityTests.cs
OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2013-10-04 20:03:12 +01:00
970249a3c7
Add OnChatToNPC and OnInstantMessageToNPC messages to NPCAvatar to allow region modules to directly subscribe to chat and messages received by NPCs
...
Currently still requires INPC from NPCModule.GetNPC() to be cast to an NPCAvatar.
2013-10-04 19:40:43 +01:00
8c1d80fdfd
varregion: serious rework of TerrainChannel:
...
-- addition of varaible region size in X and Y
-- internal storage of heightmap changed from double[] to short[]
-- helper routines for handling internal structure while keeping existing API
-- to and from XML that adds region size information (for downward compatibility,
output in the legacy XML format if X and Y are 256)
Updated and commented Constants.RegionSize but didn't change the name for compatibility.
2013-09-28 07:33:56 -07:00
aea5d3a842
Remove time based terrain storage in SQLite so revision number can be used
...
to denote terrain format revision.
Add terrain DB format revision codes to ISimulationDataStore.cs.
Setup so legacy compatible terrain storage and fetch is possible while
allowing future format extensions.
2013-09-28 07:33:55 -07:00
fa1c688342
varregion: go back to using Constants.RegionSize so as not to break
...
external modules. People shouldn't use it but don't want to cause
too much breakage of legacy modules.
2013-09-28 07:33:54 -07:00
139639d25e
VarRegion: add RegionSize[XYZ] to RegionInfo.cs.
...
Update RegionInfo parameter and serialization routines to serialize
the region size if it is not the LegacyRegionSize.
2013-09-28 07:33:53 -07:00
317c04fe17
VarRegion: change RegionInfo storage of region coordinates from region
...
count number to integer world coordinates.
Added new methods RegionWorldLoc[XY].
Refactored name of 'RegionLoc*' to 'LegacyRegionLoc*' throughout OpenSim.
Kept old 'RegionLoc*' entrypoint to RegionInfo for downward compatability
of external region management packages.
2013-09-28 07:33:52 -07:00
8996ac1a9c
minor: Disable logging left active on regression test TestSameSimulatorIsolatedRegionsV2()
2013-09-27 22:33:42 +01:00
2cd95fac73
refactor: Rename Scene.AddNewClient() to AddNewAgent() to make it obvious in the code that this is symmetric with CloseAgent()
2013-09-27 22:27:39 +01:00
b16bc7b01c
refactor: rename Scene.IncomingCloseAgent() to CloseAgent() in order to make it clear that all non-clientstack callers should be using this rather than RemoveClient() in order to step through the ScenePresence state machine properly.
...
Adds IScene.CloseAgent() to replace RemoveClient()
2013-09-27 19:14:21 +01:00
b704de9bf8
minor code formatting for the sake of consistency and readability
2013-09-26 16:27:11 -07:00
d6d82dbd3c
minor: correct attachment spelling mistake in log message in HGEntityTransferModule.OnIncomingSceneObject()
2013-09-26 20:13:29 +01:00
e24edada24
minor: Comment out windlight log message about sending scene data for now.
2013-09-26 00:39:32 +01:00
253f8de8cd
minor: Add scene name to baked textures in cache log message
2013-09-26 00:33:50 +01:00
babfbe8d6d
minor: log MaxOutgoingTransferVersion at EntityTransferModule startup
2013-09-26 00:31:33 +01:00
4664090b34
minor: correct spelling of Initialized in LSC connector version message
2013-09-25 22:59:57 +01:00
b22c92368f
Move adding UUID.Zero -> Unknown User binding to UMM.Init() so that it's also called by HGUserManagementModule
2013-09-25 21:53:38 +01:00
32ddfc2740
Reinsert client.SceneAgent checks into LLUDPServer.HandleCompleteMovementIntoRegion() to fix race condition regression in commit 7dbc93c (Wed Sep 18 21:41:51 2013 +0100)
...
This check is necessary to close a race condition where the CompleteAgentMovement processing could proceed when the UseCircuitCode thread had added the client to the client manager but before the ScenePresence had registered to process the CompleteAgentMovement message.
This is most probably why the message appeared to get lost on a proportion of entity transfers.
A better long term solution may be to set the IClientAPI.SceneAgent property before the client is added to the manager.
2013-09-25 18:45:56 +01:00
732554be04
Reinsert 200ms sleep accidentally removed in commit 7dbc93c (Wed Sep 18 21:41:51 2013 +0100)
2013-09-25 18:29:14 +01:00
f384a6291e
Instead of swallowing any socket begin/end receive exceptions, log them for debugging purposes.
...
This may reveal why on some teleports with current code, the UseCircuitCode message gets through but CompleteMovement disappears into the ether.
2013-09-25 00:02:17 +01:00
7889e7757a
Don't use 'Indented' formatting for RpcXml responses.
...
(cherry picked from commit 93abcde69043b175071e0bb752538d9730433f1d)
2013-09-22 21:10:01 -05:00
2dc92e7de1
Preserve attachment point & position when attachment is rezzed in world
...
Patch taken from
http://opensimulator.org/mantis/view.php?id=4905
originally by Greg C.
Fixed to apply to r/23314 commit
ba9daf849e
2013-09-22 21:10:01 -05:00
a37c59b43e
minor: Recomment out log message uncommented in previous cbdfe969
2013-09-21 00:40:23 +01:00
cbdfe96905
When giving items between avatars in different simulators, only add the item to the receiving avatar's inventory once.
...
When a user gives an item, the user's client sends an InventoryOffered IM message to its simulator. This adds the item to the receiver's inventory. If the receiver isn't in the same simulator then XMLRPC is used to forward the IM to the correct simulator. The bug was that the receiving simulator handled the message by calling OnInstantMessage() again, which added a second copy of the item to the inventory. Instead, the receiving simulator should only notify the avatar that the item was offered.
2013-09-21 00:32:56 +01:00
4c0ec86176
minor: Add prefix to log message in LureModule
2013-09-21 00:14:57 +01:00
e2b3b7a2ae
minor: Correct minor spelling mistake Reseting -> Resetting in HG Map module log message
2013-09-20 23:42:55 +01:00
8502517d80
Make UUID.Zero resolve to "Unknown User" in user cache.
...
This is to avoid massive numbers of 'no user found' logs when user IDs are missing for some reason.
UUID.Zero should not be used for any user ID.
2013-09-20 23:07:24 +01:00
c01db5fbdd
Lock around read/write of ScenePresence.m_originRegionID to make sure that all threads are seeing the latest value and not a cached one.
...
There is a possibilty that some V2 teleport failures are due to the viewer triggered CompleteMovement thread not seeing the change of m_originRegionID by the UpdateAgent thread.
2013-09-20 22:41:53 +01:00
c6dea6ee78
Change some message log levels in Scene.IncomingUpdateChildAgent() for debugging purposes
2013-09-20 20:19:44 +01:00
35a6361b24
BulletSim: reduce avatar walking stopped threshold.
...
Add parameter for setting the walking stopped threshold.
This fixes the slight jump when an avatar stops walking.
2013-09-20 09:58:45 -07:00
07d7a5fd76
BulletSim: zero velocity when avatar not moving.
...
This fixes a movement jitter that happens when an avatar is standing on a
tilted surface.
2013-09-20 09:58:25 -07:00
c06a9ffe5c
Make new regions PG by default instead of Mature.
...
This makes scripted object sounds and a few other things play by default instead of having to switch the viewer to adult
This reduces the support burden
2013-09-20 00:04:33 +01:00
f1267730ef
UUID Gatherer: find assets used in Light Projection, Particle Systems, and Collision Sounds.
2013-09-19 23:01:06 +01:00
979b17165b
For debug purposes, allow simulators to force use of earlier SIMULATION/0.1 teleport protocol even if SIMULATION/0.2 is available.
...
This is specified in the MaxOutgoingTransferVersion attribute of [EntityTransfer] in OpenSim.ini, see OpenSimDefaults.ini for more details.
Default remains "SIMULATION/0.2"
Primarily for http://opensimulator.org/mantis/view.php?id=6755
2013-09-19 22:45:50 +01:00
b6f10780c2
minor: Make SP.MakeRootAgent() private - no external code has any business calling this method
2013-09-19 21:44:30 +01:00
03b2b5b77b
minor: Make log message at top of ScenePresence.CompleteMovement info level and comment out later log message in ScenePresence.MakeRootAgent()
...
Need an info message since this is currently important in detecting teleport issue when not at debug log level.
CompleteMovement message occurs before MakeRootAgent() one did
2013-09-19 20:59:27 +01:00
6bdef1f70b
minor: Stop debug logging whenever an npc is moved, other npc log related formatting cleanups
2013-09-19 20:49:55 +01:00
3a9a8d2113
Revert "Also check user authorization if looking to upgrade from a child to a root agent."
...
This reverts commit c7ded0618c
2013-09-19 20:26:26 +01:00
83c113896e
Create regression TestCrossOnSameSimulatorNoRootDestPerm() to check that avatars are not allowed to cross into a neighbour where they are not authorized, even if a child agent was allowed.
2013-09-19 20:26:08 +01:00
8ad7f2ce2d
Merge branch 'avination-current' of ssh://3dhosting.de/var/git/careminster into avination-current
2013-09-19 11:33:38 +01:00
8999f06025
minor: correct method name in comment
2013-09-18 23:13:31 +01:00
ddcbd4bb7d
refactor: rename *ChildAgentDataUpdate() methods to *UpdateChildAgent()
...
verb-noun is consistent with other similar methods
2013-09-18 23:09:38 +01:00
3ce46adb2a
minor: Make log message when Scene.IncomingChildAgentDateUpdate() more explicit that there is a problem if it still finds the agent to be a child if the sender wanted to wait till it became root
...
Add some comments about the mssage sequence, though much more data is at
http://opensimulator.org/wiki/Teleports
2013-09-18 22:56:00 +01:00
f4d82a56f4
Double the time spent waiting for a UseCircuitCode packet in LLUDPServer.HandleCompleteMovementIntoRegion()
...
This is to deal with one aspect of http://opensimulator.org/mantis/view.php?id=6755
With the V2 teleport arrangements, viewers appear to send the single UseCircuitCode and CompleteAgentMovement packets immediately after each other
Possibly, on occasion a poor network might drop the initial UseCircuitCode packet and by the time it retries, the CompleteAgementMovement has timed out and the teleport fails.
There's no apparant harm in doubling the wait time (most times only one wait will be performed) so trying this.
2013-09-18 22:09:46 +01:00
7dbc93c62a
Change logging to provide more information on LLUDPServer.HandleCompleteMovementIntoRegion()
...
Add more information on which endpoint sent the packet when we have to wait and if we end up dropping the packet
Only check if the client is active - other checks are redundant since they can only failed if IsActve = false
2013-09-18 21:41:51 +01:00
1d2466889a
Reinstate insertion of "Unknown UserUMMAU4" now, as naive removing may be generating too many repeating user requests from other sources.
...
Leaves in the dropping of the client GUN8 (now 9) uuid binding message, since this was the much more common case from the viewer-side and this can only affect viewers.
2013-09-17 01:20:55 +01:00
845d2b193a
Comment out warning about no grid user found in UMM.TryGetUserNamesFromServices() for now
2013-09-17 00:54:53 +01:00
69ec85f491
Fix issue in recent 3f0fa9f7 where the code start adding unknown user cache entries with no name
2013-09-17 00:02:36 +01:00
2603a2891b
Reinsert comments about possible race conditions when sending bulk inventory updates on non-flag clothing editing
2013-09-16 23:26:13 +01:00
f99dae03cb
Fix bug where using PRIM_LINK_TARGET with only two remaining list items (e.g. link number then PRIM_ROTATION) would not return the parameter
...
Extended regression test for this case
2013-09-16 23:00:40 +01:00
60cf42cb8d
Make llGetLinkPrimitiveParams() abort and return existing list of params when it encounters an invalid link number, rather than throwing an exception
...
Addresses http://opensimulator.org/mantis/view.php?id=6768
Thanks to talun for the patch on that commit - in the end I took a different approach that also deals with invalid PRIM_LINK_TARGET
However, not yet generating the same warning on invalid PRIM_LINK_TARGET as seen on LL grid
This commit also adds regression tests for some cases of llGetLinkPrimitiveParams()
2013-09-16 22:56:08 +01:00
c4b0f172a1
Merge branch 'master' of careminster:/var/git/careminster
2013-09-16 16:49:46 -05:00
72206a0e29
Merge branch 'avination-current' into careminster
...
Conflicts:
OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs
2013-09-16 22:32:53 +01:00
3f0fa9f707
To avoid viewers (particularly on the Hypergrid) from permanently caching a UUID -> "Unknown User" binding, drop the binding request rather than replying with "Unknown User"
...
By not binding UUID -> "Unknown User", we leave open the possibility that the binding may be correctly resolved at a later time, which can still happen in some Hypergrid situations.
Observed behaviour of LL viewer 3.3.4 is that a dropped bind request is not retried until the next session.
2013-09-16 19:45:42 +01:00
120b6948ed
* This fixes the border crossing offsets by storing the final keyframe location in the hijacked variable KeyFrame.AngularVelocity. When steps in OnTimer <= 0.0, normalize the final position by Constants.RegionSize and move the object there. The hack here is KeyFrame.AngularVelocity probably isn't the right name for this variable because it's the un-mucked with keyframe position. When you determine the feasibility of changing the name without affecting the serialization of existing objects in world... It's simply a name change to KeyFrame.FinalPosition or something proper.
...
(cherry picked from commit e0399ccaec
2013-09-16 11:32:05 -05:00
1c7accf950
* Fix a null ref that causes a stack unwind when crossing borders. Less stack unwinding.. the faster it goes.
...
* Tweak XEngine so that it's partially functional again. It's still not great, but basic things work.
(cherry picked from commit 01c3be2746
2013-09-16 11:32:05 -05:00
07d6a0385f
6762: llList2Key fails to convert a string in a list to a key
...
llGetPrimitiveParams changed to return the sculpty key as an LSL_String so
that type checking in llList2Key will work
2013-09-12 23:23:52 +01:00
3c85afbb43
Allow setting the EntityTransfer-max_distance to 0 to override distance checks. This is to facilitate current viewer work fixing the distance limitations for teleporting.
2013-09-12 11:46:12 -04:00
dacc20ee48
BulletSim: remove collision cache clearing logic for physical objects.
...
This fixes constraints from getting messed up when properties change.
2013-09-11 16:50:27 -07:00
b29e9d37e7
Change handling of the FetchInventoryDescendents2 capability configuration to allow
...
for external handlers.
2013-09-11 12:15:16 -07:00
6e39cc316f
BulletSim: add ClearCollisionProxyCache function to API.
...
Add proxy cache clearing when some properties are changed. This fixes
a problem where objects would stop colliding of they were moved
with setPosition mulitple times.
2013-09-11 09:12:24 -07:00
c5eabb28b4
BulletSim: add LSL function and plumbing for setting a spring
...
equilibrium point in the physics engine constraint.
2013-09-11 09:12:19 -07:00
5827b6e1aa
BulletSim: add extended physics LSL constants for axis specification.
...
Add specific error warnings for mis-matched parameter types in extended
physics functions.
2013-09-11 09:12:18 -07:00
cf2cdc191d
BulletSim: ability to specify groups of axis to modify in constraint parameters that control multiple axis. Add useLinearReferenceFrameA constraint parameter.
2013-09-11 09:12:16 -07:00
7c54630a2d
BulletSim: add axis parameter for specifying enable, damping, and stiffness for spring constraints. Renumber parameter ops since I can as no one is using them yet.
2013-09-11 09:12:14 -07:00
30b3657a66
BulletSim: implementation of setting spring specific physical parameters. Add setting of linkset type to physChangeLinkParams. Lots of detail logging for setting of linkset constraint parameters.
2013-09-11 09:12:12 -07:00
67195618d5
BulletSim: add requestor's ID to post taint detail log message.
2013-09-11 09:12:10 -07:00
3dbf4a1002
BulletSim: remove chatty debug message from previous commit.
2013-09-11 09:12:09 -07:00
e0b457d3c3
BulletSim: add position and rotation update for child prim physics update events. Normally, physics engines do not return updates for child prims so, under normal operation, this code should never execute. Will only be used when using flexible linkset linkages.
2013-09-11 09:12:07 -07:00
d09c35f506
BulletSim: pass both root and child BSPhysObjects to Extension function. Update routines to use the new parameters list from above change.
2013-09-11 09:12:05 -07:00
995314f91f
BulletSim: add ID parameter to TaintedObject calls so logging will include LocalID of object which created the taint.
2013-09-11 09:12:03 -07:00
4781297b4e
BulletSim: Extension parameters passed through the classes made to pass just and array of objects rather than a mixture of parameters and array. Makes understanding and parsing what is being passed much easier.
2013-09-11 09:12:02 -07:00
6d83f3f021
BulletSim: adjust avatar capsule height calculation to be closer to defined SL heights. Correct BSParam avatar height defaults to be what's in OpenSimDefaults.ini.
2013-09-11 09:12:00 -07:00
e1120cb74d
BulletSim: add extended physics function physGetLinkType(linkNum). Add implementation of physChangeLinkParams() in BSLinksetConstraint.
2013-09-11 09:11:58 -07:00
f6fdfd16f5
BulletSim: change ExtendedPhysics constants to 'const' so they can be used as case variables in switch statements.
2013-09-11 09:11:54 -07:00
455d36c4c7
BulletSim: add physChangeLinkParams to set individual parameters on link constraints. Not fully functional. Remove double definition of ExtendedPhysics parameters by having BulletSim reference the optional module (addition to prebuild.xml and usings).
2013-09-11 09:11:52 -07:00
b2a1348adc
BulletSim: update C++ HACD parameters to values that handle enclosed hollow spaces better. This shouldn't affect many since this HACD routine is off by default.
2013-09-11 09:11:50 -07:00
6aee08ac3c
BulletSim: add physChangeLinkSpring to change linkset link to be a spring constraint. Add implementation to create spring constraint. Send up property updates for linkset children at the end of flexible linkset links. The simulator probably doesn't do the right thing yet.
2013-09-11 09:11:48 -07:00
dff0fb5690
BulletSim: Linkset.Refresh() calls internal ScheduleRebuild() to recreate the linkset physics at next PostTaint time. Replace the existing calls to ScheduleRebuild to be calls to Refresh(). This allows external routines to make changes to parameters and then cause the linkset to rebuild.
2013-09-11 09:11:46 -07:00
f3cc20050e
BulletSim: initial implementation of physChangeLinkFixed that resets a linkset's link back to a fixed, non-moving connection.
2013-09-11 09:11:45 -07:00
c6a6631efc
BulletSim: move linkset extension operations into BSPrimLinkable where they should be.
2013-09-11 09:11:43 -07:00
993bcec088
BulletSim: add unmanaged and XNA functions for hinge, slider and spring constraints.
2013-09-11 09:11:41 -07:00
0971c7ae77
BulletSim: complete linkage of spring constraint into linkset constraint.
2013-09-11 09:11:39 -07:00
9a7d0e489c
BulletSim: add spring constraint to linkset constraint types.
2013-09-11 09:11:37 -07:00
48ee73bfa7
BulletSim: add API and calls for spring constraint parameters.
2013-09-11 09:11:36 -07:00
725751fd6c
BulletSim: fixes for change linkset implementation of physical linksets.
2013-09-11 09:11:34 -07:00
b05cb3b2bf
Change collision logic in SceneObjectPart so land_collision will happen.
...
The previous logic would generate land_collision_start and land_collision_end
but would not generate the land_collision itself.
2013-09-09 14:50:33 -07:00
ddf67bf929
Mono 2.0 fix - call ToArray() explicitly
2013-09-08 19:41:51 +02:00
528fc5358d
Fix exception when brokering HG asset ids
2013-09-08 18:23:06 +02:00
b41ae0f98f
Harmonize the class name, ID and Name of the default perms module
2013-09-08 17:54:00 +02:00
59290854f2
Reinstate SecurePermissionsLoading functionality, default ON
2013-09-08 17:53:21 +02:00
a97f6f8668
Fix configuration/ini expansion issue. Thanks to smxy for testing.
2013-09-07 13:11:31 -04:00
844ae7720e
Bring Core Groups up to current version
2013-09-07 17:58:32 +02:00
66715a69a7
Add two argument constructor to GridInstantMessage
2013-09-07 17:57:53 +02:00
823e8b5d19
Add support for simple external CAPS texture services
2013-09-07 17:57:02 +02:00
2f365ea80b
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
OpenSim/Region/Framework/Scenes/Scene.cs
2013-09-07 13:54:19 +01:00
04619a9b13
Restore group membership check for HG users in QueryAccess.
2013-09-05 07:44:27 -07:00
dc74a50225
Stop "show client stats" from throwing an exception if somehow Scene.m_clientManager still retains a reference to a dead client.
...
Instead, "show client stats" now prints "Off!" so that exception is not thrown and we know which entries in ClientManager are in this state.
There's a race condition which could trigger this, but the window is extremely short and exceptions would not be thrown consistently (which is the behaviour observed).
It should otherwise be impossible for this condition to occur, so there may be a weakness in client manager IClientAPI removal.
2013-09-04 23:48:24 +01:00
c7ded0618c
Also check user authorization if looking to upgrade from a child to a root agent.
...
Relevant if a child agent has been allowed into the region which should not be upgraded to a root agent.
2013-09-04 00:44:17 +01:00
5f0d54c209
For a Hypergrid user, delay estate access checks until NewUserConnection() so that they work.
...
This is necessary because the hypergrid groups checks (as referenced by estates) require an agent circuit to be present to construct the hypergrid ID.
However, this is not around until Scene.NewUserConnection(), as called by CreateAgent() in EntityTransferModule.
Therefore, if we're dealing with a hypergrid user, delay the check until NewUserConnection()/CreateAgent()
The entity transfer impact should be minimal since CreateAgent() is the next significant call after NewUserConnection()
However, to preserve the accuracy of query access we will only relax the check for HG users.
2013-09-04 00:42:23 +01:00
b781a23c44
In pCampbot PhysicsBehaviour.Close(), only cancel jumping if bot is connected
2013-09-03 19:58:27 +01:00
9c3c9b7f5f
Make pCampbot "add behaviour" and "remove behaviour" console commands work for all bots if no bot number is given
2013-09-03 19:57:34 +01:00
76bd2e2d72
Consistently give responsibility for thread sleeping to behaviours rather than controlling from the main action loop
...
This is to avoid excessive and inconsistent delays between behaviours that currently need to embed sleeps in other actions (e.g. physics) and other behaviours.
Might need a more sophisticated approach in the long term.
2013-09-03 19:41:12 +01:00
3dbe7313d1
Add Close() method to IBehaviour to allow behaviours to cleanup when removed or bot it disconnected.
...
In this case, it is used to turn off jump when physics testing behaviour is removed.
2013-09-03 19:33:17 +01:00
1a2627031d
Add pCampbot "remove behaviour" console command for removing bot behaviours during operation.
...
Doesn't currently work very well as stopping physics, for instance, can leave bot travelling in old direction
2013-09-03 19:05:54 +01:00
9bd6271570
Add ability to adjust pCampbot bot behaviours whilst running with "add behaviour <behaviour-name> <bot-number>" console commad
2013-09-03 18:51:55 +01:00
01cb8033a4
And fix break in "show bot" from commit 9c65207
2013-09-03 17:55:20 +01:00
a89c56dcf1
Fix build break from last commit 9c65207. Mono 2.4 lacks string.join(string, List<string>), or some auto casting is missing
2013-09-03 17:53:29 +01:00
9c65207936
Show behaviours of pCampbot bots in "show bots" and "show bot" console commands
2013-09-03 17:07:57 +01:00
431156f6c4
minor simplification of some unix date functions in Util. No functional change.
2013-09-03 00:17:50 +01:00
5f15ee95dc
Fix logic errors in "show grid users online" console command which didn't actually filter out users shown continuously online for more than 5 days
...
Remove confusion in command output.
2013-09-03 00:16:43 +01:00
fc9f50d940
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-09-03 00:06:50 +01:00
4035badd20
Add experimental "show grid users online" console command to show grid users online from a standalone/robust instance.
...
This is not guaranteed to be accurate since users may be left "online" in certain situations.
For example, if a simulator crashes and they never login/logout again.
To counter this somewhat, only users continuously online for less than 5 days are shown.
2013-09-03 00:04:12 +01:00
9643915093
Remove test that gives issue on Windows, just let the try/catch do the work.
2013-09-02 16:28:40 -04:00
857f24a5e2
Fix bug where users teleporting to non-neighbour regions could continue to hear chat from their source region for some time after teleport completion.
...
This occurs on v2 teleport since the source region now waits 15 secs before closing the old child agent, which could still receive chat.
This commit introduces a ScenePresenceState.PreClose which is set before the wait, so that ChatModule can check for ScenePresenceState.Running.
This was theoretically also an issue on v1 teleport but since the pause before close was only 2 secs there, it was not noticed.
2013-09-02 19:15:10 +01:00
5ce5ce6edb
Comment out warning about agent updating without valid session ID for now.
...
This causes extreme console spam if a simulator running latest master and one running 0.7.5 have adjacent regions occupied by avatars.
2013-09-02 17:45:38 +01:00
4cbadc3c49
Allow one to specify a DefaultHGRegion flag in [GridService] in order to allow different default regions for HG and direct grid logins.
...
This requires a new GridService.GetDefaultHypergridRegions() so ROBUST services require updating but not simulators.
This method still returns regions flagged with just DefaultRegion after any DefaultHGRegions, so if no DefaultHGRegions are specified
then existing configured defaults will still work.
Immediate use is for conference where we need to be able to specify different defaults
However, this is also generally useful to send experienced HG users to one default location and local users whose specified region fails (e.g. no "home" or "last") to another.
2013-09-02 17:27:45 +01:00
008c98a974
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/World/Region/RestartModule.cs
OpenSim/Region/Framework/Scenes/SceneGraph.cs
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
2013-09-01 22:49:31 +01:00
56f565b601
Profiles: Clean up some log entries caused when visiting HG avatar is using legacy profiles
2013-08-29 16:54:13 -04:00
a8c0e16e47
Initialization: move key expansion out to operate on all sources and not just environment variables
2013-08-29 14:35:56 -04:00
aa521fb385
Do not add a port zero to end of the hypergrid gateway host name.
...
If the port is specified it is added but a ":0" is not added if the port is zero.
This enables the hypergrid address short form "hypergridGateway:regionName"
which is handled by the parser but failed because of this zero port addition.
2013-08-28 16:38:07 -07:00
0882cf0fc3
BulletSim: add some protections for processing when shutting down.
...
Attempt to fix Mantis 6740 (http://opensimulator.org/mantis/view.php?id=6740 ).
2013-08-27 09:55:50 -07:00
0dd9a68eb7
Revert "Make HG logins fall back to fallback regions if the desired region fails."
...
This is very similar to my earlier revert in bcb8605f84c7a8afbb8d
2013-08-26 21:07:49 +01:00
1b2830b929
Revert "Added some more debug messages."
...
Fallback doesn't work at this level as the change of destination isn't communicated to the source region/viewer
Reverting because this introduces a bug when access does fail.
More detail in revert of main commit.
This reverts commit ec32c1d4b6
2013-08-26 21:05:55 +01:00
60e4ce20b8
Fix exception thrown after a region has been restarted through scheduling.
...
This exception was very likely harmless since it occurred after the restart had taken place, but still misleading.
Thanks to SCGreyWolf for the code change suggestion in http://opensimulator.org/mantis/view.php?id=6747 , though I did this in a slightly different way.
2013-08-25 20:17:04 +01:00
85824d2cd9
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-08-25 20:12:59 +01:00
f7378829c3
Fix the root cause of keyframe motion region crossing offset - UpdateSceneObject
...
was being called twice on each crossing.
2013-08-25 06:26:56 +02:00
e0399ccaec
* This fixes the border crossing offsets by storing the final keyframe location in the hijacked variable KeyFrame.AngularVelocity. When steps in OnTimer <= 0.0, normalize the final position by Constants.RegionSize and move the object there. The hack here is KeyFrame.AngularVelocity probably isn't the right name for this variable because it's the un-mucked with keyframe position. When you determine the feasibility of changing the name without affecting the serialization of existing objects in world... It's simply a name change to KeyFrame.FinalPosition or something proper.
2013-08-24 18:55:21 -05:00
ec32c1d4b6
Added some more debug messages.
2013-08-24 09:59:05 -07:00
f0c0376660
Potential fix for access control bug on login introduced with SeeIntoRegion commit.
2013-08-24 08:42:41 -07:00
01c3be2746
* Fix a null ref that causes a stack unwind when crossing borders. Less stack unwinding.. the faster it goes.
...
* Tweak XEngine so that it's partially functional again. It's still not great, but basic things work.
2013-08-24 05:55:53 -05:00
58359788a9
Revert "* This increases accuracy when border crossing (the reason is.. the border crossing code will use velocity to predict where the object should be, so setting it to zero. It still looses about 0.0045 per loop."
...
This reverts commit 55400ff7be
2013-08-24 05:54:08 -05:00
5cd7bc2848
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-08-24 03:42:39 -07:00
c7a8afbb8d
Make HG logins fall back to fallback regions if the desired region fails.
2013-08-24 03:41:56 -07:00
c34e6f25b1
Fix a printing of exception error in InventoryArchiveModule that only
...
printed the error message and not the call stack.
2013-08-23 13:53:47 -07:00
1a623bb266
Rename pCampbot.ini -> pCampBot.ini (and example file) to be consistent with other capitalizations of pCampBot
2013-08-23 20:58:46 +01:00
55400ff7be
* This increases accuracy when border crossing (the reason is.. the border crossing code will use velocity to predict where the object should be, so setting it to zero. It still looses about 0.0045 per loop.
2013-08-23 00:28:36 -05:00
0fbfef9649
minor: shortern warning messages in EntityTransferModule when UpdateAgent() fails
2013-08-23 01:21:03 +01:00
050617ae0e
Make pCampbot "show bot" command take the bot number instead of the full bot name
...
Shorter and can do this because bot names are uniform
2013-08-23 01:13:19 +01:00
04f4dd3dc7
remove redundant return at end of HandleDeregisterRegion()
2013-08-23 01:04:03 +01:00
2be786709b
Make it possible for the "deregister region id" command to accept more than one id
2013-08-23 01:03:27 +01:00
61c20bd06a
Remove old and unused ScenePresence.RestoreInCurrentScene()
2013-08-23 00:53:42 +01:00
065c5839b5
Refactor: merge SceneGraph.AddScenePresence() into CreateAndAddChildScenePresence() since the former was only ever called from the latter
...
This allows us to remove dead code relating to adding root agents directly to the scenegraph, which never happens.
2013-08-23 00:49:13 +01:00
a9f9b0da9d
minor: Correct typo on "debug stats record start" message
2013-08-23 00:13:31 +01:00
a0c99a7dcc
minor: remove mono compiler warning from LLClientView
2013-08-23 00:03:47 +01:00
13556cf129
Fix a further bug in pCampbot connect where ignoring already connected bots was wrongly counted as a connect
...
Also, only sleep when we actually perform a connection
2013-08-22 23:49:19 +01:00
70f89ae65b
Make it possible to adjust the pCampbot login delay via the [BotManager] LoginDelay parameter of pCampbot.ini
2013-08-22 23:43:33 +01:00
51c7fb1969
Add "set bots" command to make it possible to set SEND_AGENT_UPDATES on all bots whilst pCampbot is running
2013-08-22 23:11:05 +01:00
beb9d966f9
Stop "handle sit user name" command from trying to sit avatars on objects which have sit positions but are attachments
2013-08-22 22:49:23 +01:00
416bbe9583
Stop error messages being misleadingly generated when on client connection activity timeout, a root connection triggers a CloseAgent to a neighbour region which has already closed the agent due to inactivity.
...
Also separates out log messages to distinguish between close not finding an agent and wrong auth token, and downgrades former to debug and latter to warn
2013-08-22 22:46:40 +01:00
66a7dc3a0d
In pCampbot, don't try and reconnect bots that are already connected on console "connect" command
2013-08-22 20:12:14 +01:00
832c35d4d5
Stop "sit user name" and "stand user name" console commands from trying to sit/stand avatars already sitting/standing
2013-08-22 20:05:57 +01:00
689cf2d367
minor: Make logging in GatekeeperService.LoginAgent() a bit more detailed so that we can distinguish between simultaneous logins
2013-08-22 01:24:55 +01:00
bcb8605f84
Revert "Implement ability for hg logins to try fallback regions just like local logins."
...
This approach does not work - it is taking place too far down the login process where really the region checking
could only be done when the hg map tiles are linked on the main map (messy and probably impossible) or possibly
when the final destination is fetched at the very first stage of teleport (which couldn't be done without a protocol
change to pass the agentID as well as the requested regionID)
This reverts commit 3d9b73c47a
2013-08-22 01:20:01 +01:00
3d9b73c47a
Implement ability for hg logins to try fallback regions just like local logins.
...
These would be specified in the [GridService] section of Robust.HG.ini, which already lists these in the example text.
Untested patch so that Neb can easily pull in for testing, though shouldn't disrupt existing hg logins since fallback processing is a bit of code stuck on the end of the login sequence.
2013-08-21 23:19:31 +01:00
1f39a763a5
Don't allow users to attempt to sit on objects in a child region without going to that region first.
...
If this is attempted, they get a "Try moving closer. Can't sit on object because it is not in the same region as you." message instead, which is the same as current ll grid.
Sitting on ground is okay, since viewer navigates avatar to required region first before sitting.
2013-08-21 21:35:03 +01:00
a6af561660
* Fix some threading issues in BulletXNA (the managed bullet library), this should better allow you to run it in multiple region scenarios (but why would you really want to do that?) Source in OpenSimLibs.
...
* Fixed a null ref during shutdown.
2013-08-20 21:09:17 -05:00
4a81465b91
Fix build break from last commit a3e1b27 on mono 2.4.3
...
Looks like this level of mono doesn't have a string.Join() which will take a list rather than an array (or some implicit conversion isn't happening)
2013-08-20 18:47:52 +01:00
a3e1b278a1
Add pCampbot "show bot" console command to show more detailed information on a particular bot (e.g. what sims they are connected to)
2013-08-20 18:41:09 +01:00
43940f6562
Add --regex options to "sit user name" and "stand user name" console commands to sit/stand many avatars at once.
...
Currently, first name and last name are input separate but are concatenated with a space in the middle to form a regex.
So to sit all bots with the first name "ima", for instance, the command is "sit user name --regex ima .*"
2013-08-20 18:13:40 +01:00
e384ff604e
Add experimental "sit user name" and "stand user name" console commands in SitStandCommandsModule.
...
"sit user name" will currently only sit the given avatar on prims which have a sit target set and are not already sat upon.
Chiefly for debug purposes.
2013-08-20 17:43:02 +01:00
56d1d67a34
Add pCampbot console commands to sit all bots on ground and stand all bots
2013-08-20 17:01:12 +01:00
a3dd7db4a3
Add -connect (-c) switch to pCampbot command line options.
...
Now, bots will only connect at startup if this switch is specified.
If it is not specified, then a separate "connect" command is required on the pCampbot command line
2013-08-20 00:08:47 +01:00
589b1a2eaf
Make it possible to reconnect pCampbots with the console command "connect [<n>]".
...
If no n is given then all available bots are connected
2013-08-19 23:50:18 +01:00
ea3f024b8a
refactor: start bot connection thread within BotManager rather than externally
2013-08-19 21:25:17 +01:00
079cd4e94f
refactor: restructure pCampbot multi-bot connection code.
2013-08-19 21:17:59 +01:00
2fa42f24fd
Make it possible to disconnected a specified number of bots via the pCampbot console command "disconnect [<n>]"
...
Bots disconnected are ascending from last in numeric order.
Temporarily no way to reconnect bots.
2013-08-19 21:00:31 +01:00
49b7cbda72
Create a separate pCampbot "disconnect" console command which disconnects connected bots.
...
"quit" console command now requires bots to be separate disconnected first before quitting.
This is to prepare the way for disconnecting/reconnecting different numbers of bots in a pCampbot session.
And hopefully resolves bug where console appears not to be reset if Environment.Exit(0) is called on a different thread
2013-08-19 20:29:17 +01:00
ef63abe9b1
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-08-19 20:00:42 +01:00
a90a5f52dd
Show number of connections each bot has established in "show bots" command.
2013-08-19 19:38:20 +01:00
aa7f4215a9
Merge branch 'master' into careminster
2013-08-18 03:00:32 +01:00
3585b0a139
Allow updating the wearable type of wearables that have a type of 0.
...
This will allow viewers to fix broken wearables as they detect them.
2013-08-18 02:59:10 +01:00
bef03fb30b
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
OpenSim/Services/Connectors/Neighbour/NeighbourServicesConnector.cs
2013-08-17 03:23:45 +01:00
85a9cb260a
Remove mono compiler warnings from UserProfilesModule
2013-08-17 01:10:58 +01:00
d75f00cc2d
minor: remove mono compiler warning from AttachmentsModule
2013-08-17 01:09:31 +01:00
b3052c425e
Remove some mono compiler warnings from OpenSim/Server/Handlers
2013-08-17 01:08:19 +01:00
f5dbfe99b1
minor: remove mono compiler warnings from OpenSim/Services/Connectors/SimianGrid
2013-08-17 01:06:48 +01:00
d38d5ecbac
minor: remove mono compiler warnings from ScenePresence
2013-08-17 01:00:20 +01:00
77d418a36d
remove mono compiler warnings from PollServiceRequestManager
2013-08-17 00:56:19 +01:00
217c8deae5
minor: remove mono compiler warning in StatsManager
2013-08-17 00:51:21 +01:00
1f1736a79f
minor: Make log messages consistent in NeighbourServicesConnector
2013-08-17 00:46:18 +01:00
14ae89dbe7
Fix issues with RemoteAdmin admin_save_heightmap and admin_load_heightmap not working.
...
This is because they were wrongly looking for both regionid and region_id parameters in the same request.
Now only region_id is required (and recognized), regionid having been already deprecated for some time.
This is essentially Michelle Argus' patch from http://opensimulator.org/mantis/view.php?id=6737 but with tabs replaced with spaces.
Thanks!
2013-08-17 00:39:41 +01:00
f5d3145bea
Add ScenePresenceTeleportTests.TestSameSimulatorIsolatedRegionsV2() regression test for v2 transfers.
...
Also adjusts names of teleport setup helpers in EntityTransferHelpers
2013-08-17 00:24:56 +01:00
fbab898f74
Add TestSameSimulatorNeighbouringRegionsV2() regression test for v2 entity transfer protocl
2013-08-16 23:52:55 +01:00
1624522761
refactor: Make AttachmentModulesTests.TestSameSimulatorNeighbouringRegionsTeleportV2 use already available TestClient handle rather than retrieving it via the ScenePresence
2013-08-16 23:45:04 +01:00
7d268912f1
Packet headers are not zero-encoded so don't try to zero-decode these in PacketPool.GetType()
...
Instead adjusts code with that from Packet.BuildHeader(byte[], ref int, ref int):Header in libomv
This stops packet decoding failures with agent UUIDs that contain 00 in their earlier parts (e.g. b0b0b0b0-0000-0000-0000-000000000211)
Thanks to lkalif for pointing this out.
2013-08-16 00:58:25 +01:00
7c916ab91c
Try to make "slow down" message that one could receive on rapid teleporting more informative to the user.
...
This message is seen on V2 if one attempts to quickly re-teleport from a source region where one had previously teleported to a non-neighbour and back within 15 secs.
The solution here is for the user to wait a short while.
This message can also be seen on any teleport protocol if one recieves multiple teleport attempts simultaneously. Probably still useful here to help identify misbehaving scripts.
2013-08-15 14:51:54 +01:00
3ddb7438d7
Move DoNotCloseAfterTeleport flag reset before UpdateAgent in V2 to avoid a low probability where the destination re-establishing the child connection before the flag was reset
2013-08-15 14:41:00 +01:00
3f8d79024b
Rely on the Scene.IncomingCloseAgent() check as to whether the connection should be kept open after teleport-end rather than doing this in the ET Module
...
This is safer since the close check in IncomingCloseAgent() is done under lock conditions, which prevents a race between ETM and Scene.AddClient()
2013-08-15 14:07:57 +01:00
2231fcf5b4
Do not use the SP.DoNotCloseAfterTeleport flag for child agent connections.
...
This approach has problems if a client quits without sending a proper logout but then reconnects before the connection is closed due to inactivity.
In this case, the DoNotCloseAfterTeleport was wrongly set.
The simplest approach is to close child agents on teleport as quickly as possible so that races are very unlikely to occur
Hence, this code now closes child agents as the first action after a sucessful teleport.
2013-08-15 13:46:46 +01:00
5011c657b5
Actually implement the bot request object textures switch started in 225cf0d.
...
Forgot to propogate it down to bot level.
2013-08-14 23:37:07 +01:00
104626d732
minor: Comment out AvatarPicketSearch caps log message for now, which is occuring on every login and entity transfer
2013-08-14 23:22:52 +01:00
73e3ca670d
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-08-14 23:21:51 +01:00
60cc9e9a3c
minor: remove unused entity transfer config in teleport v2 attachments test
2013-08-14 23:21:18 +01:00
e8b1e91a1d
BulletSim: include check for volume detect in check for zeroing avatar motion.
...
Normally, avatar motion is zeroed if colliding with a stationary object so
they don't slide down hills and such. Without volume detect check this also
allowed avatars to stand on volume detect objects and to have some jiggling
when they were in the volume detect object. This commit fixes both.
2013-08-14 14:49:24 -07:00
7c3b71d294
BulletSim: add physical object initialized flag so updates and collisions
...
don't happen until the object is completely initialized.
This fixes the problem of doing a teleport while the simulator is running.
The destruction of the physical object while the engine is running means
that the physics parameter update would overwrite the new position of the
newly created avatar.
2013-08-14 14:49:22 -07:00
93dffe1777
Add stat clientstack.<scene>.IncomingPacketsOrphanedCount to record well-formed packets that were not initial connection packets and could not be associated with a connected viewer.
2013-08-14 22:33:12 +01:00
0d5680e971
Count any incoming packet that could not be recognized as an LLUDP packet as a malformed packet. Record this as stat clientstack.<scene>.IncomingPacketsMalformedCount
...
Used to detect if a simulator is receiving significant junk UDP
Decimates the number of packets between which a warning is logged and prints the IP source of the last malformed packet when logging
2013-08-14 22:08:28 +01:00
df7a1e68f6
Merge branch 'master' into careminster
2013-08-14 21:25:22 +01:00
2c67aa0f41
If pCampbot has been asked to shutdown, don't carry on logging in queued bots
2013-08-14 21:08:00 +01:00
225cf0d010
Add pCampbot RequestObjectTextures ini setting to control whether textures are requested for received objects.
2013-08-14 19:53:10 +01:00
fd519748e9
Add method doc to Scene.RemoveClient() to ask any callers to use Scene.IncomingCloseAgent() instead.
...
IncomingCloseAgent() now sets the scene presence state machine properly, which is necessary to avoid races between multiple sources of close.
Hence, it's also necessary for everyone to consistently call IncomingCloseAgent()
Calling RemoveClient() directly is currently generating an attention-grabbing exception though this right now this is harmless.
2013-08-14 19:36:52 +01:00
97c514daa5
Shutdown a bot's actions by making it check for disconnecting state rather than aborting the thread.
...
Aborting the thread appears to be causing shutdown issues.
2013-08-14 19:21:07 +01:00
3a62f39044
Add a -form switch to pCampbot to allow one to login a sequence of bots starting from numbers other than 0
2013-08-14 18:26:11 +01:00
2146b20169
Add the ability to explicitly specify a login start location to pCampbot via the -start parameter
2013-08-14 16:51:51 +01:00
0feb5da31e
BulletSim: move the creation of the avatar movement actor creating to
...
taint time. Attempt to fix a problem of teleporting within the same
region where the remove and addition of the physical avatar occasionally
ends up with a non-moving avatar.
2013-08-13 21:06:24 -07:00
5933f9448d
Add a SendAgentUpdates setting to a new pCampbot.ini.example file which can control whether bots send agent updates
...
pCampbot.ini.example is used by copying to pCampbot.ini, like other ini files
2013-08-13 23:54:50 +01:00
4a6eff1ee8
Merge branch 'master' into careminster
2013-08-13 22:53:47 +01:00
e311f902ff
minor: Eliminate one of the duplicate 'have's in the HG message telling the user if no GroupsServerURI has been given in user data by the home grid
2013-08-13 20:13:12 +01:00
a90351cd2c
Remove exception when printing error for failure removing script state.
2013-08-13 11:49:09 -07:00
4f8c691f8c
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-08-12 22:57:32 +01:00
c49ea491a3
Make show bots pCampbot console command print connected, connecting, etc. bot totals at end.
2013-08-12 22:49:17 +01:00
2c31fe4614
BulletSim: add check in avatar stair step code to verify the collision
...
is not with a volume detect object.
This fixes a problem of avatars trying to step over a volume detect object
that they collide with. This appeared as the avatar popping up as it started
to step up but then continuing on since the object wasn't physically interacting.
2013-08-12 13:44:53 -07:00
377fe63c60
Don't try and send group updates to NPCs via event queue, since NPCs have no event queue.
...
I think there is an argument for sending this information to NPCs anyway since in some cases it appears a lot easier to write server-side bots by hooking into such internal events.
However, would need to stop event messages building up on NPC queues if they are never retrieved.
2013-08-12 21:02:50 +01:00
f3edc0d8b7
minor: Extend warning message when adding trying to add an event for a client without a queue to include the event message name.
2013-08-12 19:38:23 +01:00
de6ad380f6
Get rid of issue where removing NPCs would through an exception by routing close through Scene.IncomingCloseAgent() and NPCAvatar.Close() rather than directly to Scene.RemoveClient().
...
This exception was actually harmless since it occurred at the very last stage of the remove client process.
2013-08-12 19:31:45 +01:00
e5b1688913
Add none behaviour to pCampbot when one wants bots to just stand around
2013-08-12 18:48:18 +01:00
b64d3ecaed
Create TestSameSimulatorNeighbouringRegionsTeleportV2() regression test for V2 transfer protocol.
2013-08-12 18:15:12 +01:00
ad1b2902f2
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Application/OpenSimBase.cs
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2013-08-11 17:31:25 +01:00
216f5afe54
Stats treaking. Update ToOSDMap for Stat and PercentageStat to return
...
all the various numbers that have been added to the console output.
Break out EventHistogram from CounterStat.
2013-08-10 09:09:52 -07:00
23ca1f859e
minor: Consistently log IOCP for IO completion thread startup log information instead of mixing this with "IO Completion Threads"
2013-08-09 18:27:26 +01:00
bfdcdbb2f3
Increase wait for source region to sent UpdateAgent to 10 seconds instead of 4.
...
This is giving much better results on teleports between simulators over my lan where for some reason there is a pause before the receiving simulator processes UpdateAgent()
At this point, v2 teleports between neighbour and non-neighbour regions on a single simulator and between v2 simulators and between a v1 and v2 simulator
are working okay for me in different scenarios (e.g. simple teleport, teleport back to original quickly and re-teleport, teleport back to neighbour and re-teleport. etc.)
2013-08-09 17:59:58 +01:00
aec7019728
Add missing file from b1c26a56
2013-08-09 17:57:24 +01:00
97bcb59bee
Merge branch 'TeleportWork'
2013-08-09 17:52:29 +01:00
6fcbf219da
Comment back out seed dump code enabled in b1c26a56. Also adds a few teleport comments.
2013-08-09 17:48:35 +01:00
2cdcf62b48
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-08-09 08:31:30 -07:00
7e01213bf2
Go easy on enforcing session ids in position updates
2013-08-09 08:31:15 -07:00
99bce9d877
Fix an issue with an A->C->B->A teleport where these regions are in a row (A,B,C) where the A root agent is still closed, terminating the connection.
...
This was occuring because teleport to B did not set DoNotCloseAfterTeleport on A as it was a neighbour (where it isn't set to avoid the issue where the source region doesn't send Close() to regions that are still neighbours (hence not resetting DoNotCloseAfterTeleport).
Fix here is to still set DoNotCloseAfterTeleport if scene presence is still registered as in transit from A
2013-08-09 00:24:22 +01:00
b1c26a56b3
Fix an issue where under teleport v2 protocol, teleporting from regions in an line from A->B->C would not close region A when reaching C
...
The root cause was that v2 was only closing neighbour agents if the root connection also needed a close.
However, fixing this requires the neighbour regions also detect when they should not close due to re-teleports re-establishing the child connection.
This involves restructuring the code to introduce a scene presence state machine that can serialize the different add and remove client calls that are now possible with the late close of the
This commit appears to fix these issues and improve teleport, but still has holes on at least quick reteleporting (and possibly occasionally on ordinary teleports).
Also, has not been completely tested yet in scenarios where regions are running on different simulators
2013-08-08 23:29:30 +01:00
6410a25cef
BulletSim: adjust avatar position when the avatar's size is changed.
...
This fixes the problem of avatars bouncing when logged in.
Added a little height to the avatar height fudges to eliminate a problem
of feet being in the ground a bit.
2013-08-08 13:55:17 -07:00
9fc97cbbf7
Make m_originRegionID in ScenePresence public to allow DSG module to work for now. Once the code churn on teleport ends, I can find a better solution
2013-08-08 12:44:03 -07:00
d9bd6e6b5b
Add parameter and explanation of ManagedStats return to OpenSimDefaults.ini.
...
Add 'callback' query parameter to managed stats return to return function
form of JSON data.
2013-08-08 09:45:30 -07:00
c67c55e0fc
Better error reporting when registering LSL function extensions (comms module).
...
For unknown reasons, a dynamic function signature cannot have more than 5
parameters. Error message now tells you this fact so you can curse MS and
then go change your function definitions.
2013-08-08 09:45:16 -07:00
50c163ae6c
Add a JSON web fetch of the statististics managed by StatsManager.
...
Disabled by default. Enable by setting
[Startup]ManagedStatsRemoteFetchURI="Something"
and thereafter "http://ServerHTTPPort/Something/ " will return all the managed
stats (equivilent to "show stats all" console command).
Accepts queries "cat=", "cont=" and "stat=" to specify statistic category,
container and statistic names. The special name "all" is the default and returns
all values in that group.
2013-08-08 09:45:01 -07:00
4e86674a3a
* Added set water height <height> [<x>] [<y>] console command following the set terrain heights console command as an example.
2013-08-07 23:33:23 -05:00
99a4a91488
* This makes in-world terrain editing smoother, even in MegaRegions. This change only affects the editing user's experience. Non-editing users will see nothing different from the current 'slow' result. See comments for the thought process and how the issues surrounding terrain editing, cache, bandwidth, threading, terrain patch reliability and throttling were balanced.
2013-08-07 21:22:04 -05:00
ce1361f2fe
minor: Remove console lines at bottom of FakeParcelIDTests() regression test that were accidentally left in
2013-08-08 01:07:30 +01:00
64216b34a4
Fixed error in BuildFakeParcelID() which was detected by regression tests.
2013-08-08 01:02:04 +01:00
43da879ea2
Added regression tests for the routines related to fake parcel IDs.
2013-08-08 00:59:55 +01:00
e4da8d74d8
Additional regression tests for the location routines in Location.cs
2013-08-08 00:56:13 +01:00
638c3d25b0
Remove never implemented stub modules commands (list, load, unload) from back in 2009.
...
"show modules" is the functional console command that will show currently loaded modules.
Addresses http://opensimulator.org/mantis/view.php?id=6730
2013-08-08 00:48:22 +01:00
005c69511d
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
OpenSim/Region/Framework/Scenes/Scene.cs
2013-08-07 23:29:42 +01:00
b10710d4a5
minor: add some method doc to ScenePresence fields used for entity transfer, add minor details to some log messages, rename a misleading local variable name.
...
No functional changes.
2013-08-07 23:17:31 +01:00
a33a1ac958
Add post-CreateAgent teleport cancellation/abortion functionality from v1 transfer protocol into v2.
...
This stops OpenSimulator still trying to teleport the user if they hit cancel on the teleport screen or closed the viewer whilst the protocol was trying to create an agent on the remote region.
Ideally, the code may also attempt to tell the destination simulator that the agent should be removed (accounting for issues where the destination was not responding in the first place, etc.)
2013-08-07 18:52:30 +01:00
6b9a65972c
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-08-07 08:02:36 -07:00
3194ffdab8
Fixed incomplete commit r/23317 -- see_into_region. Put the guard around estate bans also, and delete the obsolete config var.
2013-08-07 08:01:59 -07:00
d6d5d4ebd0
Add file missing from last commit 4c2f6de
2013-08-06 18:32:16 +01:00
4c2f6de8e4
Add the experimental ability to dump stats (result of command "show stats all") to file OpenSimStats.log every 5 seconds.
...
This can currently only be activated with the console command "debug stats record start".
Off by default.
Records to file OpenSimStats.log for simulator and RobustStats.log for ROBUST
2013-08-06 18:29:33 +01:00
ac198068ab
Add "debug threadpool status" console command to show min/max/current worker/iocp threadpool numbers
2013-08-06 00:00:12 +01:00
4581bdd929
Add "debug comms status" command to show current debug comms settings
2013-08-05 23:49:33 +01:00
9bcf072795
Make it possible to switch whether we serialize osd requests per endpoint or not, either via config (SerializeOSDRequests in [Network]) or via the "debug comms set" console command.
...
For debug purposes to assess what impact this has on network response in a heavy test environment.
2013-08-05 23:44:48 +01:00
f9dc5815c4
For LLImageManagerTests, make tests execute under synchronous fire and forget conditions.
...
I generally prefer this approach for regression tests because of the complexity of accounting for different threading conditions.
2013-08-05 23:15:30 +01:00
139dcf1246
minor: move "threads abort" and "force gc" console commands into debug category - these are not things one needs to do in normal operation
2013-08-05 23:06:17 +01:00
76e778fe2c
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-08-05 23:05:12 +01:00
160659f683
Make it possible to set worker/iocp min/max threadpool limits on the fly with the console command "debug threadpool set"
2013-08-05 23:04:36 +01:00
2d3ac2b1ec
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-08-05 14:21:39 -07:00
946b370966
Child agent updates: remove the dependency on the root agent's camera position. That was a complete overkill that is unnecessary at this point.
2013-08-05 14:21:17 -07:00
24dcf3cf6a
Comment out debug log lines about script modules comms for now.
...
If this is an issue, could change log4net config instead to allow re-enablement
2013-08-05 20:51:40 +01:00
b8612e005a
At OpenSimulator startup, print out default min built-in threadpool threads as well as max.
...
Make it clear that we only try to adjust max, and log at warn level if this fails.
Other minor logging cleanup.
2013-08-05 20:47:47 +01:00
151a8ca0cc
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-08-05 20:37:27 +01:00
7f0d9ad644
Make test AssetsClient print out more information about any failure to set thread numbers and immediate post config thread numbers
2013-08-05 20:36:46 +01:00
03698121ed
Remove some debugging from simian connectors.
2013-08-05 12:34:53 -07:00
976514d39a
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-08-05 19:25:51 +01:00
76bd3de2fd
Add checks monitoring framework to provide alerts if certain conditions do not hold.
...
Not yet in use.
2013-08-05 19:22:47 +01:00
05012bb0df
Group notices bug fix: use a new IM for each member of the group, otherwise the fields get messed up because the transfer is async
2013-08-05 08:09:30 -07:00
5b4b349776
Fix the failing TestSendImage. J2K decoding is async.
2013-08-03 21:27:32 -07:00
09cb2a37dd
More on HG inventory and OutboundPermission: disallowing giving inventory to foreigners if OutboundPermission is false
2013-08-03 20:36:30 -07:00
dcfeb95e98
HG: If OutboundPermission is set to false, let's enforce stricter permissions by not allowing objects to be taken to inventory.
2013-08-03 20:13:44 -07:00
b857353fc9
Making the J2KDecoderModule decoder function async. Could this be the cause of sim freeze? -- HandleRequestImage in LLClientView is now sync, which means that it cannot take too long to complete. However, its execution path may end up in J2KDecoderModule.Decode, which is heavy and could stop the packet processing thread while it's at it.
2013-08-03 15:42:25 -07:00
847c01f406
Amend Justin's last commit regarding the new config var ServiceVersion. The section may not exist at all.
2013-08-02 17:38:08 -07:00
fdfc951744
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-08-02 17:00:34 -07:00
5198df3aa0
Issue: 10 simultaneous TPs, many not making it. Now bypassing the per-url lock -- we should be "ok" (or, more "ok") now that we have increased the connection limit on the http library. But this is a sensitive part of the code, so it may need reverting.
2013-08-02 17:00:18 -07:00
4ff3757f86
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-08-02 23:17:20 +01:00
54b1071556
Allow older teleport ConnectorProtocolVersion of "SIMULATION/0.1" to be manually forced in a new [SimulationService] config setting.
...
This is for testing and debugging purposes to help determine whether a particular issue may be teleport related or not
"SIMULATION/0.2" (the newer teleport protocol) remains the default. If the source simulator only implements "SIMULATION/0.1" this will correctly allow fallback to the older protocol.
Specifying "SIMULATION/0.1" will force the older, less efficient protocol to always be used.
2013-08-02 23:12:54 +01:00
5bdfd55ace
BulletSim: When converting linkset types, don't try to change the list
...
of linkset children while iterating through the list.
2013-08-02 10:32:43 -07:00
24df15dab7
BulletSim: add implementation of 'physSetLinksetType' and 'physGetLinksetType'
...
and processing routines in BulletSim.
Add linkset rebuild/conversion routine in BSLinkset.
2013-08-02 09:47:12 -07:00
5bcccfc305
BulletSim: add BSLinkInfo structure to remember link specific information
...
for each link in a linkset.
Extend BSLinksetConstraint to create and use BSLinkInfo with the default
static constraint.
2013-08-02 09:47:11 -07:00
87ee0c395e
Fix problem with modInvoke defined integer constants being build into
...
scripts as boxed integers rather than proper reference to a new LSLInteger.
This fixes an exception when using a registered integer constant in
a script.
2013-08-02 09:44:01 -07:00
07e4958b19
Turn off edit beams when object is derezed while being edited. (mantis #6722 )
2013-08-01 20:40:13 -07:00
d4c506e453
minor: replace veclist.Add(new Vector3(0,0,0)) with Vector3.Zero in InventoryAccessModules.RezObject() - structs are passed by value
2013-08-02 00:08:14 +01:00
598f63e984
Make atachment state load work again
2013-08-02 00:06:39 +01:00
c9695a0a59
Move experimental attachments throttling further down the chain so that multiple attachments changes (e.g. change outfit) are also throttled
2013-08-02 00:00:00 +01:00
6fc03c7e6e
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
2013-08-01 23:42:19 +01:00
7a5d11f8a7
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-08-01 23:17:21 +01:00
68b98a8003
minor: Add name to debug lludp packet level feedback on console
2013-08-01 23:16:41 +01:00
7b9a50721d
* Thanks Plugh for pointing out that the constructor that takes a ulong regionhandle and saves it to to X,Y vars in the OpenSim.Framework.Location object was inverting the X and Y resulting in X and Y confusion. The test also used 256x256 in the uint,uint constructor so it was unable to determine if the X and Y components swapped. I don't expect much upheaval from this commit, not a lot of features were using the ulong Location object constructor. The database never stores the ulong regionhandle... the prims are loaded by region Guid. LLUDPServer used it to determine regions that it handled in a service definition where there was simply a X == X test which has the same logical result un-switched as it did switched. Again, thanks LibOMV for the regionhandle code.
2013-08-01 16:32:36 -05:00
bdc48e3e0f
Make attachment state load work again
2013-08-01 23:30:32 +02:00
216e785ca9
Add experimental "debug attachments throttle <ms>" setting (command line) and ThrottlePer100PrimsRezzed in [Attachments] in config
...
This is an experimental setting to control cpu spikes when an attachment heavy avatar logs in or avatars with medium attachments lgoin simultaneously.
It inserts a ms sleep specified in terms of attachments prims after each rez when an avatar logs in.
Default is 0 (no throttling).
"debug attachments <level>" changes to "debug attachments log <level>" which controls logging. A logging level of 1 will show the throttling performed if applicable.
Also adds "debug attachments status" command to show current throttle and debug logging levels.
2013-08-01 21:16:53 +01:00
0c4c084bed
Try a different approach to slow terrain update by always cycling the loop immediately if any data was sent, rather than waiting.
...
What I believe is happening is that on initial terrain send, this is done one packet at a time.
With WaitOne, the outbound loop has enough time to loop and wait again after the first packet before the second, leading to a slower send.
This approach instead does not wait if a packet was just sent but instead loops again, which appears to lead to a quicker send without losing the cpu benefit of not continually looping when there is no outbound data.
2013-08-01 18:12:28 +01:00
932c382737
Revert "Issue: painfully slow terrain loading. The cause is commit d9d995914c (r/23185) -- the WaitOne on the UDPServer. Putting it back to how it was done solves the issue. But this may impact CPU usage, so I'm pushing it to test if it does."
...
This reverts commit 59b461ac0e
2013-08-01 18:11:50 +01:00
59b461ac0e
Issue: painfully slow terrain loading. The cause is commit d9d995914c (r/23185) -- the WaitOne on the UDPServer. Putting it back to how it was done solves the issue. But this may impact CPU usage, so I'm pushing it to test if it does.
2013-08-01 09:27:44 -07:00
21f5e67030
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
2013-08-01 01:23:24 +01:00
1299592405
Experimental comment to eneralize the handling of Linden caps when the
...
cap is something other than "localhost". A new interface for handling
external caps is supported with an example implemented for Simian. The
only linden cap supporting this interface right now is the GetTexture
cap.
2013-07-31 15:37:15 -07:00
48ee440983
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-07-31 11:31:03 -07:00
64f2dc778a
A pretty major restructuring of the simian method invocations in order to
...
service access capabilities. In conjunction with the corresponding Simian
updates, this enables explicit per-simulator capability-based access to
grid services. That enables grid owners to add or revoke access to the grid
on a simulator by simulator basis.
2013-07-31 11:27:35 -07:00
ac2ad9690d
HGWorldMapModule: unregister event on RemoveRegion
2013-07-31 11:20:27 -07:00
87fcff9fc3
HGWorldMapModule: check whether it's enabled or not.
2013-07-31 11:13:55 -07:00
3c540f0d33
Avoid another null ref opportunity.
2013-07-30 22:07:33 -07:00
e4ecbc2b10
Fix null ref.
2013-07-30 21:38:41 -07:00
fd050fca7c
Doing the HG Map / SimulatorFeatures "the right way": moved it to HGMapModule, hooking on to SimulatorFeatures.OnSimulatorFeaturesRequest event (similar to what the DynamicMenuModule does).
...
Only HG Visitors get this var, to avoid spamming local users.
The config var is now called MapTileURL, to be consistent with the login one, and its being picked up from either [LoginService], [HGWorldMap] or [SimulatorFeatures], just because I have a bad memory.
2013-07-30 21:10:00 -07:00
590a8b0315
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-07-30 17:27:32 -07:00
2b54199271
After talking to lkalif on the IRC: SimulatorFeatures response: renamed the OSDMap GridServices to OpenSimExtras, normalized the url keys under it, and moved ExportEnabled to under it too. Melanie: change your viewer code accordingly.
...
Documentation at http://opensimulator.org/wiki/SimulatorFeatures_Extras
2013-07-30 17:26:56 -07:00
0d189165a8
BulletSim: distribute vehicle physical settings to all members of
...
a linkset. Enables constraint based linksets.
Rename some internal variables to clarify whether values world or
vehicle relative.
2013-07-30 15:23:33 -07:00
6ad577d32b
BulletSim: test method for debugging of extended physics script operations.
2013-07-30 15:22:32 -07:00
5a7784a0e6
BulletSim: make density display and return value consistant with how
...
the simulator expects it (scaled to 100kg/m^3).
2013-07-30 07:22:43 -07:00
1416c90932
minor: Add timeout secs to connection timeout message. Change message to reflect it is a timeout due to no data received rather than an ack issue.
2013-07-29 23:53:59 +01:00
8004e6f31c
Fix issue just introduced in 8efe4bfc2e where I accidentally left in a test line to force very quick client unack
2013-07-29 23:38:54 +01:00
8efe4bfc2e
Make "abnormal thread terminations" into "ClientLogoutsDueToNoReceives" and add this to the StatsManager
...
This reflects the actual use of this stat - it hasn't recorded general exceptions for some time.
Make the sim extra stats collector draw the data from the stats manager rather than maintaing this data itself.
2013-07-29 23:18:29 +01:00
7eee9eb312
Groups: Better warning messages to the user.
2013-07-28 20:47:15 -07:00
1b94de8e58
Group chat: prevent a situation where dupe IMs could occur.
2013-07-28 19:31:17 -07:00
1d4bf06fe7
Group chat: guard against duplicate sends
2013-07-28 18:49:10 -07:00
33b54807a1
Changing the visibility test in groups service to be UUID.Zero.ToString() instead of "all" because some paths in the code assume there's a UUI in the RequestingAgent string.
2013-07-28 18:08:50 -07:00
bf283208df
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
OpenSim/Region/Framework/Scenes/Scene.cs
2013-07-29 02:08:05 +01:00
468ddd2373
Same issue.
2013-07-28 17:12:14 -07:00
c442ef346e
Same issue as previous commit.
2013-07-28 16:44:31 -07:00
698b2135ee
Fix an issue where HG members of groups weren't seeing the entire membership for group chat.
2013-07-28 15:59:24 -07:00
63f6c8f27c
Removed commented lines and useless debug message
2013-07-28 13:53:47 -07:00
7b0b5c9d97
Added BasicSearchModule.cs which handles OnDirFindQuery events. Removed that handler from both Groups modules in core, and replaced them with an operation on IGroupsModule.
2013-07-28 13:49:58 -07:00
6be614ba84
This makes people search work.
2013-07-28 09:54:34 -07:00
170a6f0563
This makes group search work (Groups V2).
2013-07-28 09:00:28 -07:00
8dff05a897
More on group chat: only root agents should subscribe to OnInstantMessage, or else they'll see an echo of their own messages after teleporting.
2013-07-27 20:30:00 -07:00
18eca40af3
More bug fixes on group chat
2013-07-27 19:12:47 -07:00
69975763d2
Several major improvements to group (V2) chat. Specifically: handle join/drop appropriately, invitechatboxes.
...
The major departure from flotsam is to send only one message per destination region, as opposed to one message per group member. This reduces messaging considerably in large groups that have clusters of members in certain regions.
2013-07-27 15:38:56 -07:00
3dac92f345
Increased the rate of the PollServiceRequestManager to 0.5 secs (it was 1sec). Group chat is going over the EQ... Hopefully this won't increase CPU when there's nothing going on, but we need to watch for that.
2013-07-26 21:40:04 -07:00
85428c49bb
Trying to decrease the lag on group chat. (Groups V2 only)
2013-07-26 21:27:00 -07:00
428916a64d
Commented out ChatSessionRequest capability in Vivox and Freeswitch. We aren't processing it in any meaningful way, and it seems to get invoked everytime someone types a message in group chat.
2013-07-26 21:14:21 -07:00
ba9daf849e
Fix regression from 056a6ee7 because the RemoteSimulationConnector uses a copy of the LocalSimulationConnector but never initializes it (hence ServiceVersion was never set)
2013-07-26 22:52:08 +01:00
840be97e40
Fix failure in TestCreateDuplicateRootScenePresence().
...
This is a test setup failure since code paths when adding a duplicate root scene presence now require the EntityTransferModule to be present.
Test fixed by adding this module to test setup
2013-07-26 20:52:30 +01:00
c245365484
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-07-26 19:23:12 +01:00
056a6ee765
Fix regression tests relating to agent transfer by making simulator use last week's SIMULATOR/0.1 protocol for now.
2013-07-26 19:22:30 +01:00
d27cc62458
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-07-26 14:13:02 -04:00
ad2ebd2f3d
Force map tiler to save Water.jpg as an actual jpeg format it seems even though we specified jpg extention it was actually a png and thus confusing the viewer silently.
2013-07-26 14:11:42 -04:00
a08f01fa83
Fix NPC regression test failures.
...
These were genuine failures caused by ScenePresence.CompleteMovement() waiting for an UpdateAgent from NPC introduction that would never come.
Instead, we do not wait if the agent is an NPC.
2013-07-26 18:43:15 +01:00
dd2c211e62
Comment debug message
2013-07-26 07:40:55 -07:00
d5367a219d
Slight improvement: no need to delay the removal of the queues in EQ, because DisableSimulator is now being sent via UDP
2013-07-26 07:39:57 -07:00
878ce1e6b2
This should fix all issues with teleports. One should be able to TP as fast as needed. (Although sometimes Justin's state machine kicks in and doesn't let you) The EventQueues are a hairy mess, and it's very easy to mess things up. But it looks like this commit makes them work right. Here's what's going on:
...
- Child and root agents are only closed after 15 sec, maybe
- If the user comes back, they aren't closed, and everything is reused
- On the receiving side, clients and scene presences are reused if they already exist
- Caps are always recreated (this is where I spent most of my time!). It turns out that, because the agents carry the seeds around, the seed gets the same URL, except for the root agent coming back to a far away region, which gets a new seed (because we don't know what was its seed in the departing region, and we can't send it back to the client when the agent returns there).
2013-07-25 23:44:58 -07:00
4cd03d8c31
Return Simulator/0.1 (V1) entity transfer behaviour to waiting only 2 seconds before closing root agent after 15.
...
This is because a returning viewer by teleport before 15 seconds are up will be disrupted by the close.
The 2 second delay is within the scope where a normal viewer would not allow a teleport back anyway.
Simulator/0.2 (V2) protocol will continue with the longer delay since this is actually the behaviour viewers get from the ll grid
and an early close causes other issues (avatar being sent to infinite locations temporarily, etc.)
2013-07-26 01:40:56 +01:00
72ed49af5f
Reset DoNotClose scene presence teleport flag before pausing. Rename DoNotClose to DoNotCloseAfterTeleport
2013-07-26 01:38:04 +01:00
1fabdcc43c
If a returning teleport starts to reuse a downgraded child connection that was a previous root agent, do not close that child agent at the end of the 15 sec teleport timer.
...
This prevents an issue if the user teleports back to the neighbour simulator of a source before 15 seconds have elapsed.
This more closely emulates observed linden behaviour, though the timeout there is 50 secs and applies to all the pre-teleport agents.
Currently sticks a DoNotClose flag on ScenePresence though this may be temporary as possibly it could be incorporated into the ETM state machine
2013-07-26 01:04:16 +01:00
7914eaa357
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
bin/OpenSimDefaults.ini
2013-07-25 16:55:23 +01:00
20b989e048
Increased the wait time to 15 secs. In a 0.7.5 standalone where the effect was always present, this seems to have fixed it.
2013-07-24 17:10:26 -07:00
cac37e298c
Deleted all [ZZZ] debug messages.
2013-07-24 14:31:30 -07:00
f0320f5652
The previous commit did fix the infinity problem! I'm putting the same time on TP_V1 and adding a big red warning on top of those lines.
2013-07-24 14:31:18 -07:00
46d017b197
Today's wild shot at the infinity problem. Wait on the child agent left behind.
2013-07-24 14:31:03 -07:00
4e5c7bdeb3
Moved TriggerOnMakeRootAgent back to the end of MakeRootAgent, to see if that eliminates the temporary placement at infinity upon TPs
2013-07-24 14:30:13 -07:00
e6a0f6e428
One more thing to test in order to let CompleteMovement go up the stack.
2013-07-24 14:29:51 -07:00
14530b2607
Minor adjustment on timings of waits.
2013-07-24 14:29:37 -07:00
c0433d5e4c
Changed the RegionHandshake packet to the Unknown queue, so that it is sent with high priority and hopefully gets to the client before AgentMovementComplete
2013-07-24 14:29:15 -07:00
879cbb4575
This commit message intentionally left blank (last commit was idiotic)
2013-07-24 14:28:55 -07:00
261512606d
Improve the opening test in CompleteMovement, to account for multiple flags besides ViaLogin.
2013-07-24 14:28:41 -07:00
d7984ef775
More on putting TP V1 as it was
2013-07-24 14:28:27 -07:00
aaee63af82
Minor improvements on TP V1 trying to make it exactly as it was before.
2013-07-24 14:28:14 -07:00
3891a8946b
New Teleport protocol (V2), still compatible with V1 and older. (version of the destination is being checked)
...
In this new protocol, and as committed before, the viewer is not sent EnableSimulator/EstablishChildCommunication for the destination. Instead, it is sent TeleportFinish directly. TeleportFinish, in turn, makes the viewer send a UserCircuitCode packet followed by CompleteMovementIntoRegion packet. These 2 packets tend to occur one after the other almost immediately to the point that when CMIR arrives the client is not even connected yet and that packet is ignored (there might have been some race conditions here before); then the viewer sends CMIR again within 5-8 secs. But the delay between them may be higher in busier regions, which may lead to race conditions.
This commit improves the process so there are are no race conditions at the destination. CompleteMovement (triggered by the viewer) waits until Update has been sent from the origin. Update, in turn, waits until there is a *root* scene presence -- so making sure CompleteMovement has run MakeRoot. In other words, there are two threadlets at the destination, one from the viewer and one from the origin region, waiting for each other to do the right thing. That makes it safe to close the agent at the origin upon return of the Update call without having to wait for callback, because we are absolutely sure that the viewer knows it is in th new region.
Note also that in the V1 protocol, the destination was getting UseCircuitCode from the viewer twice -- once on EstablishAgentCommunication and then again on TeleportFinish. The second UCC was being ignored, but it shows how we were not following the expected steps...
2013-07-24 14:27:58 -07:00
aae29c0ee2
Further tweaks on TPs: not sending the callback URL and instead waiting 15sec before closing the agent. This seems to be working fairly well. The viewer seems to have an 8 sec delay between UseCircuitCode and CompleteMovement.
...
Also added back the position on UpdateAgent, because it's needed for TPing between neighboring regions.
2013-07-24 14:27:37 -07:00
9ab78d412c
EXPERIMENTAL: yet another variation of ES/EAC/TPFinish
2013-07-24 14:27:22 -07:00
00d4a26eef
Amend previous commit.
2013-07-24 12:49:30 -07:00
665fb66686
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-07-24 11:26:30 -07:00
e103e34f1d
Added config var that we all thought was already there: see_into_region. (Note: different from the defunct see_into_neighboring_sim, which used to control the process from the other end). This enables child agents in neighbors for which the root agent doesn't have permission to be in.
2013-07-24 11:25:41 -07:00
d8a6eb5641
Decreased the time of group cache to 1 min, because it was getting on my nerves that it takes so long to let go of old info.
2013-07-24 11:25:24 -07:00
e82d4154a2
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
OpenSim/Region/Physics/Manager/PhysicsActor.cs
OpenSim/Region/Physics/Manager/PhysicsScene.cs
2013-07-24 04:45:07 +01:00
a7eb1b5b85
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs
OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
2013-07-24 03:50:09 +01:00
feef9d64a4
For unknown user issue, bump GUN7 to GUN8 and UMMAU3 to UMMAU4 to assess what looks like a very significant reducing in GUN occurrances
2013-07-23 23:42:34 +01:00
fa2653c8e1
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-07-23 23:32:24 +01:00
9a4a513b5e
Correct issue where the last instance of a sampled stat was shown 3x larger than it should have been (though internal use was correct)
2013-07-23 23:31:35 +01:00
516062ae1f
Don't touch the Current Outfit folder also on coming back home
2013-07-23 15:05:32 -07:00
901bdfed40
Restoring landing on prims, which had been affected by the edit beams commit.
2013-07-23 14:31:16 -07:00
744276dd50
In renaming the folders for hypergriding, don't rename the Current Outfit folder. The viewer doesn't like that.
2013-07-23 14:31:03 -07:00
42e52f544d
Improvement of fetching name in groups
2013-07-23 14:30:50 -07:00
7c1eb86c7d
Don't post Link asset types back to the home grid
2013-07-23 14:28:53 -07:00
76e46d0158
Improve spacing between data and units on console stats display
2013-07-23 17:23:16 +01:00
aec8d1e6be
BulletSim: Turn on center-of-mass calculation by default.
...
Reduce object density by factor of 100 to bring physical mass computations
into a range better suited for Bullet.
2013-07-23 09:09:25 -07:00
f499b328c4
Revert "Revert "BulletSim: Add logic to linksets to change physical properties for""
...
Found that the vehicle movement problem was not caused by these physics changes.
This reverts commit 84d0699761
2013-07-23 08:14:20 -07:00
75686e0e49
Revert "Revert "BulletSim: change BSDynamics to expect to be passed a BSPrimLinkable""
...
Found that the vehicle movement problem was not caused by these physics changes.
This reverts commit 7b187deb19
2013-07-23 08:13:56 -07:00
b14156aa63
Revert "Revert "BulletSim: only create vehicle prim actor when vehicles are enabled.""
...
Found that the vehicle movement problem was not caused by these physics changes.
This reverts commit 5f7b2ea81b
2013-07-23 08:13:29 -07:00
aec8852af7
Revert "Revert "BulletSim: move collision processing for linksets from BSPrimLinkable""
...
Found that the vehicle movement problem was not caused by these physics changes.
This reverts commit c45659863d
2013-07-23 08:13:01 -07:00
401c2e2f2e
Revert "Revert "Add experimental stubs for an extension function interface on both""
...
Found that the vehicle movement problem was not caused by these physics changes.
This reverts commit 89857378ce
2013-07-23 08:12:34 -07:00
af9deed135
Revert "Revert "BulletSim: freshen up the code for constraint based linksets.""
...
Found that the vehicle movement problem was not caused by these physics changes.
This reverts commit 44543ebe63
2013-07-23 08:11:21 -07:00
90528c23d9
For stats which can show average change over time, show the last sample as well as the average.
...
This is somewhat cryptic at the moment, need to improve documentation.
2013-07-23 01:13:13 +01:00
a57a472ab8
Add proper method doc and comments to m_dataPresentEvent (from d9d9959)
2013-07-23 00:51:59 +01:00
9fb9da1b6c
Add clientstack.InboxPacketsCount stat. This records the number of packets waiting to be processed at the second stage (after initial UDP processing)
...
If this consistently increases then this is a problem since it means the simulator is receiving more requests than it can distribute to other parts of the code.
2013-07-23 00:35:41 +01:00
60732c96ef
Add clientstack.OutgoingUDPSendsCount stat to show number of outbound UDP packets sent by a region per second
2013-07-23 00:35:34 +01:00
8396f1bd42
Record raw number of UDP receives as clientstack.IncomingUDPReceivesCount
2013-07-23 00:35:23 +01:00
bf517899a7
Add AverageUDPProcessTime stat to try and get a handle on how long we're taking on the initial processing of a UDP packet.
...
If we're not receiving packets with multiple threads (m_asyncPacketHandling) then this is critical since it will limit the number of incoming UDP requests that the region can handle and affects packet loss.
If m_asyncPacketHandling then this is less critical though a long process will increase the scope for threads to race.
This is an experimental stat which may be changed.
2013-07-23 00:35:09 +01:00
e6b6af62dd
Added check for user movement specification before discarding an incoming
...
AgentUpdate packet. This fixes the problem with vehicles not moving forward
after the first up-arrow.
Code to fix a potential exception when using different IClientAPIs.
2013-07-22 15:41:14 -07:00
44543ebe63
Revert "BulletSim: freshen up the code for constraint based linksets."
...
The changes don't seem to be ready for prime time.
This reverts commit 803632f8f3
2013-07-22 12:10:23 -07:00
89857378ce
Revert "Add experimental stubs for an extension function interface on both"
...
The changes don't seem to be ready for prime time.
This reverts commit 13a4a80b38
2013-07-22 12:09:55 -07:00
c45659863d
Revert "BulletSim: move collision processing for linksets from BSPrimLinkable"
...
The changes don't seem to be ready for prime time.
This reverts commit b4c3a791aa
2013-07-22 12:09:17 -07:00
5f7b2ea81b
Revert "BulletSim: only create vehicle prim actor when vehicles are enabled."
...
The changes don't seem to be ready for prime time.
This reverts commit acb7b4a09a
2013-07-22 12:08:49 -07:00
7b187deb19
Revert "BulletSim: change BSDynamics to expect to be passed a BSPrimLinkable"
...
The changes don't seem to be ready for prime time.
This reverts commit d0d654e218
2013-07-22 12:08:25 -07:00
84d0699761
Revert "BulletSim: Add logic to linksets to change physical properties for"
...
The changes don't seem to be ready for prime time.
This reverts commit b44f0e1a00
2013-07-22 12:07:42 -07:00
b44f0e1a00
BulletSim: Add logic to linksets to change physical properties for
...
whole linkset.
Override physical property setting for BSLinksetCompound as there are
not children to the compound spape.
2013-07-22 10:27:24 -07:00
d0d654e218
BulletSim: change BSDynamics to expect to be passed a BSPrimLinkable
...
and start changing the logic to handle the base prim as a complex
object (ie, a linkset).
2013-07-22 10:27:21 -07:00
acb7b4a09a
BulletSim: only create vehicle prim actor when vehicles are enabled.
2013-07-22 10:27:18 -07:00
b4c3a791aa
BulletSim: move collision processing for linksets from BSPrimLinkable
...
into the linkset implementation classes.
Add HasSomeCollision attribute that remembers of any component of
a linkset has a collision.
Update vehicle code (BSDynamic) to use the HasSomeCollision in place of
IsColliding to make constraint based linksets properly notice the ground.
Add linkset functions to change physical attributes of all the members
of a linkset.
2013-07-22 10:27:15 -07:00
13a4a80b38
Add experimental stubs for an extension function interface on both
...
PhysicsScene and PhysicsActor.
2013-07-22 10:27:09 -07:00
803632f8f3
BulletSim: freshen up the code for constraint based linksets.
2013-07-22 10:27:06 -07:00
df63bfafef
Better version of previous commit
2013-07-21 15:42:22 -07:00
f81e289a1b
Add the Current Outfit folder as an available folder in the SuitcaseInventory.
2013-07-21 15:42:05 -07:00
99a727600b
Minor cosmetic changes.
2013-07-21 10:07:35 -07:00
8d18ad2f6f
Minor aesthetic change to make things more clear.
2013-07-21 09:02:56 -07:00
116a449d89
The quaternion delta was a bit to high, now that the head rotation is out of the equation. (head rotation was the problematic one)
2013-07-21 09:01:57 -07:00
b5ab0698d6
EDIT BEAMS!!! They had been missing from OpenSim since ever. Thanks to lkalif for telling me how to route the information. The viewer effect is under the distance filter, so only avatars with cameras < 10m away see the beams.
2013-07-21 09:01:44 -07:00
032c637c10
Filter certain viewer effects depending on distance between the avatar that is generating the effect and the cameras of the observers. In particular, this applies to LookAt (which is really verbose and occurs every time users move the mouse) and Beam (which doesn't occur that often, but that can be extremely noisy (10.sec) when it happens)
2013-07-21 09:01:09 -07:00
3919c80505
A couple of small optimizations over the previous commit
2013-07-21 09:00:57 -07:00
d5a1779465
Manage AgentUpdates more sanely:
...
- The existing event to scene has been split into 2: OnAgentUpdate and OnAgentCameraUpdate, to better reflect the two types of updates that the viewer sends. We can run one without the other, which is what happens when the avie is still but the user is camming around
- Added thresholds (as opposed to equality) to determine whether the update is significant or not. I thin these thresholds are ok, but we can play with them later
- Ignore updates of HeadRotation, which were problematic and aren't being used up stream
2013-07-21 09:00:42 -07:00
174105ad02
Fixed the stats in show client stats. Also left some comments with observations about AgentUpdates.
2013-07-21 09:00:27 -07:00
18d5d8f5dd
Removed verbose debug from previous commit
2013-07-21 09:00:08 -07:00
edafea6ae6
PollServiceRequestManager: changed the long poll from a Queue to a List. No need to dequeue and enqueue items every 1sec.
2013-07-21 08:59:48 -07:00
3a6acbcc14
furhter shorten CheckAgentUpdateSignificance(). No real perf impact.
2013-07-21 08:59:31 -07:00
866de53978
Remove some pointless code in CheckAgentUpdateSignificance()
2013-07-21 08:59:17 -07:00
61eda1f441
Make the check as to whether any particular inbound AgentUpdate packet is significant much earlier in UDP processing (i.e. before we pointlessly place such packets on internal queues, etc.)
...
Appears to have some impact on cpu but needs testing.
2013-07-21 08:58:55 -07:00
e5c677779b
Add measure of number of inbound AgentUpdates that were seen as significant to "show client stats" (i.e. sent on for further processing instead of being discarded)
...
Added here since it was the most convenient place
Number is in the last column, "Sig. AgentUpdates" along with percentage of all AgentUpdates
Percentage largely falls over time, most cpu for processing AgentUpdates may be in UDP processing as turning this off even earlier (with "debug lludp toggle agentupdate" results in a big cpu fall
Also tidies up display.
2013-07-21 08:58:39 -07:00
5a2d4d888c
Hack in console command "debug lludp toggle agentupdate" to allow AgentUpdate in packets to be discarded at a very early stage.
...
Enabling this will stop anybody from moving on a sim, though all other updates should be unaffected.
Appears to make some cpu difference on very basic testing with a static standing avatar (though not all that much).
Need to see the results with much higher av numbers.
2013-07-21 08:58:21 -07:00
66048e1a70
minor: provide user feedback in the log for now when udp in/out bound threads are started/stopped
2013-07-21 08:58:02 -07:00
3a476bf60c
Fix up a temporary debugging change from last commit which stopped "lludp stop out" from actually doing anything
2013-07-21 08:57:36 -07:00
98d47ea428
Delay the enqueueing of non-longpoll requests for 100ms. No need to have these requests actively on the processing queue if it seems they're not ready.
2013-07-21 08:57:16 -07:00
63c42d6602
Do some simple queue empty checks in the main outgoing udp loop instead of always performing these on a separate fired thread.
...
This appears to improve cpu usage since launching a new thread is more expensive than performing a small amount of inline logic.
However, needs testing at scale.
2013-07-21 08:56:48 -07:00
9041f4a056
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-07-19 20:27:49 -07:00
c1705236c7
Fix HGTravelStore.migrations in SQLite (mantis #6709 )
2013-07-19 20:25:33 -07:00
1d65b0d802
BulletSim: add position resetting for stationary avatars so they don't
...
move around when standing on a stationary object.
Create proper linkage between BSCharacter and its actor by generating
a UpdatedProperties event the same way BSPrim does.
2013-07-18 19:09:55 -07:00
edef7472d1
Enable storing of environment settings in NullSimulationData
2013-07-18 13:33:50 -07:00
b5062ae7ee
Changed the timoeut of EQ 502s (no events) to 50 secs. The viewer post requests timeout in 60 secs.
...
There's plenty of room for improvement in handling the EQs. Some other time...
2013-07-18 13:30:04 -07:00
d9d995914c
try Hacking in an AutoResetEvent to control the outgoing UDP loop instead of a continuous loop with sleeps.
...
Does appear to have a cpu impact but may need further tweaking
2013-07-18 12:28:02 -07:00
71b1511db5
Revert "Revert "I confuse myself. Let's try this variable name instead.""
...
This reverts commit 52dc7b2a96
2013-07-18 12:25:47 -07:00
a22a4db5ce
Revert "Revert "Do the same trick that dahlia did for Dequeue(timeout)""
...
This reverts commit 5495df7443
2013-07-18 12:25:22 -07:00
552b85d33d
Revert "Revert "Putting the requests back in the queue while testing for count >0 is not the smartest move...""
...
This reverts commit 7127891957
2013-07-18 12:25:04 -07:00
ad198a714c
Revert "Revert "Didn't mean to commit this change in BlockingQueue.cs""
...
This reverts commit fda91d93da
2013-07-18 12:24:43 -07:00
9e35b069a4
Reverting the reverts I did yesterday. cpu-branch has now been
...
successfully tested, and I'm merging back those changes, which proved to
be good.
Revert "Revert "Cleared up much confusion in PollServiceRequestManager. Here's the history:""
This reverts commit fa2370b32e
2013-07-18 12:23:27 -07:00
ae997fffee
Merge branch 'master' of git://opensimulator.org/git/opensim
2013-07-18 02:28:36 -07:00
6572847518
Added MinPoolThreads to ini [Startup] section to control SmartThreadPool.
2013-07-18 02:28:07 -07:00
437326a480
Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster
...
Conflicts:
OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs
OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
2013-07-18 10:17:30 +01:00
7830cc9954
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs
OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs
OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
OpenSim/Services/HypergridService/UserAgentService.cs
2013-07-18 10:08:10 +01:00
077be8b496
Fix what apepars to be a bug in DoubleQueue<T>.Enqueue(Queue<T> q, T data) where the q parmater is ignored and everyghig is always placed on m_lowQueue.
...
No actual impact presently since nothing ends up calling EnqueueHigh()
2013-07-18 01:23:33 +01:00
6293614074
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-07-17 15:06:33 -07:00
49b3b7ee83
Merge branch 'master' of git://opensimulator.org/git/opensim
2013-07-17 15:06:25 -07:00
fa2370b32e
Revert "Cleared up much confusion in PollServiceRequestManager. Here's the history:"
...
This reverts commit e46459ef21
2013-07-17 15:05:36 -07:00
f64f07e7c5
command line kick user now uses exact name match instead of substring search to avoid kicking the wrong user or multiple wrong users.
2013-07-17 15:05:30 -07:00
fda91d93da
Revert "Didn't mean to commit this change in BlockingQueue.cs"
...
This reverts commit 0f5b616fb0
2013-07-17 15:05:16 -07:00
7127891957
Revert "Putting the requests back in the queue while testing for count >0 is not the smartest move..."
...
This reverts commit f4317dc26d
2013-07-17 15:04:27 -07:00
5495df7443
Revert "Do the same trick that dahlia did for Dequeue(timeout)"
...
This reverts commit af792bc7f2
2013-07-17 15:04:12 -07:00
52dc7b2a96
Revert "I confuse myself. Let's try this variable name instead."
...
This reverts commit 1d3deda10c
2013-07-17 15:03:40 -07:00
519dba9a69
Revert "Now trying DoubleQueue instead of BlockingQueue for the PollServiceRequestManager."
...
This reverts commit 5f95f4d78e
2013-07-17 15:03:16 -07:00
5c54eb30ed
Revert "This is a completely unreasonable thing to do, effectively defying the purpose of BlockingQueues. Trying this, to see the effect on CPU."
...
This reverts commit 5232ab0496
2013-07-17 15:02:54 -07:00
5232ab0496
This is a completely unreasonable thing to do, effectively defying the purpose of BlockingQueues. Trying this, to see the effect on CPU.
2013-07-17 14:36:55 -07:00
5f95f4d78e
Now trying DoubleQueue instead of BlockingQueue for the PollServiceRequestManager.
2013-07-17 14:09:04 -07:00
1d3deda10c
I confuse myself. Let's try this variable name instead.
2013-07-17 13:26:15 -07:00
af792bc7f2
Do the same trick that dahlia did for Dequeue(timeout)
2013-07-17 13:23:29 -07:00
f4317dc26d
Putting the requests back in the queue while testing for count >0 is not the smartest move...
2013-07-17 12:57:34 -07:00
0f5b616fb0
Didn't mean to commit this change in BlockingQueue.cs
2013-07-17 12:02:00 -07:00
2b8de2c404
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-07-17 11:19:56 -07:00
e46459ef21
Cleared up much confusion in PollServiceRequestManager. Here's the history:
...
When Melanie added the web fetch inventory throttle to core, she made the long poll requests (EQs) effectively be handled on an active loop. All those requests, if they existed, were being constantly dequeued, checked for events (which most often they didn't have), and requeued again. This was an active loop thread on a 100ms cycle!
This fixes the issue. Now the inventory requests, if they aren't ready to be served, are placed directly back in the queue, but the long poll requests aren't placed there until there are events ready to be sent or timeout has been reached.
This puts the LongPollServiceWatcherThread back to 1sec cycle, as it was before.
2013-07-17 11:19:36 -07:00
2c8bf4aaa6
BulletSim: fix small bug where everything looked like it was colliding
...
before the first simulator step.
2013-07-17 10:19:44 -07:00
894554faf6
Removed the MapItems thread. Redirected the map items requests to the services throttle thread. Didn't change anything in how that processor is implemented, for better or for worse.
2013-07-16 20:28:48 -07:00
9432f3c94d
Improvements to the ServiceThrottleModule: added a category and an itemid to the interface, so that duplicate requests aren't enqueued more than once.
2013-07-16 19:04:30 -07:00
5f27aaa6dd
UserManagementModule: in the continuation, call the method that also looks up the cache, because the resource may be here in the meantime
2013-07-16 18:22:42 -07:00
8bad56cb46
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-07-16 17:53:49 -07:00
d4720bd721
Added config var to fiddle with the Interval for the service throttle thread
2013-07-16 17:53:05 -07:00
9f129938c9
Attachments module only registers when enabled. This enables alternative attachments module implementations. All calls to Scene.AttachmentsModule are checking for null. Ideally, if we support disabling attachments then we need a null attachments module to register with the scene.
2013-07-16 17:43:36 -07:00
9f578cf0c8
Deleted a couple of verbose messages
2013-07-16 17:18:11 -07:00
0419852598
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-07-16 17:15:08 -07:00
a006caabbc
Added IServiceThrottleModule.cs
2013-07-16 17:06:54 -07:00
99a600753e
Changed the name to ServiceThrottle/ServiceThrottleModule in order to reflect its more generic nature.
2013-07-16 17:06:17 -07:00
3fbd2c54bc
Eliminated the UserManagement/UserManagementModule throttle thread. Made the other one generic, taking any continuation.
2013-07-16 17:04:32 -07:00
cbc3576ee2
minor: Add warning method doc about possibly inconsistent results returned from BlockingQueue.Contains(), Count() and GetQueueArray()
2013-07-16 23:14:53 +01:00
50b8ab60f2
Revert "Revert "MSDN documentation is unclear about whether exiting a lock() block will trigger a Monitor.Wait() to exit, so avoid some locks that don't actually affect the state of the internal queues in the BlockingQueue class.""
...
This reverts commit 21a09ad3adhttp://msdn.microsoft.com/en-gb/library/vstudio/system.threading.monitor.exit%28v=vs.100%29.aspx
so this should in theory make no difference, though mono implementation issues could possibly be coming into play.
2013-07-16 23:00:07 +01:00
21a09ad3ad
Revert "MSDN documentation is unclear about whether exiting a lock() block will trigger a Monitor.Wait() to exit, so avoid some locks that don't actually affect the state of the internal queues in the BlockingQueue class."
...
This reverts commit 42e2a0d66e
2013-07-16 22:03:49 +01:00
e0f0b88dec
In the pursuit of using less CPU: now trying to avoid blocking queues altogether. Instead, this uses a timer. No sure if it's better or worse, but worth the try.
2013-07-16 13:01:39 -07:00
6da50d34df
Actually use DoubleQueue in UserManagement/UserManagementModule
2013-07-16 07:19:13 -07:00
5a01ffa515
High CPU hunt: try a different blocking queue, DoubleQueue
2013-07-16 07:15:14 -07:00
6dd454240f
revert last commit which seems to conflict with DoubleQueue internals. The random crash might be in DoubleQueue instead. See http://pastebin.com/XhNBNqsc
2013-07-16 02:03:01 -07:00
70aa77f520
add locking to internal queue in WebFetchInvDescModule; lack of which caused a random crash in a load test yesterday
2013-07-16 01:31:09 -07:00
42e2a0d66e
MSDN documentation is unclear about whether exiting a lock() block will trigger a Monitor.Wait() to exit, so avoid some locks that don't actually affect the state of the internal queues in the BlockingQueue class.
2013-07-16 01:12:56 -07:00
e8e073aa97
Simplify EventQueue cap setup so that it is also stat monitored.
...
Curiously, the number of requests received is always one greater than that shown as handled - needs investigation
2013-07-16 00:05:45 +01:00
eb14e5a175
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-07-15 23:28:02 +01:00
1b7b664c86
Add request received/handling stats for caps which are served by http poll handlers.
...
This adds explicit cap poll handler supporting to the Caps classes rather than relying on callers to do the complicated coding.
Other refactoring was required to get logic into the right places to support this.
2013-07-15 23:27:46 +01:00
68fbf7eebb
Revert "Puts RequestImage (UDP) back to asyn -- CPU spike hunt"
...
This reverts commit b060ce96d9
2013-07-15 12:34:10 -07:00
687c1a420a
Guard against null ref
2013-07-15 12:33:31 -07:00
b060ce96d9
Puts RequestImage (UDP) back to asyn -- CPU spike hunt
2013-07-15 12:05:31 -07:00
864f15ce4d
Revert the revert
...
Revert "Trying to hunt the CPU spikes recently experienced."
This reverts commit ac73e70293
2013-07-15 11:52:26 -07:00
fbb01bd280
Protect against null requests
2013-07-15 11:37:49 -07:00
ac73e70293
Trying to hunt the CPU spikes recently experienced.
...
Revert "Comment out old inbound UDP throttling hack. This would cause the UDP"
This reverts commit 38e6da5522
2013-07-15 11:27:49 -07:00
60325f81d8
This might address the following observed exception:
...
17:14:28 - [APPLICATION]:
APPLICATION EXCEPTION DETECTED: System.UnhandledExceptionEventArgs
Exception: System.InvalidOperationException: Operation is not valid due to the current state of the object
at System.Collections.Generic.Queue`1[OpenSim.Region.ClientStack.Linden.WebFetchInvDescModule+aPollRequest].Peek () [0x00011] in /root/install/mono-3.1.0/mono/mcs/class/System/System.Collections.Generic/Queue.cs:158
at System.Collections.Generic.Queue`1[OpenSim.Region.ClientStack.Linden.WebFetchInvDescModule+aPollRequest].Dequeue () [0x00000] in /root/install/mono-3.1.0/mono/mcs/class/System/System.Collections.Generic/Queue.cs:140
at OpenSim.Framework.DoubleQueue`1[OpenSim.Region.ClientStack.Linden.WebFetchInvDescModule+aPollRequest].Dequeue (TimeSpan wait, OpenSim.Region.ClientStack.Linden.aPollRequest& res) [0x0004e] in /home/avacon/opensim_2013-07-14/OpenSim/Framework/Util.cs:2297
2013-07-15 10:29:42 -07:00
af02231a7b
Added SQLite version of hg travel data store. UNTESTED. Hope it works!
2013-07-14 16:03:46 -07:00
b0140383da
Cleanup old hg sessions (older than 2 days)
2013-07-14 15:47:54 -07:00
e33ac50388
HG UAS: Moved hg-session data from memory to DB storage. This makes it so that traveling info survives Robust resets. It should also eliminate the cause of empty IP addresses in agent circuit data that we saw in CC grid. MySQL only.
2013-07-14 14:31:20 -07:00
5939529036
Minor typo in log message
2013-07-14 14:29:10 -07:00
c8dcb8474d
Let's go easy on authenticating ChildAgentUpdates, otherwise this will be chaotic while ppl are using different versions of opensim. Warning only, but no enforcement.
2013-07-14 10:26:05 -07:00
98f59ffed5
Fix broken tests -- the test setup was wrong... sigh.
2013-07-14 09:22:55 -07:00
c61ff917ef
Authenticate ChildAgentUpdate too.
2013-07-14 09:21:28 -07:00
f3b3e21dea
Change the auth token to be the user's sessionid.
2013-07-14 07:28:40 -07:00
fcb0349d56
And this fixes the other failing tests. Justin, the thread pool is not being initialized in the tests!
2013-07-13 23:01:41 -07:00
e4f741f006
This should fix the failing test.
2013-07-13 22:52:51 -07:00
a2ee887c6d
Deleted a line too many
2013-07-13 22:32:52 -07:00
b4f1b9acf6
Guard against unauthorized agent deletes.
2013-07-13 21:28:46 -07:00
931eb892d9
Deleted GET agent all around. Not used.
2013-07-13 17:56:42 -07:00
4d93870fe5
Gatekeeper: stop bogus agents earlier, here at the Gatekeeper. No need to bother the sim.
2013-07-13 17:52:05 -07:00
5a1d6727e1
Some more debug to see how many threads are available.
2013-07-13 11:39:17 -07:00
bc405a6a34
That didn't fix the problem.
...
Revert "Trying to reduce CPU usage on logins and TPs: trying radical elimination of all FireAndForgets throughout CompleteMovement. There were 4."
This reverts commit 6825377380
2013-07-13 11:30:37 -07:00
6825377380
Trying to reduce CPU usage on logins and TPs: trying radical elimination of all FireAndForgets throughout CompleteMovement. There were 4.
2013-07-13 11:11:18 -07:00
3a26e366d2
This commit effectively reverses the previous one, but it's just to log that we found the root of the rez delay: the priority scheme BestAvatarResponsiveness, which is currently the default, was the culprit. Changing it to FrontBack made the region rez be a lot more natural.
...
BestAvatarResponsiveness introduces the region rez delay in cases where the region is full of avatars with lots of attachments, which is the case in CC load tests. In that case, the inworld prims are sent only after all avatar attachments are sent. Not recommended for regions with heavy avatar traffic!
2013-07-13 10:35:41 -07:00
ff4ad60207
Same issue as previous commit.
2013-07-13 10:05:11 -07:00
ccee2959f7
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-07-13 09:53:05 -07:00
a412b1d682
Moved SendInitialDataToMe to earlier in CompleteMovement. Moved TriggerOnMakeRootAgent to the end of CompleteMovement.
...
Justin, if you read this, there's a long story here. Some time ago you placed SendInitialDataToMe at the very beginning of client creation (in LLUDPServer). That is problematic, as we discovered relatively recently: on TPs, as soon as the client starts getting data from child agents, it starts requesting resources back *from the simulator where its root agent is*. We found this to be the problem behind meshes missing on HG TPs (because the viewer was requesting the meshes of the receiving sim from the departing grid). But this affects much more than meshes and HG TPs. It may also explain cloud avatars after a local TP: baked textures are only stored in the simulator, so if a child agent receives a UUID of a baked texture in the destination sim and requests that texture from the departing sim where the root agent is, it will fail to get that texture.
Bottom line: we need to delay sending the new simulator data to the viewer until we are absolutely sure that the viewer knows that its main agent is in a new sim. Hence, moving it to CompleteMovement.
Now I am trying to tune the initial rez delay that we all experience in the CC. I think that when I fixed the issue described above, I may have moved SendInitialDataToMe to much later than it should be, so now I'm moving to earlier in CompleteMovement.
2013-07-13 09:46:58 -07:00
cd64a70c79
Added UploadBakedTexture/UploadBakedTextureServerConnector, so that this can eventually be served by a robust instance. NOT FINISHED YET.
2013-07-13 08:31:03 -07:00
c6d75cda97
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs
2013-07-13 00:57:03 +01:00
a53a10ad27
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs
OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
2013-07-13 00:47:58 +01:00
d06c85ea77
Reinsert PhysicsActor variable back into SOP.SubscribeForCollisionEvents() in order to avoid a race condition.
...
A separate PhysicsActor variable is used in case some other thread removes the PhysicsActor whilst this code is executing.
If this is now impossible please revert - just adding this now whilst I remember.
Also makes method comment into proper method doc.
2013-07-13 00:29:07 +01:00
b4cb644a05
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-07-13 00:03:23 +01:00
3d118fb580
In co-op termination, extend EventWaitHandle to give this an indefinite lifetime in order to avoid a later RemotingException if scripts are being loaded into their own domains.
...
This is necessary because XEngineScriptBase now retains a reference to an EventWaitHandle when co-op termination is active.
Aims to address http://opensimulator.org/mantis/view.php?id=6634
2013-07-13 00:02:54 +01:00
fa02f28dbf
Add ToOSDMap() overrides to the Stat subclass CounterStat.
...
Add a GetStatsAsOSDMap method to StatsManager which allows the filtered
fetching of stats for eventual returning over the internets.
2013-07-12 14:04:14 -07:00
3d700bb42c
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-07-12 12:54:29 -07:00
29f6ae199e
Changed UploadBakedTextureModule so that it uses the same pattern as the others, in preparation for experiments to direct baked texture uploads to a robust instance. No functional or configuration changes -- should work exactly as before.
2013-07-12 12:53:58 -07:00
65239b059f
Enhance NullEstateData to remember stored estate values and return
...
them next time asked. This keeps any estate settings from being reset
when the estate dialog is opened in a region with null estate storage.
2013-07-11 20:55:32 -07:00
1909ee70f8
Centralize duplicated code in SceneObjectPart for subscribing to
...
collision events. Improve logic for knowing when to add processing
routine to physics actor.
2013-07-11 16:57:07 -07:00
83d1680057
Added a few more thingies to the asset client test to poke the threadpool.
2013-07-11 16:43:43 -07:00
ba8f9c9d0a
Try naming the materials handlers again, this time registering the POST as RenderMaterials
...
This was probably the mistake.
The other handlers are named RenderMaterials as well but this actully has no affect apart from on stats, due to a (counterintuitive) disconnect between the registration name and the name of the request handler.
Will be tested very soon and reverted if this still does not work.
2013-07-11 23:51:10 +01:00
7c2e4786ce
minor: remove some regression test logging switches accidentally left uncommented.
2013-07-11 23:19:55 +01:00
e15a15688b
minor: Take out unnecessary clumsy sleep at the end of regression Test404Response().
...
This wasn't actually necessary in the end but was accidentally left in.
2013-07-11 23:11:35 +01:00
f57f49eede
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-07-11 23:05:10 +01:00
44e9849ed1
Fix regression where llHTTPRequests which did not get an OK response returned 499 and the exception message in the http_response event rather than the actual response code and body.
...
This was a regression since commit 831e4c3http://opensimulator.org/mantis/view.php?id=6704
2013-07-11 23:02:30 +01:00
ee51a9f9c9
Added property to make for more flexible testing.
2013-07-11 14:23:37 -07:00
51d106cff8
Added a test for the asset service
2013-07-11 14:21:57 -07:00
c4f1ec1fd6
Changed the UserProfileModule so that it's less greedy in terms of thread usage.
2013-07-11 10:21:20 -07:00
ea371a6f54
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-07-11 09:48:15 -07:00
604967b31e
Switched UUIDNameRequest and RegionHandleRequest to Sync, because now they are also non-blocking handlers.
2013-07-11 09:47:46 -07:00
3b48b6a792
Switched TransferRequest (UDP packet handler) to sync. The permissions checks may block, so they get a FireAndForget. Everything else is non-blocking.
2013-07-11 09:44:48 -07:00
0120e858b7
remove names from Capability handlers (added by justincc in commit 013710168b) as they seem to disable the use of multiple access methods for a single Capability in MaterialsDemoModule
2013-07-10 22:30:41 -07:00
9173130fde
Switched RegionHandshakeReply to Sync, because it's not doing anything blocking.
2013-07-10 20:48:13 -07:00
fe5da43d15
EXPERIMENTAL: make RequestImage (UDP packet handler) sync instead of async. This _shouldn't_ screw things up, given that all this does is to dump the request in a queue.
2013-07-10 19:29:14 -07:00
bdaeb02863
show client stats: Fixed the requests/min. Also changed the spelling of the command, not without the dash.
2013-07-10 17:14:20 -07:00
864a86983e
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-07-10 16:10:04 -07:00
1b265b213b
Added show client-stats [first last] command to expose what viewers are requesting.
2013-07-10 16:09:45 -07:00
59d19f038a
Remove a null reference exception in SimianPresenceServiceConnector that
...
occurs when GetGridUserInfo cannot find the requested user info.
2013-07-10 08:55:54 -07:00
38e6da5522
Comment out old inbound UDP throttling hack. This would cause the UDP
...
reception thread to sleep for 30ms if the number of available user worker
threads got low. It doesn't look like any of the UDP packet types are
marked async so this check is 1) unnecessary and 2) really crazy since
it stops up the reception thread under heavy load without any indication.
2013-07-09 18:34:24 -07:00
bb6fb65392
Revert "minor: remove some mono compiler warnings in UserProfileModule"
...
Revert until we understand why all the calls to GetUserProfileServerURI were also
commented out.
This reverts commit 5f58b9b552
2013-07-09 18:24:39 -07:00
cec8e6d0f7
If a sensor is in an attachment, avoid throwing an exception if the attachee is removed from the scene before we try to retrieve them.
2013-07-09 23:52:47 +01:00
095066b1ce
Handle UUIDNameRequest UDP packet processing async instead of within the main inbound UDP processing loop, to avoid any chance that this is delaying the main udp in loop.
...
The potential impact of this should be lower now that these requests are being placed on a queue.
2013-07-09 23:39:29 +01:00
d0dfb744b2
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-07-09 14:13:51 -07:00
67e500383e
Put guards on a bunch of exception-inducing code, as seen in logs from load test.
2013-07-09 14:12:52 -07:00
2c761cef19
BulletSim: add parameter to optionally disable vehicle linear deflection.
...
Add parameter to not apply vehicle linear deflection Z forces if
vehicle is not colliding. This defaults to 'true' so vehicles will fall
even if there is some linear deflection to apply.
2013-07-09 09:37:42 -07:00
065f8f56a2
remove some cruft and trigger a rebuild
2013-07-08 19:18:01 -07:00
33eea62606
remove an invalid null UUID check which caused a warning
2013-07-08 17:12:39 -07:00
fad4241e4e
BulletSim: make all the different angularVerticalAttraction algorithms
...
selectable from configuration paramters.
Changed default algorithm to "1" from previous default as it seems to
handle Y axis correction a little better.
Add config file independent enablement of vehicle angular forces to
make debugging easier (independent testing of forces).
2013-07-08 16:24:31 -07:00
76b2b20f7e
minor: remove mono compiler warnings from HGSuitcaseInventoryService
2013-07-09 00:06:22 +01:00
5f58b9b552
minor: remove some mono compiler warnings in UserProfileModule
2013-07-09 00:04:46 +01:00
83da14008f
minor: remove some mono compiler warnings in new groups code
2013-07-08 23:57:05 +01:00
af9b17c545
minor: remove mono compiler warnings related to keyframe code
2013-07-08 23:52:40 +01:00
2025dd25f6
Add missing file BaseOutputStreamHandler.cs from recent commit e19defd
2013-07-08 23:50:40 +01:00
047ef9c2a5
minor: remove some mono compiler warnings in OdePlugin
2013-07-08 23:36:57 +01:00
eccec4f8f6
minor: remove now unused migration-hack bool from DAMap
2013-07-08 23:32:19 +01:00
8be59829d1
minor: Add back commented out logging message in Caps.RegisterHandler() that I accidentally removed.
2013-07-08 22:41:24 +01:00
013710168b
For stat purposes, add names to capability request handlers where these were not set
2013-07-08 22:39:07 +01:00
dc54581700
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-07-08 22:19:37 +01:00
b2d4b8b1da
BaseHttpServer: if the handler sets the content length, don't override it. This happens in HEAD handlers.
2013-07-08 14:12:11 -07:00
c3db595944
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-07-08 22:07:27 +01:00
e19defde36
Add "show caps stats by user" and "show caps stats by cap" console commands to print various counts of capability invocation by user and by cap
...
This currently prints caps requests received and handled, so that overload of received compared to handled or deadlock can be detected.
This involves making BaseStreamHandler and BaseOutputStream record the ints, which means inheritors should subclass ProcessRequest() instead of Handle()
However, existing inheriting classes overriding Handle() will still work, albeit without stats recording.
"show caps" becomes "show caps list" to disambiguate between show caps commands
2013-07-08 22:03:07 +01:00
a38c2abae4
Make dictionary read/write locking consistent in CapabilitiesModule, rename two dictionary fields to standard m_ format
2013-07-08 18:07:04 +01:00
c66a9a08e4
Placed a throttle on UserManagementModule for name lookups. Singularity apparently is flooding the sims with name requests.
2013-07-08 08:41:18 -07:00
1e72e1b258
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-07-07 20:44:23 -07:00
bbb9af363d
Print out caller IP when unusual requests are received.
2013-07-07 20:43:42 -07:00
bbc40fab62
BulletSim: Different Implementation of Angular Deflection for vehicles, Activates it again and fixes problem with fighting with vertical attractor removing wobble of forward axis. Comments on testing welcome, May require adjustments of this force or other forces after this commit, exact tweaking to come after testing on other hardware.
...
Signed-off-by: Robert Adams <Robert.Adams@intel.com>
2013-07-07 06:18:50 -07:00
6026759406
BulletSim: fix jumping up and down of linksets when center-of-mass
...
was enabled. Didn't effect the physical position but the viewer saw
the linkset jumping between its simulator center and its physical
center.
2013-07-07 05:47:41 -07:00
70d24a654b
BulletSim: rename position and orientation variables to remove the
...
inconsistant use of Raw* and _* conventions.
2013-07-07 05:46:24 -07:00
1286677352
Try to normalize the creatorData of scene object parts with the trailing '/'. What a nightmare this '/' is!
2013-07-06 18:37:54 -07:00
803e5498b0
A little more debug
2013-07-06 18:27:03 -07:00
71e26555bd
Revert "WARNING: BRUTE FORCE DEBUG AGAIN. AVOID USING THIS COMMIT"
...
This reverts commit 9b75d75724
2013-07-06 18:16:27 -07:00
391633c072
Some more fixes on strange behaviors of Unknown User, esp. related to large messy inventories and esp. related to kokua
2013-07-06 18:02:17 -07:00
1dd3a0bc57
MORE DEBUG. DON"T USE THIS.
2013-07-06 17:29:19 -07:00
9b75d75724
WARNING: BRUTE FORCE DEBUG AGAIN. AVOID USING THIS COMMIT
2013-07-06 16:51:14 -07:00
93fd5e4036
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-07-06 15:18:29 -07:00
b29a09ab8e
Simina activity detector was too eager. Disabled it in case simian is not being used.
2013-07-06 15:17:55 -07:00
d838f15d97
Add implementations for llSetVelocity and llSetAngularVelocity.
2013-07-06 09:53:30 -07:00
a65cec3986
BulletSim: implementation of linkset center-of-mass.
...
Default off, for the moment, until more testing.
Add separate thread and center-of-mass flags to OpenSimDefaults.ini.
Clean up comments in OpenSimDefaults.ini.
2013-07-06 08:25:15 -07:00
97698ae311
BulletSim: More tweaking on center-of-mass. Almost there. Changes have no effect if LinksetOffsetCenterOfMass=false (the default).
2013-07-06 08:25:15 -07:00
03268d85c4
BulletSim: comments and non-functional changes working toward the center-of-gravity implementation.
2013-07-06 08:25:14 -07:00
5f97c6f8f0
BulletSim: non-functional updates. Comments and formatting.
...
Update TODO list.
2013-07-06 08:25:13 -07:00
c358d5d168
Changed a few bits in Inventory/Archiver/InventoryArchiveReadRequest.cs to be less dependent on a Scene.
2013-07-05 20:17:10 -07:00
98de67d573
Fix mono warning in LLImageManagerTests
2013-07-06 00:55:14 +01:00
55ac8c83c7
Get InventoryWorkerThreads to update watchdog on processing requests
2013-07-06 00:34:22 +01:00
67407024a2
Update thread watchdog on GridServiceRequestThread periodically and turn off alarming
...
Unfortunately, alarm can spuriously go off if the thread blocks for a long time on an empty queue.
2013-07-06 00:29:19 +01:00
5dbdd5f8b4
refactor: Make stats and sim status simpler by extending BaseStreamHandler like other handlers instead of implementing the IStreamedRequestHandler interface directly
2013-07-06 00:12:48 +01:00
dd15f95499
Add very basic regression test TestChildAgentSingleRegionCapabilities() which checks for addition and removal of capabilities on add/remove of child agent
2013-07-05 20:06:27 +01:00
ca26583e6b
Delete some verbose debug messages
2013-07-04 15:17:06 -07:00
8265a88c4a
Throttle the viewer's requests for region handles. Apparently Kokua is requesting this for all landmarks in inventory. Not sure why. But this seems to be the root cause of the login freeze mentioned before. This commit adds a blocking queue / process thread pattern.
2013-07-04 14:51:18 -07:00
5ddcc25ee9
Merge branch 'master' into careminster
2013-07-04 22:32:58 +01:00
d80936bbbb
Guard against completely unknown user UUIDs.
2013-07-04 14:07:25 -07:00
da3aa44138
Debug the RegionHandle handler (same issue)
2013-07-04 13:27:53 -07:00
33ddb6c246
Revert "WARNING: BRUTE FORCE DEBUG. AVOID USING THIS COMMIT."
...
This reverts commit c95a23863a
2013-07-04 13:25:58 -07:00
c95a23863a
WARNING: BRUTE FORCE DEBUG. AVOID USING THIS COMMIT.
2013-07-04 13:13:52 -07:00
38a04ff993
Revert "Same freeze issue, now checking if it's in estate"
...
This reverts commit ca380ec039
2013-07-04 13:00:06 -07:00
d997c49e47
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-07-04 12:45:34 -07:00
ca380ec039
Same freeze issue, now checking if it's in estate
2013-07-04 12:41:45 -07:00
93ee515d9d
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-07-04 20:41:02 +01:00
fdafc2a16c
With diva's permission, temporarily reinsert Unknown UserUMMAU3 to make sure that GUN7 failure has largely disappeared.
...
Unknown UserUMMAU3 insertion should definitely be removed down the line.
However, I would like a little more time to check the GUN* reduction first, since removing UMMAU3 will make these failures appear as GUN7 instead.
Also bumps GUN6 -> GUN7 and UMMAU2 -> UMMAU3
2013-07-04 20:39:16 +01:00
bf214122cd
More debug, same issue
2013-07-04 11:53:22 -07:00
15d0bc0900
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-07-04 11:37:00 -07:00
ec9ffbb89a
More debug, same issue
2013-07-04 11:36:10 -07:00
c61becc62b
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-07-04 19:33:12 +01:00
0cc0a2485c
More debug related to the previous commit
2013-07-04 11:18:05 -07:00
ae42c93f9a
Now trying to find a cause of freeze at login related to friends status notifications.
2013-07-04 10:59:21 -07:00
98a2fa8e35
HG Friends: this was commented some commits ago, but it shouldn't have been.
2013-07-04 10:23:20 -07:00
068a3afad9
HG Friends: migration #3 is failing on some installations of MySql. Setting the table to InnoDB seems to fix the problem.
2013-07-04 09:51:31 -07:00
16f40c1a15
Add --default option to "debug lludp packet" command to allow packet logging to be performed immediately from client start
2013-07-04 17:29:53 +01:00
5eb78aad96
Revert "HG Friends: debug an issue where the friends data stored in the DB is incomplete."
...
This reverts commit 27cdfb7b84
2013-07-04 09:17:01 -07:00
80f4a008eb
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-07-04 08:48:19 -07:00
27cdfb7b84
HG Friends: debug an issue where the friends data stored in the DB is incomplete.
2013-07-04 08:47:45 -07:00
25889b2d7e
change "debug packet" command to "debug lludp packet" to conform with other "debug lludp" options
...
also moves the implementing code into LLUDPServer.cs along with other debug commands from OpenSim.cs
gets all debug lludp commands to only activate for the set scene if not root
2013-07-04 00:02:53 +01:00
119f84fe11
Squoosh one last opportunity for Unknown Users to creep in.
2013-07-02 17:03:04 -07:00
06dba1fa62
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-07-02 16:47:17 -07:00
4d24bf75fd
Deleted debug messages. Fixed a null ref exception on the POST handler of GridUserServerPostHandler.cs
2013-07-02 16:46:35 -07:00
d01b8e163d
minor: Correct typo of "Descrition" to "Description" in "show object *" console commands
...
Thanks to Ai Austin for pointing this out.
2013-07-03 00:27:22 +01:00
316e8f9239
Fix SQL statement
2013-07-02 16:10:09 -07:00
9725b829d5
Do the same for SQLite and MSSQL
2013-07-02 15:48:30 -07:00
2c05caec7f
Really make it call the method with the query interface
2013-07-02 15:47:02 -07:00
626940ceb8
More debug messages
2013-07-02 15:39:10 -07:00
e984bfb4c6
This should have a strong effect on the Unknown User issue mantis #6625
2013-07-02 14:31:39 -07:00
ccca005969
HG: close a loophole by which if something was wrong with the ServiceURLs it resulted in never ending asset requests
2013-07-02 13:29:44 -07:00
635704b7ef
Update debug unknown user name UserUMMTGUN3 to UserUMMTGUN4 and UserUMMAU -> UserUMMAU2 to track any new occurences.
...
This is to see the impact that Diva's fixes related to this issue (last one is currently commit c7383688http://opensimulator.org/mantis/view.php?id=6625
2013-07-01 23:54:04 +01:00
8eb86c9ec9
BulletSim: add the reset of the last commit for flush log file problems.
...
Fix small typo in one log message.
2013-06-30 19:22:43 -07:00
c24c99f4ba
BulletSim: fix an occasional crash with flushing log files.
2013-06-30 19:08:15 -07:00
9d5ae75950
BulletSim: remove the handle to the vehicle actor and cause routines
...
that need it to look it up.
2013-06-30 17:07:51 -07:00
425d2a2a97
BulletSim: set linkset type to be prim specific rather than a simulator
...
wide default. This allows individual prims to differ in the
underlying linkset implementation.
2013-06-30 17:07:50 -07:00
23516717e4
BulletSim: a better version of llMoveToTarget that doesn't go crazy.
...
There is still some overshoot but mostly fixes Mantis 6693.
Fix bug where moveToTarget was active for non-physical objects
and while selected.
Fix bug where move target was not getting changed if the script
changed the target during a move.
2013-06-30 17:07:49 -07:00
2f4a729d40
BulletSim: add inTaintTime parameter to collision cache clear function.
2013-06-30 17:07:48 -07:00
ffcee82b1d
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Data/MySQL/MySQLSimulationData.cs
OpenSim/Region/Framework/Scenes/EventManager.cs
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
2013-06-30 18:27:30 +01:00
e377abcc35
Groups V2: charge for group creation only after the group has been successfully created
2013-06-30 08:39:35 -07:00
c738368846
Revert "More debug mantis #6625"
...
This reverts commit 20f2cf8769
2013-06-30 07:25:46 -07:00
1e97972f78
Revert "One more debug mantis #6625"
...
This reverts commit 8fa5d12fcb
2013-06-30 07:25:13 -07:00
d7775d1e11
Revert "A little more debug for the Unknown User problem mantis #6625"
...
This reverts commit ff47cf77ab
2013-06-30 07:22:27 -07:00
1fc873d09f
Same fix to LocalInventoryServiceConnector.cs
2013-06-30 07:21:22 -07:00
74e7fac13f
More on mantis #6625
2013-06-29 22:32:26 -07:00
20f2cf8769
More debug mantis #6625
2013-06-29 21:54:10 -07:00
c462e0a51c
Fixed previous debug message
2013-06-29 21:30:07 -07:00
8fa5d12fcb
One more debug mantis #6625
2013-06-29 21:26:58 -07:00
0c97021565
More debug for mantis #6625 . It looks like the home friends list is being fetched on HG TPs.
2013-06-29 21:05:45 -07:00
ff47cf77ab
A little more debug for the Unknown User problem mantis #6625
2013-06-29 19:15:25 -07:00
00093a305d
Changed HG status notifications timeout down to 15secs from the default 100.
2013-06-29 18:35:23 -07:00
3a634c56e3
Remove hack to migrate previous experimental-level os materials data.
...
This didn't seem to be working anyway and it's better not to have such hacks in the code for experimental stuff.
2013-06-29 00:23:41 +01:00
371085546d
Add materials store null check into UuidGatherer code.
2013-06-28 23:57:41 +01:00
4cb4c9fb25
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-06-28 14:03:46 -07:00
cbb5122729
add some locking to materials storage dictionary
2013-06-28 14:00:28 -07:00
e26e8b8829
Remove "Asset deletion not supported by database" message from "delete asset" robust/standalone console command since it actually was implemented and performed.
...
Improve other associated messages.
2013-06-28 19:19:38 +01:00
dc0455e217
In XAssetService, on a delete asset request also delete the asset in any chained service.
...
This eliminates the async migration since it causes a race condition with the "delete asset" console command
2013-06-28 19:11:44 +01:00
f6ce87c96d
Reinsert code for gathering uuids reference by materials back directly into UuidGatherer for now.
...
This cannot be triggered as an event from Scene.EventManager since some invocations of UuidGatherer (e.g. IAR saving) use scene objects which are not in scenes.
There needs to be some way for modules to register for events which are not connected with a particular scene.
2013-06-28 18:50:33 +01:00
529633d970
add method docs for DAMap.GetStore() and DAMap.SetStore()
2013-06-27 18:44:27 -07:00
d47fc48b32
and yet another check for null returned from DynAttrs.GetStore()
2013-06-27 18:01:17 -07:00
c1b8f83dd4
test for null return from DynAttrs.GetStore()
2013-06-27 17:53:15 -07:00
149487ea0f
refactor: Move code for gathering textures referenced by materials into MaterialsDemoModule from UuidGatherer
...
This code is now triggered via EventManager.OnGatherUuids which modules can subscribe to.
2013-06-27 23:42:35 +01:00
f7d09b898a
Make the concept of namespaces explicit in dynamic attributes
...
This is in order to reduce the likelihood of naming clashes, make it easier to filter in/out attributes, ensure uniformity, etc.
All dynattrs in the opensim distro itself or likely future ones should be in the "OpenSim" namespace.
This does alter the underlying dynattrs data structure. All data in previous structures may not be available, though old structures should not cause errors.
This is done without notice since this feature has been explicitly labelled as experimental, subject to change and has not been in a release.
However, existing materials data is being preserved by moving it to the "Materials" store in the "OpenSim" namespace.
2013-06-27 23:14:28 +01:00
f78d2ef166
Update temporary "Unknown UserUMMTGUN2" name to "Unknown UserUMMTGUN3" to see if Diva's recent HG updates (post 6c7e33f) fix this issue.
...
This string is returned if a UserManagementModule.TryGetUserNames() cannot find a server-side name binding or a user account for a given UUID.
This is only called when the viewer requests a binding via the UDP UUIDNameRequest message
2013-06-25 00:46:15 +01:00
ce9b1320d2
Improve situation where editing just the root prim of an attachment causes other prims to be set to very far off positions on reattach.
...
Functionally the same as the patch by tglion in http://opensimulator.org/mantis/view.php?id=5334
However, not yet perfect - after editing just root prim on reattach the position is still wrong, though other prims are not set to far off positions.
2013-06-25 00:41:46 +01:00
4b00203fa5
Tidy up SOG.UpdateRootPosition() to eliminate unnecessary copying of Vector3 structs
2013-06-25 00:15:55 +01:00
f70357eaa3
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Framework/Monitoring/BaseStatsCollector.cs
OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs
OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
2013-06-23 01:59:57 +01:00
936700bda3
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2013-06-23 01:49:45 +01:00
24a4367fc2
Merge branch 'avination-current' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
2013-06-23 01:48:57 +01:00
25ed1658ca
Merge branch 'master' into careminster
2013-06-23 01:35:09 +01:00
4bf1afe300
Fix prim locking to behave like SL
2013-06-23 01:34:35 +01:00
8e9d6c6c56
Fix prim locking to behave like SL
2013-06-23 01:14:07 +02:00
edb11a7eca
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-06-22 08:29:54 -07:00
6c7e33fe47
Change IsLocalRegion from using region handle to using regionID. This was affecting UpdateAgent and CloseAgent in cases where the foreign region is on the same coordinates as *some* local region.
2013-06-22 08:29:06 -07:00
ca3ce6da73
HG: avoid call on localhost between sim and UAS for standalone.
2013-06-22 08:26:59 -07:00
4778d67005
Finally moved HG agent transfers to use agent fatpacks.
2013-06-21 20:52:46 -07:00
74539659f6
BulletSim: move new linear deflection code to own routine.
...
Remove VehicleForwardVelocity changed storage since the value
will be modified as movement is processed.
2013-06-21 10:46:21 -07:00
a5de4f692b
BulletSim: Implementation of Linear Deflection, it is a partial help for the vehicle tuning diffrence between Opensim and Second life.
...
Signed-off-by: Robert Adams <Robert.Adams@intel.com>
2013-06-20 19:02:15 -07:00
bbeff4b8ca
BulletSim: rework velocity updating when not colliding and not flying
...
to prevent infinite jumps. Now jumps last only AvatarJumpFrames long
(default 4) which is about as high as in SL.
TODO: jumping should only depend on standing (collision with feet)
rather than collision anywhere on the avatar.
2013-06-20 09:55:40 -07:00
a33b6eed6d
minor: remove mono compiler warnings in WebsocketServerHandler.cs
2013-06-20 00:54:19 +01:00
085a87060a
Change "ObjectMemory" stat to "HeapMemory" to align with other stat names. Also round this and ProcessMemory to three decimal places in common with other memory stats.
...
I believe leaving out such minor info makes stats easier to read
2013-06-20 00:52:39 +01:00
05790ba1cf
Allow more than one stat category to be specified in "show stats"
...
e.g. "show stats httpserver.9000 server.network"
2013-06-20 00:45:56 +01:00
5b1a9f84fd
minor: Change "memory churn" terminology in statistics to "heap allocation rate" since this is more generally meaningful
2013-06-20 00:32:12 +01:00
d97333255d
Fix minor bug where the check whether to display SmartThreadPool stats was accidentally != null rather than == FireAndForgetMethod.SmartThreadPool
...
Due to another check this had no practical effect
2013-06-20 00:22:44 +01:00
3370e19205
minor: fix mono compiler warning in FetchInventory2Handler
2013-06-20 00:17:20 +01:00
086fd70a5f
Make it possible to specify display of stats in a particular 'container' by separating category and container with a period.
...
e.g. "show stats server.network"
I failed to realize this had already been implemented without the period in the show stats command (as the command help had not been updated).
However, I would prefer the . approach as it will allow specifying multiple stats, easier wildcarding, etc.
This commit also prevents any stat from having a period in its short name.
2013-06-20 00:00:39 +01:00
84af1cab9b
Display existing statistic of how many http requests a server is making as server.network.HTTPRequestsMade in "show stats all"
2013-06-19 20:48:12 +01:00
8a86e29579
Mantis 6608: Math error in parcel dimensions/borders seen with land show command
...
This patch changes the land show console command to return numbers in the
range 4 to 256 for the "to" coordinates instead of 0 to 252
Also trailing spaces removed from some lines.
2013-06-19 00:26:23 +01:00
1a72f62d7b
minor: remove mono compiler warning in OfflineIMService
2013-06-18 23:52:15 +01:00
3fe5e9057f
Prevent an exception if no offline messages were retrieved.
2013-06-18 23:15:38 +01:00
dda44e31e3
minor: tidy up spacing if display a unit for additional stat information
2013-06-18 23:10:50 +01:00
9501a583cb
Make number of inbound http requests handled available as a httpserver.<port>.IncomingHTTPRequestsProcessed stat
2013-06-18 23:07:18 +01:00
768e8e363b
Fix issue where stat samples were accidentally static, so that any additional stat with sampling would produce wrong results
2013-06-18 22:49:49 +01:00
0767523834
Fix other places when saving scripts or notecards in prim inventories where messages should be transient without an OK button
2013-06-18 21:21:59 +01:00
c78cb96c62
Allow coalesced objects to be rezzed even if they extend past the sim bounds
2013-06-18 04:42:20 +02:00
56f4adeb60
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
OpenSim/Services/LLLoginService/LLLoginResponse.cs
OpenSim/Services/LLLoginService/LLLoginService.cs
2013-06-18 01:50:08 +01:00
a1e32b8437
If SmartThreadPool is active, display statistical information about it in "show stats server"
...
Also puts these and previous builtin threadpool stats in the "threadpool" stat container rather than "processor"
2013-06-18 00:10:21 +01:00
b7c9dee033
refactor: Move existing code to generate report information on the threadpool to the ServerBase rather than being in Util
2013-06-17 23:57:10 +01:00
c0a00cd7fd
Fix bug where no threadpool data would be displayed in the "show threads" command if threadpool type was QueueUserWorkItem (Unsafe worked as expected)
2013-06-17 23:34:09 +01:00
713a14a6b5
minor: remove mono compiler warnings in WebFetchInvDescModule
2013-06-17 23:23:56 +01:00
b9dac1f8df
Fix test failure in BasicCircuitTests from previous commit 0d2fd0d9
2013-06-17 23:17:55 +01:00
865d46ae1e
Drop server level stats to debug instead of info.
...
This was the original intention with these stats, as I didn't believe they would be useful to ordinary users if everything is working as it should.
Please amend if this is an issue.
Just for now, levels actually have no impact on what is displayed via the "show stats" command.
2013-06-17 22:57:47 +01:00
2c9bb0f973
Add server stats for available builtin threadpool and iocp workers
2013-06-17 22:55:25 +01:00
0d2fd0d914
Make general server stats available on the robust console as well as the simulator console
...
This means the "show stats" command is now active on the robust console.
2013-06-17 22:39:00 +01:00
694c4bcbb6
correct method doc for llRot2Axis()
2013-06-14 20:00:20 -07:00
e6cb7b4764
Lock m_classifiedCache and m_classifiedInterest dictionary reads in UserProfileModule since in the presence of writes these are not thread-safe operations.
...
Simplified locking to m_classifiedCache only since r/w of both dictionaries always occurs together
2013-06-15 00:52:57 +01:00
42b0c68eab
Correct build break in previous commit 9c530d7
2013-06-15 00:46:55 +01:00
9c530d725f
refactor: In UserProfileModule, change classifiedCache and classifiedInterest to m_classifiedCache and m_classifiedInterest
...
This is the coding standard name style for private fields.
2013-06-15 00:41:02 +01:00
ecfc6a3f4a
Add the standard OpenSimulator copyright notice to the top of InventoryCache.cs
2013-06-15 00:36:16 +01:00
720806b661
Adjust the locking on InventoryCache. Locking for r/w of the ExpiringCache isn't needed since it's thread safe but r/w of contained dictionaries isn't thread-safe
2013-06-15 00:34:45 +01:00
da3724a904
minor: remove mono compiler warnings from LSL_Api, properly format method doc for llRot2Axis()
2013-06-15 00:11:36 +01:00
f074739e33
Mantis 6280: llSetContentType(). An implementation.
...
An implimentation of llSetContentType including all of the new
constants added since the mantis was raised.
2013-06-15 00:06:03 +01:00
fc89bde044
Mantis 6108: ossetprimitiveparams temporary/phantom problem
...
Corrected to ensure that the target prim is updated by
osSetPrimitiveParams when setting PRIM_TEMP_ON_REZ and/or PRIM_PHANTOM
instead of the prim that the script is in.
2013-06-15 00:00:00 +01:00
db9d9d83eb
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-06-14 23:58:16 +01:00
d412c1b0eb
Don't try to abort worker threads in WebFetchInvDescModule if module was not enabled.
...
This also moves the abort to RemoveRegion() rather than a destructor.
2013-06-14 23:53:20 +01:00
d7f3d7efd2
Merge branch 'master' of /home/opensim/src/opensim
2013-06-13 09:27:13 -04:00
b2c8d5eec7
Add Option: ClassifiedFee
...
Add option to set minimum fee for publishing classifieds. Many viewers have a
hard coded minimum of 50, which makes publishing classifieds fail where grids
have no economy. This allows the grid to set the minimum fee to a suitable
value for their operation.
The option is located in the [LoginService] section and defaults to 0. The
value is sent as "classified_fee" in the login response.
2013-06-13 09:18:27 -04:00
9975c5674c
Merge branch 'master' into careminster
2013-06-13 02:49:43 +01:00
0be80e5813
Forward the reason to the script
2013-06-13 02:52:51 +02:00
62c277ff9f
Add a result param to te money module interface
2013-06-13 02:52:11 +02:00
689969e143
* This fixes having to select and deselect prim to get keyframemotion to start running when pulled from data storage.
...
Conflicts:
OpenSim/Data/SQLite/SQLiteSimulationData.cs
2013-06-13 02:50:39 +01:00
b271217084
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-06-12 17:48:48 -07:00
7c00ccb548
DataSnapshot: changed those annoying messages to Debug instead of Info.
2013-06-12 17:48:20 -07:00
6b8e94864a
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-06-13 00:33:53 +01:00
7759b05dcb
Make XInventoryServicesConnector properly handle a RESULT = false return for methods where this contains failure rather than throwing an exception.
...
Result = False is generated for methods such as GetFolderForType() when the other end wants to signal a failure of the operation in methods such as GetFolderForType()
2013-06-13 00:31:32 +01:00
3357300362
* This fixes having to select and deselect prim to get keyframemotion to start running when pulled from data storage.
2013-06-12 18:13:00 -05:00
824a4b4808
After calls to GetSuitcaseXFolder() in HGSuitcaseInventoryService, consistently check for null return and log warning rather than throw exception.
...
This was being done already in some places.
If an exception is thrown it is now an error rather than debug
2013-06-12 23:47:47 +01:00
ef5be42c86
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-06-12 23:32:51 +01:00
47b6e78790
Implement logging of first 80 characters (debug level 5) or full body data (debug level 6) on outgoing requests, depending on debug level
...
This is set via "debug http out <level>"
This matches the existing debug level behaviours for logging incoming http data
2013-06-12 21:34:20 +01:00
3cb65f0d31
BulletSim: when meshing or asset fetching fails, include position
...
and region with the offending object's name in the error message.
2013-06-11 17:58:08 -07:00
7556a0f699
Add TriggerScenePresenceUpdated events when an animation is added
...
or removed. Shouldn't impact anyone as only DSG seems to use
OnScenePresenceUpdated event.
Some minor format changes to AnimationSet's ToString().
2013-06-11 17:18:12 -07:00
135e10ba09
Uncomment Mic's code and split to create new regression TestAddTemporaryAsset() and TestAddTemporaryLocalAsset()
2013-06-11 23:55:45 +01:00
d8da83b4ff
Removed the lock entirely
2013-06-11 15:50:12 -07:00
a0fed03e10
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-06-11 15:36:52 -07:00
b33db917f5
Really bad idea to lock m_UserCache for so long in UserManagementModule. Added a special lock object instead, if we really want to avoid concurrent executions of that code.
2013-06-11 15:36:27 -07:00
26b66c730e
Put the "script saved" and "notecard saved" messages back into the bottom
...
right corner.
2013-06-11 21:03:16 +01:00
162dfd8a38
Merge branch 'avination-current' into careminster
2013-06-11 21:03:02 +01:00
400f876d98
Merge branch 'master' into careminster
2013-06-11 21:01:58 +01:00
a4a4898a0e
Put the "script saved" and "notecard saved" messages back into the bottom
...
right corner.
2013-06-11 20:39:09 +02:00
d47a18fd09
* Adds KeyFrameMotion storage support to SQLite, just a note, seems that there's still something wrong with keyframed motion starting when the sim starts up, you have to 'select' and 'deselect' the prim again to get it to appear to move. Not sure what this is but maybe melanie_t can comment on this.
...
* Has a prim table migration.. that might take a while, hold on to your hats.
* Fixes a null-ref when shutting down while keyframed motion is active.
2013-06-11 08:56:20 -05:00
ed950e6c74
Adjust output of llRot2Axis and llRot2Angle to match domains SL(tm) uses. Addresses Mantis #0006671
2013-06-11 00:29:40 -07:00
ba84074468
LSL_Rotation.Normalize() now returns 0,0,0,1 for x,y,z,s when normalization fails
2013-06-10 17:54:14 -07:00
9d9b9d4938
llRot2Angle now checks absolute value of s rotation component before normalizing
2013-06-10 17:11:49 -07:00
b242ead6df
llRot2Axis now checks absolute value of s rotation component before normalizing. Also removed some excessive division and cleaned up a bit
2013-06-10 17:10:04 -07:00
6b55be6e2f
Merge branch 'master' into careminster
2013-06-11 01:04:50 +01:00
a022ee5766
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
2013-06-11 01:03:15 +01:00
1c7fbb86c2
Check For NaN and Infinity in llRot2Axis/Angle Fixes mantis #6669
2013-06-10 18:47:08 -05:00
a949556c4e
add a Normalize() method for LSL_Rotation
2013-06-10 16:42:49 -07:00
7af97f88b7
Add port numbers to poll service thread names so that we can tell which belong to which HttpServer
2013-06-10 23:39:17 +01:00
32d1e50565
Reinstate explicit starting and stopping of PollServiceRequestManager added in 3eee991 but removed in 7c0bfca
...
Do not rely on destructors to stop things.
These fire at unpredictable times and cause problems such as http://opensimulator.org/mantis/view.php?id=6503
and most probably http://opensimulator.org/mantis/view.php?id=6668
2013-06-10 23:30:35 +01:00
a2f1cd87f8
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-06-10 15:15:38 -07:00
82e3b9a6e0
Fix test for adding temporary assets. Code for non-local temporary assets
...
is there but commented out.
2013-06-10 15:14:55 -07:00
795acaa6aa
BulletSim: add failure flag for meshing failure vs asset fetch failure
...
so error messages make more sense.
Change some BulletSim status log messages from WARN to INFO.
Update TODO list.
2013-06-10 14:12:45 -07:00
57141e34bf
Remove Temporary from use to shortcut asset stores. The Local property
...
differentiates between local & grid storage. The Temporary property just
says that which service handles the it, the asset can be safely removed
in the future.
2013-06-10 13:26:19 -07:00
7de0912a97
Mantis 5346: llAxisAngle2Rot() should normalize before computing
...
Corrected to agree with
http://wiki.secondlife.com/wiki/Llaxisangle2rot#Deep_Notes
to normalise the vector before computing the quaternion
Signed-off-by: dahlia <dahlia@nomail>
2013-06-10 04:13:34 -07:00
e741e5ebce
More on mantis #6666 -- Groups V2 remote connector.
2013-06-09 20:20:37 -07:00
745a209bf2
Explicitly set uploaded mesh object perms
2013-06-10 01:16:22 +02:00
925a8d47eb
Merge branch 'avination-current' into ubitwork
2013-06-08 19:19:51 +01:00
244f6fa5cd
Merge branch 'avination-current' of ssh://3dhosting.de/var/git/careminster into avination-current
2013-06-08 19:18:47 +01:00
4e2e69bd25
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-06-08 11:01:20 -07:00
d00770d56b
Groups V2 -- fix mantis #6666
2013-06-08 11:00:22 -07:00
75e4af9d39
Catch exception triggered by incoming avatars using legacy profiles
2013-06-08 11:00:05 -04:00
8582b2b992
Make objects attached from the ground appear in inventory again. Fixes a number
...
of interaction issues causing client crashes.
2013-06-08 02:32:05 +02:00
34d40e46a5
Merge branch 'profiles'
...
message to explain why this merge is necessary,
2013-06-07 20:17:45 -04:00
1cb1245d84
SQLite support for UserProfiles
2013-06-07 20:14:39 -04:00
1387224821
Ensure selected module is the only active one
2013-06-07 20:09:10 -04:00
6aa54a8e16
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-06-07 16:01:07 -07:00
cf4d291443
Merge branch 'master' into careminster
2013-06-08 00:00:39 +01:00
07cc16ff9c
Put the configuration back in FetchInventoryDesc2 cap.
2013-06-07 16:00:32 -07:00
3a722ef81b
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2013-06-07 23:59:02 +01:00
75631e0267
Supply proper type information for the various types of requests
2013-06-07 23:55:03 +01:00
7c0bfca7a0
Adding Avination's PollService to round out the HTTP inventory changes
2013-06-07 23:43:45 +01:00
454499ff60
minor: Comment out debug logging (at warn level) about number of objects force selected and turn down to debug level
2013-06-07 23:38:23 +01:00
ed7fe6239c
add indexes for new visual parameters shape_hover and
...
APPEARANCEMESSAGE_VERSION. For reference only, this aren't used in sim for
now
2013-06-07 23:18:48 +01:00
45e333652c
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
2013-06-07 23:09:53 +01:00
17a902fed4
Clean up poll service
2013-06-07 22:39:27 +02:00
f2a4d9b99c
Fix regression where multiple close agents could be sent to the wrong neighbour region on root agent close.
...
This was introduced in git master d214e2d0http://opensimulator.org/mantis/view.php?id=6658
2013-06-07 19:13:24 +01:00
a74e65200c
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-06-07 19:12:55 +01:00
045c26f626
In LocalFriendshipTerminated, send the original client's agentId to the friend being removed instead of the friend's own id.
2013-06-07 18:43:00 +01:00
664c6191ed
Mantis #6620 (removed debug message)
2013-06-07 08:37:18 -07:00
dd7404d850
Merge branch 'master' into careminster
2013-06-06 23:50:03 +01:00
ac9c37f31b
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2013-06-06 23:49:34 +01:00
06012f8675
Fix keyframe motion copyright
2013-06-06 23:49:02 +01:00
c173c2eed5
try to suspend and resume keyframes on copy to inventory to take copy
...
doesn't destroy state
2013-06-06 19:21:21 +01:00
8bfd5c8927
Merge branch 'avination-current' into ubitwork
2013-06-06 19:03:32 +01:00
18e4496d2d
keyframe: add more locks, change timming stop, added Suspend and resume
2013-06-06 18:57:32 +01:00
25fa647a74
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-06-05 20:20:22 -07:00
2ebf70d719
Strengthen some assumptions.
2013-06-05 20:19:59 -07:00
fe4a67efb6
Merge branch 'avination-current' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
OpenSim/Region/Framework/Interfaces/IDynamicMenuModule.cs
OpenSim/Region/OptionalModules/ViewerSupport/DynamicMenuModule.cs
OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
2013-06-06 03:20:15 +01:00
a3210d1cf8
Database persistence for keyframes. Contains a Migration.
2013-06-06 03:17:38 +01:00
ea9e1d1a1e
Merge commit 'e449950030decf7e65e7d9b334ddaed25c1bd629' into careminster
2013-06-06 03:04:47 +01:00
81ad9255b5
Hook up Keyframe motion to almost everything. Failing to cross a sim border
...
may yield unexpected results in some cases. No database persistence yet,
2013-06-06 03:03:05 +01:00
e1d98c9e4c
Committing Avination's Keyframe module. This is not hooked up yet and will do nothing. More commits to follow.
2013-06-06 02:25:19 +01:00
c5d967b946
Merge branch 'avination-current' into ubitwork
2013-06-06 00:37:06 +01:00
26cd59cd6f
Merge branch 'master' of /home/opensim/var/repo/opensim
2013-06-05 18:55:42 -04:00
e53b62304f
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2013-06-05 23:44:26 +01:00
a7dbafb0e3
Port Avination's inventory send throttling
2013-06-05 23:42:50 +01:00
e449950030
Prevent processing for Npc
2013-06-05 18:42:15 -04:00
cd64da8746
Cleanup
2013-06-05 18:41:55 -04:00
47ffa12078
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-06-05 22:26:42 +01:00
f41fc4eb25
Avoid a deadlock where a script can attempt to take a ScriptInstance.m_Scripts lock then a lock on SP.m_attachments whilst SP.MakeRootAgent() attempts to take in the opposite order.
...
This is because scripts (at least on XEngine) start unsuspended - deceptively the ResumeScripts() calls in various places in the code are actually completely redundant (and useless).
The solution chosen here is to use a copy of the SP attachments and not have the list locked whilst creating the scripts when an avatar enters the region.
This looks to address http://opensimulator.org/mantis/view.php?id=6557
2013-06-05 22:20:48 +01:00
10572b78f8
Remove a couple of orphaned lines
2013-06-05 15:10:53 -04:00
b4f472c4fa
Make locking more uniform
2013-06-05 15:08:25 -04:00
b5d0ac4c42
BulletSim: default PhysicsTimeStep to same as the simulator's
...
heartbeat timestep when running the physics engine on a separate
thread. This reduces the occurance of heartbeats that happen when
there is no physics step which is seen as vehicle jerkyness.
2013-06-05 07:12:14 -07:00
0c971d148c
BulletSim: fix corner case when rebuilding a compound linkset while
...
a mesh/hull while a mesh or hull is being rebuilt when its asset
is fetched. This fixes a 'pure virtual function' crash when changing
physical state of complex linksets that include many meshes.
2013-06-05 07:09:43 -07:00
648e258b8e
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs
2013-06-04 21:09:25 +01:00
57c8d82c9e
Fix llTeleportAgentGlobalCoords
2013-06-02 23:53:20 +02:00
e2d4cb870e
Unsit seated avatars when an object is deleted
2013-06-02 23:53:07 +02:00
bd87eb90d1
Implement PERMISSION_TELEPORT and the needed checks to make it work.
...
Old auth system still works as well.
2013-06-02 16:28:28 +02:00
07058b044b
BulletSim: experimental movement of physics execution off of heartbeat
...
thread. Off by default until more testing.
Setting "[BulletSim]UseSeparatePhysicsThread=true" causes the physics
engine to be called on its own thread and the heartbeat thread only
handles the reporting of property updates and collisions. Physics frame
rate is about right but physics execution time goes to zero as accounted
by the heartbeat loop.
2013-06-01 14:52:44 -07:00
d7fa9f671e
Adding standard OpenSim header to source files
2013-05-31 22:03:27 -04:00
ba2f13db63
Adding back the BasicProfileModule
2013-05-31 21:19:15 -04:00
8fe2308afc
Merge branch 'avination-current' into ubitwork
2013-05-31 23:18:12 +01:00
217c7d1140
Remove unnecessary m_scenes and m_scene from AsyncCommandManager.
...
These were private and the sole point of use (to know when to load config for the first time) can be done by looking at script engines instead.
2013-05-31 23:00:10 +01:00
921ad8704e
Lock areas of AsyncCommandManager where multiple threads could try to access/update the same static structures simultaneously.
...
This is possible where there is more than one scene (multiple copies of the same script engine) and/or more than one script engine being used.
These operations are not thread safe and could be leading to the exceptions/problems seen in http://opensimulator.org/mantis/view.php?id=6651
This also prevents a small race condition where more than one AsyncLSLCmdHandlerThread could be started.
2013-05-31 22:50:15 +01:00
9589a09eda
Fix multi-wear of alpha and tattoo layers.
2013-05-31 22:02:31 +02:00
70d5c29310
Stop sending velocity to avoid snap-back
2013-05-31 21:55:56 +02:00
00c1586ff8
refactor: Remove unused AsyncCommandManager.PleaseShutdown
2013-05-31 18:12:36 +01:00
bf03523323
Fill in fields with default values on profile creation
2013-05-31 10:40:47 -04:00
924a5df25f
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-05-30 19:20:36 -07:00
e85c70223a
Merge branch 'work' contains UserProfiles with Robust service and updates region module using JsonRpc messaging. Requres no databse changes (but backup existing data before use).
2013-05-30 22:16:42 -04:00
4d32ca19bf
Trigger OnScenePresenceUpdated when the avatar's animations change.
2013-05-30 19:16:36 -07:00
48a175eff7
Add methods to Animation and AnimationSet for easier manipulation and
...
display of groups of animations (Equal(), ToString(), FromOSDArray(), ...).
No functional change to animations.
2013-05-30 19:16:34 -07:00
439f11cc3c
Add region heartbeat start event to complement heartbeat end event.
...
This allows object modification before the usual heartbeat operation.
2013-05-30 19:16:31 -07:00
46335b103e
If an exception occurs in the AsyncCommandManager loop, spit it out to log rather than silently swallowing it.
...
This might help diagnose the cause of http://opensimulator.org/mantis/view.php?id=6651 where sometimes scripts fail to start on region start.
2013-05-30 23:51:35 +01:00
328883700a
UserProfiles
...
UserProfiles for Robust and Standalone. Includes service and connectors for Robust and standalone opensim plus matching region module.
2013-05-30 17:59:18 -04:00
6b88a665d3
minor: fix warnings in GodsModule that were due to duplicate using statements
2013-05-30 22:43:52 +01:00
12a3b85561
Fix passing of voice distance attenuation to the Vivox voice server.
...
Because of a typo, this wasn't being done at all - now the 'default' value as described in OpenSimDefaults.ini of 10m is passed (vivox_channel_clamping_distance)
Thanks to Ai Austin for spotting this.
2013-05-30 22:20:02 +01:00
669fa3ff9a
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs
2013-05-30 21:48:09 +01:00
8f9a726465
If on a sit request we sit the avatar on a different prim in a linkset for some reason (e.g. because it has a sit target), then send the actual sit prim UUID to the viewer rather than the requested one.
...
This purports to fix the issue described in http://opensimulator.org/mantis/view.php?id=6653 where the camera can end up following the requested sit prim rather than the actual.
The original spot was by Vegaslon, this commit just goes about it in a slightly different way
This commit also makes m_requestedSitTargetUUID to be the actual UUID, which is consistent with m_requestedSitTargetID which was already doing this.
However, this adjustment has no practical effect since we only currently need to know that there's any requested sit UUID at all, not which one it is.
2013-05-30 19:27:20 +01:00
cc7aa88b26
Try caching the user name for a new agent earlier on in the process of establishing a connection, to see if this helps with "Unknown UserUMMTGUN" issues.
...
The UMMTGUN form of Unknown User seems to appear because a viewer sometimes sends a UUIDNameRequest UDP request that fails to find a binding.
However, in theory the incoming agent should have made that binding before any such request is triggered.
So moving this binding to an earlier point in the process to see if this makes a difference.
Unknown user name is also updated to UserUMMTGUN2 - if you see the old name then you need to clear your viewer cache.
This relates to http://opensimulator.org/mantis/view.php?id=6625
2013-05-29 23:08:54 +01:00
f9ee9efb97
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-05-29 22:40:51 +01:00
4898f18f89
Add HG regression TestCachedUserNameForNewAgent()
2013-05-29 21:28:38 +01:00
4709436a6c
retouch prim stopped condition test
2013-05-29 20:23:52 +01:00
a6b964aa11
removed spurius ref to ode.dll from odeapi
2013-05-29 19:51:45 +01:00
d5b1baffec
correction to previus comment: all parameters but gravity modifier have
...
efect on all prims.
2013-05-29 06:45:25 +01:00
269febc87e
let gravity modifier, friction, restitution and density changes be applied
...
to prim. Only have efect on root prim. Density doesn't get effect
imediatly, only on next change of size or shape. density change
implies a full body rebuild to be done later, after reducing the number
of sets sop does. Other parameters should work. **** mainly untested ***
2013-05-29 06:32:26 +01:00
233b9ec4d7
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-05-28 20:59:54 -07:00
7e1c7f54c7
First change in Vivox for ages! -- added a lock to serialize calls to vivox servers. This may ameliorate things when lots of avies arrive in a sim at about the same time. Turns out that there are 4 http requests per avie to Vivox.
2013-05-28 20:59:25 -07:00
1cf24b7092
make sure friction slip parameters are zero ( or other value ) and not
...
default cmf
2013-05-29 04:47:59 +01:00
0882846770
missing file
2013-05-29 02:21:02 +01:00
f00ecf5fe7
missing files
2013-05-29 02:18:05 +01:00
4e72cf9ee2
*** DANGER TESTING **** changed prims mesh generation hopefully removing
...
spurius faces. CHanged several aspects. Fixed prims inertia that was too
low, still using box as model. Increased number of quickstep SOR
iterations to 15. Keep it 15 even on heavy load ( will only jump
simulation time).
2013-05-29 02:08:14 +01:00
ae0d6ab28a
BulletSim: don't zero motion when changing vehicle type.
...
Some vehicle scripts change type on the fly as an easy way of setting
all the parameters (like a plane changing to a car when on the ground).
2013-05-28 09:19:08 -07:00
7c3a46ccea
BulletSim: default using mesh asset hulls to 'true'. This means that,
...
if the mesh asset specifies physics hulls, BulletSim will fetch and
use same rather than approximating the hulls. If physics hulls are not
specified, the representation will fall back to the regular physics mesh.
2013-05-27 14:38:59 -07:00
0c35d28933
BulletSim: enable GImpact shape for prims with cuts. Include DLLs and SOs
...
which recompute GImpact shape bounding box after creation as Bullet
doesn't do that itself (something it does for nearly every other shape).
Now, physical prims without cuts become single mesh convex meshes. Physical
prims with cuts become GImpact meshes. Meshes become a set of convex
hulls approximated from the mesh unless the hulls are specified in the
mesh asset data. The use of GImpact shapes should make some mechanical
physics more stable.
2013-05-26 17:35:12 -07:00
a348c8e44a
Allow Linden trees to preserve their type when taken into inventory and rezzed again. Allow Linden trees to be sensed by LLSensor as PASSIVE objects.
2013-05-26 14:11:48 +02:00
533bbf033d
Update the money framework to allow sending the new style linden "serverside is now viewerside" messages regarding currency
...
This will require all money modules to be refactored!
2013-05-25 02:08:54 +01:00
ec22c84cb1
Merge branch 'master' into careminster
2013-05-25 02:00:22 +01:00
2b87fb73a9
Merge commit '440905ad14d4261df9da0fd2ce7e20a350982af1' into careminster
2013-05-25 02:00:02 +01:00
0086c3b5fb
Update the money framework to allow sending the new style linden "serverside is now viewerside" messages regarding currency
...
This will require all money modules to be refactored!
2013-05-25 01:58:50 +02:00
1821372634
Meshmerizer: remember to add the copied hull verts to the list of hulls.
2013-05-24 16:32:19 -07:00
5f1f5ea5ab
BulletSim: add VehicleInertiaFactor to allow modifying inertia.
...
Another parameter for vehicle operation tuning.
Default to <1,1,1> which means nothing is different under normal use.
2013-05-24 16:24:16 -07:00
4979940def
BulletSim: properly set mesh hash key in use tracking structure.
...
Shouldn't see any functional difference.
2013-05-24 16:23:10 -07:00
81a6c39781
Meshmerizer: add INI parameter to enable DEBUG mesh detail logging.
...
Default to off.
To turn mesh parsing DEBUG detail logging on, add
[Mesh]
LogMeshDetail=true
to the INI file.
2013-05-24 16:20:26 -07:00
a087dbed7f
One more appearance change: drop sending the SendAppearance packet
...
to avatar when it becomes root. This packet shows up in the viewer
logs as an error and appears to cause problems for completing the
texture rebake process for v1 viewers in some cases.
2013-05-24 13:26:07 -07:00
bb0ea25090
Protect one more update of the baked texture hashes.
2013-05-24 13:25:25 -07:00
681fbda4b6
This is an experimental patch that adds support for comparing texture
...
hashes for the purpose of accurately responding to AgentTextureCached
packets. There is a change to IClientAPI to report the wearbles hashes
that come in through the SetAppearance packet. Added storage of the
texture hashes in the appearance. While these are added to the
Pack/Unpack (with support for missing values) routines (which means
Simian will store them properly), they are not currently persisted in
Robust.
2013-05-24 13:18:16 -07:00
440905ad14
change a hull debugging message to Debug instead of Info
2013-05-24 10:31:14 -07:00
21a3a81c7a
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-05-24 01:54:28 -07:00
0cdea5c2f3
correct some errors in decoding of mesh asset convex decomposition data
2013-05-24 01:53:37 -07:00
e2e839a0cd
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs
2013-05-24 01:11:49 +01:00
eb2bd9d203
minor: Remove unnecessary duplication of AbsolutePosition Vector3 in SOG.Copy()
...
As a struct, Vector3 has already been cloned by MemberwiseClone()
2013-05-24 00:46:58 +01:00
09c2cd0d76
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2013-05-24 00:45:08 +01:00
02fe05f346
Fix issue where llSetPayPrice on either one of a clone prim in the same OpenSimulator session would change the prices on both prims.
...
This is because the PayPrice array refernence was being memberwise cloned and not the array itself.
Addresses http://opensimulator.org/mantis/view.php?id=6639
2013-05-24 00:41:47 +01:00
027580935a
Reset "Show in search" on parcels cut off other parcels that are in search
2013-05-24 01:09:07 +02:00
e597a7d94e
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-05-23 23:53:44 +01:00
9b56f99326
Fix bug where a cloned object would report the wrong llGetNumberOfPrims() when avatars had been sitting on the original and a different avatar sat on the copy within the same opensim session.
...
This was because the sitting avatars list was being cloned rather than reset.
Addresses http://opensimulator.org/mantis/view.php?id=6649
2013-05-23 23:52:07 +01:00
d90d8e9999
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-05-23 15:48:47 -07:00
c5549d2730
add decoder for bounding convex hull
2013-05-23 15:47:47 -07:00
9ba35c6b7e
Port fix from justicc - decouple pay prices on drag-copied prims
2013-05-24 00:45:30 +02:00
0d5566e879
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-05-23 23:07:46 +01:00
28548ab347
Fix bug where both ordinary UserManagementModule and HGUserManagementModules were being added to scenes if no UserManagementModule was specified.
...
Without explicit config non-hg UMM is used - this is in common with other HG modules.
This was causing a non-HG module to unpredictably use the UMM or HGUMM, though lack of bug reports suggest either UMM was always used or it didn't matter in this case.
2013-05-23 23:05:56 +01:00
0e002e3693
Add DEBUG level logging in Meshmerizer for mesh parsing. There is
...
a compile time variable to turn this logging off if it is too spammy.
2013-05-23 14:41:05 -07:00
29b3b44fab
BulletSim: add locking around Meshmerizer use to eliminate possible race
...
condition when extracting the convex hulls.
2013-05-23 14:40:16 -07:00
5efce21abc
BulletSim: correct errors caused by misspelled INI parameter spec.
...
Add debugging messages for hull asset use.
2013-05-22 21:57:07 -07:00
ffc9b3dda7
BulletSim: add code to experimentally use asset hull data.
...
Default to 'off' as it needs debugging.
2013-05-22 21:01:00 -07:00
61cdf9390d
BulletSim: fix problem with walking up stairs that are oriented
...
in certain directions. The problem was really that the avatar capsule
orientation was being set incorrectly.
2013-05-22 16:06:06 -07:00
4cb7ee47f2
Let the event queue do lees work - expire every 40s as per Teravus instead of every seconds - whoever put that in....
2013-05-22 23:49:34 +02:00
7d38f4940c
Implement llSetSoundQueueing().
...
This is controlled by the viewer, not the server.
So as per http://wiki.secondlife.com/wiki/LlSetSoundQueueing , only two sounds can be queued per prim.
You probably need to use llPreloadSound() for best results
2013-05-22 20:01:57 +01:00
6596a1de80
Revert "BulletSim: add code to experimentally use asset hull data."
...
This reverts commit 2fd8819a04
2013-05-21 22:16:18 -07:00
2fd8819a04
BulletSim: add code to experimentally use asset hull data.
...
Default to 'off' as it needs debugging.
2013-05-21 21:32:30 -07:00
9de3979f5b
BulletSim: add gImpact shape type. Add logic to use gImpact shape
...
for prims that have cuts or holes. Default logic to 'off' as it
needs debugging.
2013-05-21 15:32:10 -07:00
ece7b33a96
Merge branch 'master' of git://opensimulator.org/git/opensim
2013-05-21 15:31:13 -07:00
06ab168897
To further help with tracking down the apperance of too much "Unknown User" in chatlogs, etc. temporarily change each instance of this in OpenSimulator so we can identify where it's coming from
...
For instance, the "Unknown User" in Util.ParseUniversalUserIdenitifer becaomes "Unknown UserUPUUI (class initials + method initials)
This is to help with http://opensimulator.org/mantis/view.php?id=6625
2013-05-21 22:26:15 +01:00
ba6a6b2d40
Fix compile failure from recent git master 434c3cf
2013-05-21 18:18:16 +01:00
434c3cf83b
Make "show name" command display HomeURL like "show names"
2013-05-21 18:15:22 +01:00
5c8d38d6cf
minor: Change "show names" command to use consistent console display table
2013-05-21 18:11:07 +01:00
6edecd5d94
Add "show name" console command to make it possible to show a single binding of a UUID to a name.
2013-05-21 18:00:41 +01:00
c47de9878d
Log when "Unknown User" is sent to a user because the UMM had no binding for that UUID and when a binding replaces a previous "Unknown User" entry.
...
This is a temporary measure to hunt down issues where some but not all users see others as "Unknown user" in text chat, etc.
http://opensimulator.org/mantis/view.php?id=6625
2013-05-21 17:45:15 +01:00
6ae426c96b
Lock m_UserCache whilst iterating over it in UserManagementModule.GetUserData() to avoid concurrency exceptions
2013-05-21 17:25:06 +01:00
10e4fb2ce2
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-05-20 09:26:15 -07:00
26904cc5a1
Add comment
2013-05-20 09:25:50 -07:00
e65d1e459e
fix error in hull point indexing
2013-05-18 13:11:22 -07:00
477bee6468
remove duplicate hull scaling
2013-05-18 11:15:05 -07:00
fa8f5bafb2
add prototype code to decode convex hulls from mesh assets. Please do not use yet; the interface will be defined in a later commit.
2013-05-18 01:23:09 -07:00
214bae1479
BulletSim: fix BulletSim crashing if there is no [BulletSim] section
...
in any INI file. Update TODO list.
2013-05-17 21:19:38 -07:00
42c82b564e
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
2013-05-16 21:59:14 +01:00
ec818a506b
minor: remove long commented out scene cache clearing code in EntityTransferModule.CrossAgentToNewRegionAsync()
2013-05-16 18:26:22 +01:00
61f4ab6674
minor: Remove completely unused IClientAPI.RequestClientInfo() call from EntityTransferModule.CrossAgentToNewRegionAsync()
2013-05-16 18:25:04 +01:00
3bc8cf65a4
Where this is not already happening, trigger asychoronous calls to CloseChildAgent() above the LocalSimulationConnector level.
...
This is so that other callers (such as SceneCommunicationService.SendCloseChildAgentConnections() can perform all closes asynchronously without pointlessly firing another thread for local closes).
No functional change apart from elimination of unnecessary chaining of new threads.
2013-05-16 17:30:30 +01:00
d214e2d0c4
On closing child agents, send separate asynchronous requests to each neighbour rather than sending all closes concurrently on a separate thread.
...
This is to reduce race conditions where neighbours may be responding erratically, thus mixing up create and close agent requests in time.
This mirrors OpenSimulator behaviour on enabling child agents where each region is contacted separately.
2013-05-16 17:12:02 +01:00
bd31821792
On logout, send close child agent requests to neighbours asynchronously, so user is not prevented from relogging if many neighbours are present but not responsive.
...
The symptom here is that previous user connections are still present but are labelled active == false
2013-05-16 16:37:21 +01:00
46eb8465a0
fall back to using a display mesh for physics proxy if no physics_mesh entry was wound in a mesh asset
2013-05-15 17:12:17 -07:00
a4290cdbb3
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-05-15 22:06:01 +01:00
177a53fbcf
Fix issue where osMakeNotecard() would fail if given a list containing vectors or quaternions.
...
http://opensimulator.org/mantis/view.php?id=6640
2013-05-15 22:04:38 +01:00
477a5e3a35
* This fixes the avatar stuck in objects on login and teleport by gently applying an upward motion when stuck in things on the Z
...
* Comments describe how it filters out good, normal collisions, from 'stuck' collisions.. It's especially sensitive in feetbox collisions since this is where normal collisions happen under usual circumstances.
2013-05-14 20:55:56 -04:00
799ba5aa7b
* Tweaks the hard cut to apply to collisions of Greater then Normal Z 0.95. This fits within Ubit's framework of multi-body collisions, just moves the reactive force to the Midboxgeom(actual detection) instead of the bigbox geom(pre detection)
2013-05-14 19:17:31 -04:00
23ebae1828
Eliminate race condition where SimStatsReporter starts reporting
...
stats before the region is completely initialized.
2013-05-14 13:40:07 -07:00
df2a0fec5f
Comment out log message about looking for asset data in remove asset service for now, in order to reduce log levels in a test region with many hg origin avatars
2013-05-14 20:11:58 +01:00
ce979552fd
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-05-14 19:45:35 +01:00
e9847a4dbd
Comment out some debugging item permission messages since these are highly noisy on the console.
...
Please re-enable when required
2013-05-14 19:44:41 +01:00
f8bb90d963
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-05-14 09:07:20 -07:00
91091c3e54
Second take at HGTP-mesh bug: delay sending the initial data only for agents that are coming via TP (root agents)
2013-05-14 09:06:58 -07:00
03fddb301b
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-05-14 08:49:41 -07:00
b135f1d58a
BulletSim: Fix for mantis 6487, also minor adjustment to fix flying while you are running.
...
Signed-off-by: Robert Adams <Robert.Adams@intel.com>
2013-05-14 08:48:40 -07:00
645da54f25
Revert "HGTP-mesh bug: the mesh download requests were going to the departing sims for a little while. This was also true for local TPs. BUt for local TPs the assets are on the same server, so it doesn't matter. For HGTPs, it matters. This potential fix moves sending the initial data to later, after the client has completed the movement into the region. Fingers crossed that it doesn't mess other things up!"
...
This reverts commit f32a21d967
2013-05-14 08:47:18 -07:00
66c328f51b
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-05-14 08:12:23 -07:00
f32a21d967
HGTP-mesh bug: the mesh download requests were going to the departing sims for a little while. This was also true for local TPs. BUt for local TPs the assets are on the same server, so it doesn't matter. For HGTPs, it matters. This potential fix moves sending the initial data to later, after the client has completed the movement into the region. Fingers crossed that it doesn't mess other things up!
2013-05-14 08:12:01 -07:00
c86e828dbf
BulletSim: add a lock to try and catch a native shape creation/destruction
...
race condition.
2013-05-13 13:30:44 -07:00
15360cbb6b
BulletSim: add adjustment for avatar capsule height scaling. Makes
...
avatar standing on ground view better and enables tuning.
2013-05-13 13:30:42 -07:00
45f37e11ad
BulletSim: use heightmap terrain when using BulletXNA.
...
Output messages on features disabled when using BulletXNA.
2013-05-13 13:30:40 -07:00
4194d935ec
Fixed mantis #6609 -- LoadPlugin error messages on Robust.
2013-05-13 13:07:39 -07:00
af1fa95875
Groups: Improve error handling on remote connector.
2013-05-13 11:36:17 -07:00
25fea82049
Fixes mantis #6636 -- Groups
2013-05-13 07:29:17 -07:00
f9daf921f7
Explicitly zero avatar velocity on sit
2013-05-13 03:29:11 +02:00
296b43f597
Small adjustments to the floater module
2013-05-13 02:15:48 +02:00
e8f4c7128f
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
OpenSim/Region/Framework/Scenes/Scene.cs
2013-05-12 03:24:57 +01:00
a4431381fa
Finalize the logic for SetHome. See comments in Land/LandManagementModule.cs about who has permission to set home where.
2013-05-11 07:58:14 -07:00
3f6071ce3a
Guard against trying to access terrain heights out of bounds. Clamp to sim.
2013-05-11 16:16:02 +02:00
8ade6fa617
Refactor to get closer to core
2013-05-11 16:15:39 +02:00
ab4d530462
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-05-11 07:15:31 -07:00
48f8b884c3
Handle SetHome properly
2013-05-11 07:15:09 -07:00
13cd8c17d7
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Services/LLLoginService/LLLoginResponse.cs
OpenSim/Services/LLLoginService/LLLoginService.cs
OpenSim/Tests/Common/Mock/TestClient.cs
2013-05-11 02:35:26 +01:00
55c9bc15e5
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2013-05-11 01:29:30 +01:00
81d8deb1a8
Send up the part missing from the Avination Estate commit.
...
Warning - contains a small migration.
2013-05-11 01:27:37 +01:00
a42bb799cc
BulletSim: fix CPU loop that occurs when any 'degenerate' sculptie
...
is in a region. This fixes the high CPU usage for regions with nothing
else going on.
2013-05-10 14:48:52 -07:00
a1031772eb
Delete debug message
2013-05-10 08:09:26 -07:00
ff0332730d
Implement delete key for local console
2013-05-09 23:11:37 +01:00
292a6037ad
minor: Remove unnecessary code that was generating warning in TestXInventoryDataPlugin
2013-05-09 22:48:10 +01:00
0e6ad94829
minor: Remove mono compiler warning in RemoteAdminPlugin
2013-05-09 22:44:45 +01:00
9978f36d9f
Don't send BulkUpdateInventory at the end up of UpdateInventoryItemAsset().
...
This is causing editing of worn clothes to fail frequently, possibly due to a race condition with a transaction.
This looks to address http://opensimulator.org/mantis/view.php?id=6600
2013-05-09 22:43:16 +01:00
b4a6f2195d
Only send one kill object to the deleter when they derez an object rather than two.
...
Extend regression test to check this.
2013-05-09 18:53:34 +01:00
3290cd09d3
remove pointless region handle paramter from IClientAPI.SendKillObject()
2013-05-09 18:12:17 +01:00
2cb2f1d7e3
Fix issue where objects removed via llDie() would not disappear for users looking in from neighbouring sims.
...
This was because this particular code path (unlike user delete) only sent kills to root presences, for no apparent good reason.
Added regression test for this case.
This fixes http://opensimulator.org/mantis/view.php?id=6627
2013-05-09 18:02:19 +01:00
2b0b9f3e6c
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-05-09 18:01:49 +01:00
641c636790
minor: Simplify test setup in SceneObjectDeRezTests since permissions module doesn't need different configuration anymore
2013-05-09 16:43:16 +01:00
182ea00cb3
Application support:
...
Adding some viwer supported url settings for destination guide and avatar picker apps. URL for the destinations should be: "secondlife:///app/teleport/slurl"
2013-05-09 10:50:18 -04:00
cdaceea5a6
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Framework/IClientAPI.cs
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
2013-05-08 21:51:48 +01:00
543d1fe70b
Guard the scene list when estates are updated
2013-05-08 21:14:52 +01:00
33aaa40bee
Adds an event and a method so that handling of the CachedTexture
...
packet can be pulled out of LLClientView and moved to
AvatarFactory. The first pass at reusing textures (turned off by
default) is included. When reusing textures, if the baked textures
from a previous login are still in the asset service (which generally
means that they are in the simulator's cache) then the avatar will not
need to rebake. This is both a performance improvement (specifically
that an avatars baked textures do not need to be sent to other users
who have the old textures cached) and a resource improvement (don't
have to deal with duplicate bakes in the asset service cache).
2013-05-08 13:13:51 -07:00
bda4565067
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
2013-05-08 20:59:44 +01:00
6f5222e863
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-05-07 18:02:25 -07:00
e92c05ebbd
Added AvatarPickerSearch capability handler.
2013-05-07 18:01:48 -07:00
ac6dcd35fb
Bulletsim: and the rotational friction.
...
Signed-off-by: Robert Adams <Robert.Adams@intel.com>
2013-05-07 07:14:10 -07:00
f247ae1a75
BulletSim: Another way to create vehicle framed friction.
...
Signed-off-by: Robert Adams <Robert.Adams@intel.com>
2013-05-07 07:14:06 -07:00
ddd97cb78e
BulletSim: normalize quaternian rotations when building compound linksets.
...
Attempt to fix vehicles being twisted off the ground when they go physical.
2013-05-06 18:06:34 -07:00
84118c5735
BulletSim: properly free references to simple convex hull shapes. Didn't
...
loose memory since shapes are shared but did mess up usage accounting.
2013-05-06 18:05:37 -07:00
1c6b8293d7
Step 3: Commit the Avination XEstate estate comms handler
...
This adds estate-wide Teleport Home and Teleport All User Home as well
2013-05-07 00:52:40 +01:00
5d5edde429
Step 2: commit the IEstateModuleInterface changes needed
2013-05-07 00:37:45 +01:00
4c83b5e719
Step one of estate settings sharing - port the Avination Estate module (complete module) as changes are too extensive to apply manually
2013-05-07 00:31:11 +01:00
93e1986d69
BulletSim: apply linear and angular friction in vehicle coordinates
...
and not world coordinates.
2013-05-06 16:48:01 -07:00
54d0cd85ad
Merge branch 'master' into careminster
2013-05-07 00:30:59 +01:00
b36e123c7f
Merge branch 'master' into careminster
2013-05-06 23:47:19 +01:00
e94b240f3d
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
2013-05-06 23:42:39 +01:00
045aaa838a
BulletSim: remove friction calcuation from BSMotor and move linear and
...
angular friction computation into linear and angular movement code.
The friction wasn't being applied properly. This will make it so vehicles
don't drift as much and the drift is tunable by changing the friction
timescales.
2013-05-06 13:32:26 -07:00
bf31896983
BulletSim: simplify parameter specification by reducing the number of
...
specifications required for simple properties with defaults.
2013-05-06 13:32:24 -07:00
f9fb1484aa
BulletSim: extend BSActorLockAxis to allow locking linear movement in
...
addition to angular movement. Not enabled by anything yet.
2013-05-06 13:32:22 -07:00
90f03ccd42
Added new method to Remote Admin for reloading the estate settings. This is meant to be called when some other program has changed the data on the backend.
2013-05-06 11:47:55 -07:00
a81ddf3d70
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-05-06 09:18:17 -07:00
ad00466483
Minor reordering of operations on NewUserConnection. The agent circuit needs to be added earlier for some of the checks to work correctly.
2013-05-06 09:17:54 -07:00
cbae04ba97
Remove dumb "Region found!" message from map search
2013-05-06 06:15:47 +02:00
a8faed6f76
Implement llSetContentType using the new OpenID auth support for authentication
2013-05-05 22:01:07 +02:00
3aa83738e2
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Application/OpenSimBase.cs
OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
2013-05-04 01:22:12 +01:00
2332453974
Add RegionManager level and the ability to use literal XML to the dynamic floater module
2013-05-04 00:45:27 +02:00
4904d40138
Add llGetPhysicsMaterial
2013-05-04 00:44:47 +02:00
1ffa69f691
Merge branch 'master' into bulletsim4
2013-05-03 14:25:52 -07:00
5d25bb3084
BulletSim: zero vehicle motion when changing vehicle type.
...
Rebuild compound linkset of any child in the linkset changes shape.
Comments and better detailed logging messages.
2013-05-03 14:23:53 -07:00
5d93c99e8c
Fix possible race condition with local region cache if a region was added after startup.
2013-05-03 18:56:58 +01:00
7ca42d5711
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-05-03 18:51:29 +01:00
304c5d4a8b
On startup, start scenes after we're set up all local scenes, rather than starting scenes before others have been created.
...
This aims to avoid a race condition where scenes could look to inform neighbours that they were up before those neighbours had been created.
http://opensimulator.org/mantis/view.php?id=6618
2013-05-03 18:48:50 +01:00
4042c82a72
BulletSim: prims with no cuts created with single convex hull shape.
...
Parameter added to enable/disable this feature.
2013-05-02 12:27:30 -07:00
d9c3947824
BulletSim: Rebuild physical body if physical shape changes for mesh and hull.
...
Properly rebuilds collision caches.
Release asset data fetched when building mesh or hulls.
2013-05-02 10:06:12 -07:00
a9480aed85
Merge branch 'master' into bulletsim4
2013-05-02 07:02:28 -07:00
ed46b42fea
BulletSim: fix crash when mesh asset wasn't available when meshing
...
the first time.
Debugging added for mesh/hull asset fetch.
2013-05-01 17:16:46 -07:00
0378baed35
BulletSim: rework LinksetCompound to work with new BSShape system.
...
Not all working yet.
2013-05-01 17:15:54 -07:00
e3d9d5566a
Fix inventory issue
...
Fix issue where objects rezzed from Trash or Lost And Found then be placed back in the respective folder when taking the object or a copy back into inventory.
2013-05-01 18:51:43 -04:00
d982d24938
Fix the long standing bug of items being delivered to lost and found or trash when takig copy.
...
This bug was recently aggravated through the perms changes required for the
export permission.
2013-05-01 21:42:51 +01:00
8c5445b774
Merge branch 'master' into careminster
...
Conflicts:
ThirdParty/SmartThreadPool/SmartThreadPool.cs
2013-05-01 21:39:49 +01:00
c6d50cd431
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2013-05-01 21:37:17 +01:00
b26276c8c4
Fix the long standing bug of items being delivered to lost and found or trash when takig copy.
...
This bug was recently aggravated through the perms changes required for the
export permission.
2013-05-01 21:35:50 +01:00
fca4e4ec7c
Merge branch 'master' into bulletsim4
2013-05-01 12:08:12 -07:00
81a90e30c6
Add in-code exaplanation for the change in cancellation signalling in STP 2.2.3. Remove left in Console.WriteLine accidentally inserted in recent 206fb306
2013-05-01 19:29:46 +01:00
206fb306a7
Update SmartThreadPool to latest version 2.2.3 with a major and minor change.
...
SmartThreadPool code comes from http://www.codeproject.com/Articles/7933/Smart-Thread-Pool
This version implements thread abort (via WorkItem.Cancel(true)), threadpool naming, max thread stack, etc. so we no longer need to manually patch those.
However, two changes have been made to stock 2.2.3.
Major change: WorkItem.Cancel(bool abortExecution) in our version does not succeed if the work item was in progress and thread abort was not specified.
This is to match previous behaviour where we handle co-operative termination via another mechanism rather than checking WorkItem.IsCanceled.
Minor change: Did not add STP's StopWatch implementation as this is only used WinCE and Silverlight and causes a build clash with System.Diagnostics.StopWatch
The reason for updating is to see if this improves http://opensimulator.org/mantis/view.php?id=6557 and http://opensimulator.org/mantis/view.php?id=6586
2013-05-01 19:01:43 +01:00
ac135c649c
Fix CAPS to work like they should - do not send caps to the viewer if they're not in the requested caps list.
...
The previous wrong behavior caused the debug setting "UseHTTPInventory" to fail
on all viewers when turned off. UDB inventory would not be correctly used in
that case.
2013-04-30 23:50:23 +01:00
b89d18e6f4
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
2013-04-30 23:45:38 +01:00
958a500692
Merge branch 'avination-current' of ssh://3dhosting.de/var/git/careminster into avination-current
2013-04-30 23:40:06 +02:00
0af1d8fe19
Fix CAPS to work like they should - do not send caps to the viewer if they're not in the requested caps list.
...
The previous wrong behavior caused the debug setting "UseHTTPInventory" to fail
on all viewers when turned off. UDB inventory would not be correctly used in
that case.
2013-04-30 23:35:59 +02:00
46ae84cfba
BulletSim: fix error messages created while an avatar has no initial
...
collisions. Usually happens when logging in an avatar that had been
previously flying. Uninitialized variable.
2013-04-30 13:10:15 -07:00
7cdb07b386
BulletSim: improvements to LinksetCompound and PrimDisplaced. Not all working yet.
2013-04-30 11:42:11 -07:00
d322625f90
BulletSim: Add non-static BSShape.GetReference for getting another reference
...
to an existing shape instance.
BSShapeNative rebuilds shape for all references.
BSShapeCompound returns another reference copy if the compound shape
already exists (for linksets).
2013-04-29 17:30:54 -07:00
15a3f80e2e
BulletSim: LinksetCompound work to disable collision for root and
...
child prims so compound shape can do all collisions.
Don't try to build a compound linkset for non-physical linksets.
Remove and replace root body when compound shape is added so collision
cache is rebuilt.
2013-04-29 17:30:38 -07:00
5a4cb539d2
Fix bug where an agent that declined an inventory offer and subsequently emptied their trash would make the item invalid in the giver's inventory
...
This was because the original item/folder ID was sent in the session slot of the offer IM rather than the copy.
2013-04-30 01:25:21 +01:00
3ce198165c
minor: remove some mono compiler warnings in ServicesServerBase
2013-04-29 22:21:57 +01:00
537b243360
minor: Eliminate warning in LLimageManagerTests by properly calling through to OpenSimTestCase.SetUp()
2013-04-29 22:18:11 +01:00
67789201c3
Add TestRejectGivenFolder() and TestAcceptGivenFolder() regression tests
2013-04-29 22:14:13 +01:00
0beccf23c0
Add regression test for inventory item give, reject and subsequent trash folder purge by receiver.
...
This commit also actually adds the InventoryTransferModuleTests file which I previously forgot
2013-04-29 21:11:44 +01:00
a7cbb9edc9
Add regression test for offer, accept and subsequent receiver delete of an item offered via instant message.
2013-04-29 20:50:49 +01:00
12054aaa9f
Fix bug where an agent that declined an inventory offer and subsequently emptied their trash would make the item invalid in the giver's inventory
...
This was because the original item/folder ID was sent in the session slot of the offer IM rather than the copy.
2013-04-29 17:14:44 +01:00
92ee288d66
BulletSim: remove trailing white space to make git happier. No functional changes.
2013-04-29 07:54:50 -07:00
ad1787770e
BulletSim: rename variable 'PhysicsScene' to be either 'PhysScene' or 'm_physicsScene' to match coding conventions and reduce confusion.
2013-04-29 07:38:55 -07:00
21ec434688
BulletSim: first cut at new linksetCompound shape building.
2013-04-29 07:38:51 -07:00
f2d408829b
BulletSim: fix crash when creating new hull.
2013-04-29 07:38:47 -07:00
2da8e60b6d
BulletSim: code for creating the avatar capsule shape.
2013-04-29 07:38:44 -07:00
e5582939fd
BulletSim: massive refactor of shape classes. Removed shape specific code from BSShapeCollection. Using BSShape* classes to hold references to shape. Simplified shape dependency callbacks. Remove 'PreferredShape' methods and have each class specify shape type. Disable compound shape linkset for a later commit that will simplify linkset implementation.
2013-04-29 07:38:40 -07:00
890cb6a293
BulletSim: complete BSShape classes.
2013-04-29 07:38:35 -07:00
3ff7391495
Some more pieces of Avination's ban system - if an avatar isn't allowed on any
...
parcel in the sim, keep them out entirely.
2013-04-29 00:55:34 +01:00
7c729e1519
Merge branch 'master' into careminster
2013-04-29 00:38:20 +01:00
4275d7a839
Merge branch 'avination-current' of ssh://3dhosting.de/var/git/careminster into avination-current
...
Conflicts:
bin/Regions/Regions.ini.example
2013-04-28 19:03:39 +02:00
a517e597f5
Fix wrong sql statement in offline im.
2013-04-28 09:03:09 -07:00
a49c5291dc
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-04-27 21:24:07 -07:00
222f530411
Added an interface to an external ban service. With this commit, the interface is used only in Hypergrided worlds (Gatekeeper), although in those, it applies to both local and foreign users. The Ban service itself is not in core; it is to be provided externally.
2013-04-27 21:23:29 -07:00
90a6891a7d
Better error reporting
2013-04-27 10:34:23 -07:00
f675d465b2
Make method virtual
2013-04-27 10:34:13 -07:00
12599c34e2
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2013-04-27 17:57:22 +01:00
cbb3bb62da
Unbreak the sample money module
2013-04-27 17:56:39 +01:00
ef08ab68a7
Small oversight in EconomyDataRequest - this would have affected everyone NOT using a money module.
2013-04-27 17:42:54 +01:00
3fcac2ba7b
Controller module for dynamic floaters (WIP)
2013-04-27 01:20:03 +02:00
2262b13048
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-04-25 17:02:32 -07:00
0e162511cf
Groups: make some methods protected.
2013-04-25 17:01:57 -07:00
40036ca05f
Change EconomyDataRequest signature to use an IClientAPI rather than UUID. This is needed because recent LL viewer codebases call this earlier in login when the client is not yet established in the sim and can't be found by UUID.
...
Sending the reply requires having the IClientAPI.
2013-04-25 21:37:40 +01:00
fb8aa22084
Merge branch 'master' into careminster
2013-04-25 21:37:25 +01:00
03c9d8ae4f
Change EconomyDataRequest signature to use an IClientAPI rather than UUID. This is needed because recent LL viewer codebases call this earlier in login when the client is not yet established in the sim and can't be found by UUID.
...
Sending the reply requires having the IClientAPI.
2013-04-25 21:35:18 +01:00
5d0a8ff391
Change copyright notice on DynamicMenuModule to proper BSD
2013-04-25 20:48:12 +01:00
c6628b1c76
Merge branch 'master' into careminster
2013-04-25 20:47:55 +01:00
3bc8017464
Recover a lost "virtual". Downstream projects need this.
2013-04-25 09:23:15 -07:00
c10405330d
UUIDGatherer now includes UUIDs which reference texture assets used as materials
2013-04-24 20:43:15 -07:00
0e22021c65
Make the kicked user's avie truly disappear when it's god-kicked.
2013-04-24 19:00:41 -07:00
2093d87e20
Make the kicked user's avie truly disappear when it's god-kicked.
2013-04-25 02:48:49 +01:00
ec4f981f1d
Adding the dynamic menu module which allows registering new menu options in compliant viewers
2013-04-25 01:52:34 +01:00
5cd77a460c
Commit Avination's God Kick feature.
2013-04-25 00:51:57 +01:00
3934b779b8
Adding the dynamic menu module which allows registering new menu options in compliant viewers
2013-04-25 01:39:22 +02:00
e39156c656
Send 503 when throttling textures
2013-04-25 01:38:21 +02:00
51e05dcb5b
Gods module cleanup
2013-04-25 01:37:18 +02:00
6f3c905744
Add Avination's support for parcel eject and freeze
2013-04-25 00:24:48 +01:00
d36a52ea55
Merge branch 'master' into careminster
2013-04-25 00:22:28 +01:00
1868680848
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-04-24 12:46:23 -07:00
70081a40a4
Bug fix: compare tolower. This should fix the issue where HG visitors currently in the region were not being found by the avatar picker window.
2013-04-24 12:45:19 -07:00
c22a2ab7d2
BulletSim: partial addition of BSShape class code preparing for
...
different physical mesh representations (simplified convex meshes)
and avatar mesh.
2013-04-24 08:05:42 -07:00
e324f6f3f0
BulletSim: update DLLs and SOs to they have no dependencies on newer
...
glibc (2.14) since that is not yet in some Linux distributions.
Add unmanaged API calls and code for creating single convex hull shapes.
2013-04-24 08:03:45 -07:00
522ab85045
BulletSim: improve avatar stair walking up. Add more parameters to control force
...
of both position change and up force that move avatars over barrier.
Default parameters are for steps up to 0.5m in height.
2013-04-23 18:31:12 -07:00
115e0aaf83
Fix issue in ConciergeModule where UpdateBroker was sending malformed XML if any number of avatars other than 1 was in the region.
...
I don't know how well the rest of ConiergeModule works since I've practically never looked at this code.
Addresses http://opensimulator.org/mantis/view.php?id=6605
2013-04-23 21:55:51 +01:00
e1ac683154
BulletSim: fix crash when deleting llVolumeDetect enabled objects. Bullet's check for an object being linked into the world does not work for Bullet's ghost objects so BulletSim was deleting the object while it was still linked into the physical world structures.
2013-04-22 16:50:06 -07:00
293a024c14
Allow callers to set the invoice parameter for GenericMessage
2013-04-22 22:39:08 +01:00
671a97ef76
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
2013-04-22 22:28:41 +02:00
a7a92e7339
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
2013-04-22 22:26:04 +02:00
6571e7ead2
Allow callers to set the invoice parameter for GenericMessage
2013-04-22 22:24:41 +02:00
231c298ca5
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
bin/OpenMetaverse.StructuredData.XML
bin/OpenMetaverse.XML
bin/OpenMetaverseTypes.XML
2013-04-21 14:11:39 +01:00
69f07fdb34
Materials persistence via SceneObjectPart.dynAttrs. This appears to work across region restarts and taking objects into inventory, but probably will not work across archiving via OAR or IAR as materials texture assets may not be adequately referenced to trigger archiving.
2013-04-20 23:39:07 -07:00
233f761779
handle PUT verb for RenderMaterials Cap
2013-04-20 02:08:22 -07:00
258804cc04
RenderMaterials POST Cap now return material entries when invoked with an OSDArray of MaterialIDs
2013-04-19 22:19:57 -07:00
9ae24cac2f
Materials-capable viewers send ImageUpdate packets when updating materials that are normally sent via RenderMaterials CAP. This can cause a race condition for updating TextureEntry fields. Therefore filter any TextureEntry updates so they only update if something actually changed.
2013-04-19 00:35:06 -07:00
06829c4082
remove default parameter value that apparently mono cant handle
2013-04-18 01:29:50 -07:00
d5419f0a46
Initial experimental support for materials-capable viewers. This is in a very early stage and this module is disabled by default and should only be used by developers for testing as this module could cause data corruption and/or viewer crashes. No materials are persisted yet.
2013-04-18 01:03:19 -07:00
7c839f176f
amend previous commit, a line was left out
2013-04-17 23:14:28 -07:00
53122fad40
Thanks lkalif for a fix to SendRegionHandshake() which fixes a potential crash with Server-side baking enabled viewers
2013-04-17 23:10:02 -07:00
ce043c5141
Allow changes to TextureEntry to propagate to viewers when MaterialID changes
2013-04-17 22:41:12 -07:00
d3f288e27b
Merge branch 'master' into careminster
2013-04-16 22:37:47 +01:00
c5de9840b0
refactor: Remove IClientNetworkServer.NetworkStop() in favour of existing Stop().
...
This was an undocumented interface which I think was for long defunct region load balancing experiments.
Also adds method doc for some IClientNetworkServer methods.
2013-04-16 21:58:24 +01:00
7cf377fff0
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Data/MySQL/MySQLAssetData.cs
OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
2013-04-10 13:20:55 +01:00
5f2cbfc0fd
BulletSim: fixing problems with llMoveToTarget. Not all fixed yet.
2013-04-09 18:00:29 -07:00
b53713cdda
BulletSim: some formatting changes.
2013-04-09 18:00:27 -07:00
9cc41d5118
Another algorithm for AngularVerticalAttraction. This one Takes into account all rotations before it and makes the corrections more close to the time that sl does.
...
Signed-off-by: Robert Adams <Robert.Adams@intel.com>
2013-04-09 18:00:25 -07:00
59135c9a31
BulletSim: add Bullet HACD library invocation. Turned off by default as not
...
totally debugged. Updated DLLs and SOs with more debugged HACD library code.
2013-04-09 18:00:23 -07:00
17fd075f39
BulletSim: fix problem where large sets of mega-regions weren't registering
...
all the terrain with the base region.
2013-04-09 18:00:20 -07:00
148e46563f
minor: fix mono compiler warning in ScriptsHttpRequests.cs
2013-04-10 00:07:58 +01:00
29e28f4b84
minor: remove mono compiler warnings in InventoryAccessModule
2013-04-10 00:05:03 +01:00
e20b0d5695
minor: Make exceptions thrown by MySQLAssetData more consistent.
2013-04-10 00:03:37 +01:00
06068444e2
Comment out rez perms logging I accidentally left in at 7f07023 (Sat Apr 6 02:34:51 2013)
2013-04-09 23:21:13 +01:00
8690a08881
minor: Log an exception if we aren't able to delete a script state file rather than simply ignoring it.
...
This should never normally happen but if it does then it can be valuable diagonstic information.
2013-04-09 23:02:11 +01:00
aab2b032aa
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-04-09 22:45:00 +01:00
8e04c752fc
If OpenSimulator is writing a PID file and finds the file already present on startup, logging an error since this is commonly due to an unclean shutdown.
...
Unclean shutdown can cause constantly moving objects to disappear if an OAR has just been loaded and they have not reached persistence time threshold, among other problems.
2013-04-09 22:38:47 +01:00
99f39836a1
BulletSim: moving comments around. No functional change.
2013-04-08 06:27:45 -07:00
a7a1b8b7e9
BulletSim: clean up actor code so routines use the same coding pattern.
...
Fix a few enabling problems.
2013-04-08 06:27:44 -07:00
fe16dc09da
BulletSim: complete movement of physical object action code out of the
...
physical object and into actors for setForce, setTorque, hover, lock
axis and avatar move.
2013-04-08 06:27:43 -07:00
c7cd077e55
Optimize the number of Simian calls to get the initial presence
...
information for the friends list. This is a pretty big performance
improvement on login. Note that you must upgrade simian to incorporate
the corresponding GetSessions call.
2013-04-07 17:31:44 -07:00
7f070236f7
Fix taking (and rezzing) of coalesced objects in the non-root subregions of megaregions.
...
This fixes the combined bounding box location for regions bigger than 256x256.
It also fixes the position on taking coalesced objects in the non-root regions, where position checks are properly done on rez instead.
It also fixes the megaregion land channel to return null if the land does not exist, which should probably also be done for the ordinary land channels rather than returning a dummy region.
Inspiration from Garmin's commit in http://opensimulator.org/mantis/view.php?id=6595 . Thanks!
2013-04-06 02:34:51 +01:00
0f008d5f7d
When rezzing a coalesced object, check adjust position of all components.
2013-04-06 01:44:06 +01:00
d2367968e4
* In between the fog, a moment of clarity. This fixes mantis 6570
2013-04-04 19:10:23 -04:00
c6b0942f97
Merge branch 'master' into careminster
2013-04-05 00:03:33 +01:00
6a5f6ac04e
Merge branch 'master' into careminster
2013-04-04 03:17:57 +01:00
b16a560b77
Merge commit '94d44142e37a9191162a426f28dd23f40b0cf4aa' into careminster
2013-04-04 03:17:38 +01:00
f064075a85
Fix XmlRpcAdmin admin_exists_user call so that it actually returns the last user login time rather than serializing the DateTime directly which generates a set of unexpected fields.
...
lastlogin return is in unix timestamp format.
2013-04-04 01:06:57 +01:00
f281a994e8
refactor: Simplify ScriptsHttpRequests.GetNextCompletedRequest to more simply iterate through pending requests without unnecessary checks.
2013-04-04 00:49:07 +01:00
831e4c3850
Fix bug where outstanding llHTTPRequests for scripts were not being aborted when they were deleted.
...
This was because AsyncCommandManager was handing an item ID to IHttpRequestModule.StopHttpRequest() rather than the expected request ID.
This commit also makes the http request asynchronous using BeginGetResponse() rather than doing this by launching a new thread
so that we can more safely abort it via HttpWebRequest.Abort() rather than aborting the thread itself.
This also renames StopHttpRequest() to StopHttpRequestsForScript() since any outstanding requests are now aborted and/or removed.
2013-04-04 00:36:15 +01:00
94d44142e3
minor: Stop falsely logging that a teleport was being aborted on client logout even when no teleport was active.
2013-04-03 00:48:36 +01:00
7bf1986e91
Fix minor race condition in SOP.SitTargetOrientationLL where inconsistent values could be returned if the sit orientation was changed whilst the property was being fetched.
2013-04-03 00:24:33 +01:00
97f0c9da84
Use consistent GroupPosition value Make SOP.UpdateGroupPosition() rather than one that could change whilst the method is being executed.
2013-04-03 00:23:20 +01:00
c0319daa40
fix minor race condition in SOP.SitTargetPositionLL where inconsistency could occur if the sit target position changed whilst the property was fetched
2013-04-03 00:09:28 +01:00
3332af4060
minor: Make SOP.UpdateOffset() more consistent by checking against the same old OffsetPosition rather than one which may vary if it simultaneously changes.
2013-04-03 00:01:06 +01:00
4bc5a7aa19
Merge branch 'master' into careminster
2013-04-02 23:53:23 +01:00
a3c723ee30
Fix minor race condition where SOP.GetGeometricCenter() and GetCenterOfMass() could return results which were never the case if these values were changed whilst the method was running
...
No need to create new Vector3s since these are structs.
2013-04-02 23:48:55 +01:00
c10331c8c2
Merge branch 'master' into careminster
2013-04-02 23:48:01 +01:00
41a652f6bd
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
2013-04-02 23:47:19 +01:00
68c8633ba1
BulletSim: create axis lock constraint with proper orientation and
...
enable axis lock functionality.
2013-04-02 06:40:12 -07:00
17aef1c883
BulletSim: update unmanaged API for HACD parameter passing. Bullet HACD
...
mesh to hull conversion calls in place but code not working. Update
BulletSim DLLs and SOs for new API and HACD code.
2013-04-01 18:03:11 -07:00
ebc1209fc9
BulletSim: rearrange mega-region terrain code to make the thread flow
...
a little clearer.
2013-04-01 18:03:09 -07:00
2bfe60e2fb
Use Output instead of OutputFormat in appropriate places of XEngine status reporting.
2013-04-02 01:28:16 +01:00
69bc37acd6
minor: Remove unnecessary call to GetAttachments() in AttachmentsModule.UpdateUserInventoryWithAttachment()
2013-04-02 01:00:55 +01:00
0dce496499
Fix what appears to be a bug in HGUserManagementModule where it enables on the base.Name rather than its own Name.
2013-04-02 00:55:00 +01:00
600087ab49
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-04-02 00:46:53 +01:00
4153cfbf14
Change recent MSSQL migrations to drop COLUMN from ALTER TABLE which is either not syntactical or unnecessary.
...
May fix http://opensimulator.org/mantis/view.php?id=6593
2013-04-02 00:45:29 +01:00
84eb25da23
BulletSim: stop an avatar from moving if standing on a stationary
...
object. This will stop avatars from sliding down steep terrains
or objects while still allowing an avatar to be moved if standing
on a moving object.
2013-03-31 22:19:44 -07:00
933ac60746
BulletSim: not quite functional axis lock code.
2013-03-31 22:19:43 -07:00
7d50015a74
BulletSim: start the renaming of local variables to m_ form to match the OpenSim coding conventions.
2013-03-31 22:19:42 -07:00
75b8cf428e
BulletSim: fix line endings in BSActor*
2013-03-31 22:19:42 -07:00
747ece59d2
BulletSim: convert BSDynamic to a BSActor and change BSPrim to set
...
up the vehicle actor.
2013-03-31 22:19:41 -07:00
2c581cae2a
BulletSim: Add physical 'actors' that operate on the physical object.
...
Add first 'actor' for locked axis.
2013-03-31 22:19:41 -07:00
9b83e53b28
Export permission, part two. Setting export perms for textures and clothing works. Setting perms for prims also works but they don't propagate correctly yet.
...
NOT FOR PRODUCTIN USE. Your database will need to be updated before you can use this!
2013-03-31 21:59:44 +01:00
ae833af3a9
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
2013-03-31 20:56:13 +01:00
f142e1f394
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
2013-03-31 20:27:46 +02:00
4bf9c4bbb8
Export permission, part two. Setting export perms for textures and clothing works. Setting perms for prims also works but they don't propagate correctly yet.
...
NOT FOR PRODUCTIN USE. Your database will need to be updated before you can use this!
2013-03-31 20:25:32 +02:00
64a56059b1
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
2013-03-30 21:19:10 +00:00
9fee431cc8
In the flotasm asset cache, if we get a request for a file that we're actively writing, simply return null instead of first logging an exception.
2013-03-30 01:21:16 +00:00
f8785b5f47
refactor: rename ETM.InformClientToInitateTeleportToLocationDelegate to InformClientToInitiateTeleportToLocationDelegate to correct spelling and bring into line with other ETM Initiate methods
2013-03-30 00:29:52 +00:00
76629289f0
refactor: move the append magic number processing for attachments back up into RezSingleAttachmentFromInventory from RezSingleAttachmentFromInventoryInternal() done in commit 023faa2
2013-03-29 23:59:21 +00:00
cbc9ae898c
Added missing functionality (mainly custom headers) to llHTTPRequest.
2013-03-29 23:32:11 +00:00
d5d6a274a7
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2013-03-29 23:28:47 +00:00
023faa227e
Check viewer 2/3 attachment calls against avatar appearance attachment data rather than actually attached objects
...
By checking against the grid's Avatar data, we can ignore viewer side attachments but still initiate these calls simulator-side.
Initiating simulator-side is always necessary for version 1 viewers.
This is a further commit to resolve http://opensimulator.org/mantis/view.php?id=6581
2013-03-29 23:10:28 +00:00
f2f8248178
Merge commit '23ae4c0a4d813763bcc39db7693850a21727d7f2' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
2013-03-29 02:42:47 +00:00
23ae4c0a4d
Fix bug where CHANGED_REGION and/or CHANGED_TELEPORT weren't firing for scripts in attachments.
...
This was because the script resumption in AttachmentsModule was firing the attach event instead.
Had to reinstate the code in 285bd3ahttp://opensimulator.org/mantis/view.php?id=6578
2013-03-29 02:21:38 +00:00
e9eb837347
Merge commit 'e89bcf4f773d95492b168376599f7530a6044e8f' into careminster
2013-03-29 02:21:20 +00:00
3696a668a8
Merge commit '4dfffa1df325c4b27a79e995585696cc20b6d905' into careminster
2013-03-29 02:21:06 +00:00
7d466d36a3
Merge commit 'd87ddf50fcd674fbd9aa8b8556bf57f2d285a3ba' into careminster
2013-03-29 02:20:47 +00:00
e7d76c91c2
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2013-03-29 02:19:12 +00:00
05810e48b0
Merge commit 'c92654fb43f303da8e1623f9fff8a404aad72374' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs
OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs
2013-03-29 02:15:47 +00:00
c93f67b632
Merge commit '2b142f2f9e888d5cb7317cc51c12ac7152c54459' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
2013-03-29 01:58:57 +00:00
73710413cd
Merge commit 'feffc8081dc5ab2889a7ea4b96b2befaed0c3f95' into careminster
2013-03-29 01:52:58 +00:00
7d5eadf753
Merge commit '03e421bf3d796bf3498f4f3311c59ce04fb1fea1' into careminster
2013-03-29 01:52:45 +00:00
6954024fb2
Merge commit '4ad9b275302ee109937512963eab095ff542a0c7' into careminster
2013-03-29 01:52:29 +00:00
abe885b3fe
Merge commit '3b377f16b29a6395d73af1cc987cb9abf9935376' into careminster
2013-03-29 01:52:18 +00:00
120903efb6
Merge commit 'c2093ccce16cd5210c8e0759f23b5b4bd205b7af' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2013-03-29 01:50:34 +00:00
e89bcf4f77
Revert "Try eliminating the pause before auto-reteleporting for a megaregion now that we're telepoting in a different way."
...
Unfortunately fails on Nebadon's system right now. Needs investigation. May put in a temproary option for experimentation soon.
This reverts commit d87ddf50fc
2013-03-29 01:34:31 +00:00
4dfffa1df3
Add Location (relative), Rotation (Relative) and Rotation (World) to "show part" and other related console commands
2013-03-29 01:31:37 +00:00
d87ddf50fc
Try eliminating the pause before auto-reteleporting for a megaregion now that we're telepoting in a different way.
...
On my own system, I can now eliminate the pause entirely and the reteleport happens whilst the teleport screen is still up.
Trying this change to see if this is true for other people.
2013-03-29 01:16:29 +00:00
4cb8967f0a
Merge commit '6a9630d2bdc27ed702936f4c44e6978f728a9ef0' into careminster
2013-03-29 01:08:33 +00:00
285bd3abc8
Eliminate code which tries to restart attachment scripts in ScenePresence.MakeRootAgent(), since this is already done in AttachmentsModule
2013-03-29 00:49:55 +00:00
c92654fb43
Stop attempts to update/add existing attachments in user inventory when teleporting between regions.
...
This appears to resolve issues on teleport where attachments disappear or become labelled as invalid within user inventory.
2013-03-28 23:57:35 +00:00
2b142f2f9e
Add "debug attachments" console command to allow highly verbose attachment logging to be switched on and off.
...
Default is off.
2013-03-28 23:09:35 +00:00
feffc8081d
minor: remove some mono compiler warnings from EntityTransferModule
2013-03-28 22:56:30 +00:00
03e421bf3d
minor: comment out unused Scene.AgentCrossing() to reduce code complexity
2013-03-28 22:55:13 +00:00
4ad9b27530
If the viewer has already rezzed any attachments itself, then ignore the simulator-side rez attachments call.
...
This is a further effort to reduce v3 viewer race conditions where this call may clash with the viewer signalling attachment wearing from its current outfit folder.
2013-03-28 22:51:59 +00:00
3b377f16b2
Fix regression tests by making a new NPC always trigger simulator side attachment code when created.
...
Regression from previous commit c2093ccc
2013-03-28 22:44:59 +00:00
e97567e227
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-03-28 22:35:24 +00:00
c2093ccce1
Move the simulator-side RezAttachments call on login to SP.MakeRootAgent with the other attachments code, using TeleportFlags.ViaLogin check to fire if necessary.
...
This is to simplify the code (no tricky 'wasChild' signalling required)
and to reduce the risk of a thread clash between simulator-side attaching (necessary for v1 viewers)
and the viewer-side attaching the v3 viewers perform.
2013-03-28 22:07:58 +00:00
6a9630d2bd
BulletSim: fix race condition when creating very large mega-regions.
...
The symptom was exceptions while creating physical terrain.
Reduce default terrain mesh magnification to 2 from 3 because the
higher resolution uses a lot of memory and doesn't solve the terrain
smoothness for vehicles.
Added comments here and there and improved some debugging log messages.
2013-03-28 10:59:18 -07:00
3f9b274180
BulletSim: tweaks to terrain boundry computation. No functional changes.
2013-03-28 10:59:16 -07:00
9ca54d00d8
Add back a log message when we attempt a megaregion auto-reteleport
2013-03-28 02:29:34 +00:00
f548a41fb8
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs
2013-03-28 02:29:07 +00:00
afd0d6af07
minor: Only try to deregister stats in EntityTransferModule.RemoveRegion() if module was enabled.
2013-03-28 02:23:09 +00:00
d9c049fd9f
Fix a bug in HGEntityTransferModule to call base.RemoveRegion() when a region is removed rather than base.AddRegion()
2013-03-28 02:20:43 +00:00
b05ed4ffa6
Instead of going via GodLikeRequestTeleport, auto-teleport the agent directly in a megaregion, in the same manner at the "teleport user" console command.
...
This is to bypass an issue with the HGLureModule which stops the auto-teleport from happening.
2013-03-28 02:17:32 +00:00
506d5e41bf
On the North and East sides of a megaregion, only consider regions within 256m to be neighbours rather than regions up to 512 distant.
...
This looks like an off-by-one bug since the view distance was already only 256 on the west and south sides.
This reduces the number of child agents being logged into regions neighbouring a megaregion.
2013-03-28 01:54:11 +00:00
617637c788
minor: Fix usage error message for "debug eq" console command
2013-03-28 01:41:41 +00:00
b5b01e5bb5
Make HGLureModule track god like lures as well as normal lures, to see if this fixes issues where second megaregion auto-teleport hangs on black teleport screen when HG is active.
2013-03-28 01:37:52 +00:00
876d0d310f
Add "show eq" console command to show numbers of messages in agent event queues.
...
For debugging purposes.
2013-03-28 01:36:34 +00:00
f32027f3b5
Remove some Console.WriteLines accidentally left in last commit cfb20f09
2013-03-28 01:08:47 +00:00
cfb20f09a9
refactor: combine the checks for megaregion view range into a single place.
2013-03-28 00:57:43 +00:00
dd7d7683c9
Fix problem with megaregions where teleporting into a different region which already had a child agent would stop the eq working for the agent in the new region.
...
This was because the calculation as to whether a new agent was needed in the receiving region did not take megaregions into account,
unlike the original calculation when the user first teleported into the region.
This meant that on teleport, entity transfer would create a new CAP but this would be ignored by the viewer and receiving region, meaning that the EQ could no longer be used.
This would prevent subsequent teleport, amongst other things.
Currently, regions up to 512m from a megaregion are considered neighbours.
2013-03-28 00:12:48 +00:00
46b765d28e
Merge branch 'master' into careminster
2013-03-28 00:10:51 +00:00
e320046683
Merge branch 'master' into careminster
2013-03-27 01:17:59 +00:00
da5dbaf1d0
Add admin_get_agents xmlrpc method.
...
This allows one to retrieve information about agents from a particular region (name, id, position, etc.)
Similar to output from "show users"
See http://opensimulator.org/wiki/Remoteadmin:admin_get_agents for more details
2013-03-26 23:02:13 +00:00
3072f257f5
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-03-26 23:00:51 +00:00
abde0d4efb
BulletSim: prevent asset fetching loop when the fetched asset fails to mesh.
...
Check for the case where the fetched mesh asset fails meshing (degenerate
triangles or no physical mesh). In this case, the asset is marked 'failed'
and BulletSim doesn't keep trying to fetch over-and-over trying to get a
good asset.
2013-03-26 15:02:10 -07:00
13170ca627
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-03-26 20:32:22 +00:00
3f0f313a76
Make llGetLinkPrimitiveParams() and llGetPrimitiveParams() work for avatars in a linkset.
...
llGetPrimitiveParams() works through PRIM_LINK_TARGET
Setting via llSetLinkPrimitiveParams(), etc. not yet implemented
2013-03-26 20:25:58 +00:00
4365daa8e1
Merge branch 'master' into careminster
2013-03-26 19:06:44 +00:00
e82fab34d7
Implement a pref to turn on the simulator ExportSupported feature entry.
...
This tells the viewer to enable the UI for export permissions.
WARNING: If your inventory store contains invalid flags data, this will result
in items becoming exportable! Don't turn this on in production until it's complete!
2013-03-26 19:00:30 +00:00
5f4c4df227
Phase 1 of implementing a transfer permission. Overwrite libOMV's PermissionMask
...
with our own and add export permissions as well as a new definition for "All" as meaning "all conventional permissions" rather than "all possible permissions"
2013-03-26 03:40:06 +00:00
36c57bac8e
Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster
2013-03-26 03:26:28 +00:00
95d0a7d4fa
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
2013-03-26 03:26:02 +00:00
285dc554ec
BulletSim: new algorithm for vertical attraction which uses quaternion
...
arithmetic to compute the shortest path between the current tilt
and vertical.
2013-03-25 15:40:46 -07:00
c96a6f1de6
BulletSim: small tweaks and formatting in the parameter fetching code.
2013-03-25 15:40:44 -07:00
953090fd62
BulletSim: fix possible race condition where an prim's asset can be requested quicker than the asset fetcher returns and thus falsely reporting that an asset was not fetched and defaulting the assset to a bounding box.
2013-03-25 15:40:43 -07:00
f783b9169f
BulletSim: parameterize C# HACD hull creation. Add feature of reducing max hull count for simple (non-cut prims) meshes.
2013-03-25 15:40:41 -07:00
128c72a234
Start recording inter-region teleport attempts, aborts, cancels and failures in statistics for monitoring/debugging purposes
...
These are recorded as 'entitytransfer' stats as seen by the "show stats entitytransfer" console command.
2013-03-25 21:53:27 +00:00
c341664c1b
Phase 1 of implementing a transfer permission. Overwrite libOMV's PermissionMask
...
with our own and add export permissions as well as a new definition for "All" as meaning "all conventional permissions" rather than "all possible permissions"
2013-03-24 18:56:28 +01:00
6ce9ed1a64
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2013-03-23 23:01:55 +00:00
8669586e18
Merge branch 'avination' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
2013-03-23 11:45:52 +00:00
aba66c7112
Make sharing errors not spew and let the cache retry the files
2013-03-23 13:12:41 +01:00
8bc43ea773
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
2013-03-23 11:31:34 +01:00
01636ca900
Fix teleporting into the non-SW 256x256 corner of a megaregion, though currently with a 10 second delay before auto-reteleport to the correct location.
...
This now does a check for border crossing (required to trigger the teleport) immediately in SP.MakeRootAgent().
If left any later, it looks like the physics scene changes the position and stops the cross happening.
If done any earlier, nothing happens because the cross-code currently requires a PhysicsActor to be in place, thuogh it's probably not necessary for this case.
2013-03-23 00:47:59 +00:00
93206ef0fa
Add "show borders" command to show the borders of a region.
...
This is relevant to mega-regions where the borders are very different to a regular region.
Also adds some method doc and other code comments.
2013-03-23 00:45:21 +00:00
c4d9a23f26
Following on from 476a7d3e (which wasn't enough), make chat across regions on different simulators work.
...
Also resolves an issue of multiple chatting if the originating simulators had more than one region and they were neighbours
2013-03-22 01:43:18 +00:00
1f17ef6d3c
Take out a testing sleep I accidentally left in the teleport code from last commit 7471bc7
2013-03-22 01:06:56 +00:00
d5e5c13f3b
Merge branch 'master' into careminster
2013-03-22 01:02:17 +00:00
68b910c1ff
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
2013-03-22 01:01:24 +00:00
7471bc7775
At strategic points in the teleport process, if the client has simultaneously logged out then do not continue.
...
This aims to reduce any side effects if the process tries to complete after the client has logged back in (e.g. it was delayed due to a slow destination region response).
This introduces a new Aborting entity transfer state which signals that the teleport should be stopped but no compensating actions performed.
2013-03-22 01:00:13 +00:00
476a7d3eee
Implement chat across region borders since we can tell if avatars in neighbouring regions are in range.
2013-03-22 00:03:10 +00:00
e23a0dcc5d
minor: On teleport, signal a child agent before we send the viewer TeleportFinish in order to avoid a theoretical race condition when teleporting to a neighbour.
...
If we do this after TeleportFinish, then it's possible for a neighbour destination to request the source to create a child agent whilst its still treated as root.
This closes the original presence which we don't really want to do.
This is probably okay (albeit with warnings on the console) but afaics there's no reason not to move the child agent signal.
2013-03-21 23:37:23 +00:00
46c833810c
On a teleport, lock m_agentsInTransit whilst we grab the value to check for completion just to be sure we're not using a thread cached version.
2013-03-21 00:46:08 +00:00
cc504eb0d1
Fix SceneManager to use the new automatic property throughout.
2013-03-21 01:44:09 +01:00
4de530af45
minor: disable logging on regression TestCrossOnSameSimulator() that I accidentally left on a few commits ago.
2013-03-20 23:13:12 +00:00
b1cd1d917e
minor: don't bother with the pause before rezzing attachments if we are running regression tests (fire and forget calls launched on the same thread).
...
Also adds code comments as to why this pause exists.
2013-03-20 23:12:13 +00:00
16af5b87f8
Add file missing from last commit 36651be
2013-03-20 23:08:35 +00:00
36651bed71
On the later forms of teleport failure, tell the user if this was because viewer couldn't/didn't connect with destination or if destination didn't signal teleport completion.
...
Also adds regression test for the case where the viewer couldn't connect with the destination region.
Also refactoring of regression test support code associated with entity transfer in order to make this test possible and the code less obscure.
2013-03-20 23:01:16 +00:00
8de933ab07
Insert a short delay on the simulator side rezzing of attachments in order to fix viewer 3 issues if its own rezzing actions on login collide with the simulator side actions.
...
This resolves issues (at least in my tests with LL 3.3.4) where this can make attachments invisible until one zooms in on the avatar.
This doesn't affect version 1 viewers since this delay is shorter than the login delay.
This doesn't increase the login time since this part of the process was already being performed asynchronously.
This may be a temporary solution.
2013-03-20 02:09:25 +00:00
c0ff5635ba
Fix "show attachments" command probably broken in commit addab12 (Wed Jan 2 21:38:00 2013)
...
This break was not connected with the recent attachment code changes.
2013-03-20 02:00:56 +00:00
3cb1c23554
Force a viewer object update for attachments at the end of the final Scene.CompleteMovement() in order to make all multi-attachments appear on the destination region.
...
For some reason, sending updates before this will not have this effect.
This may be something related to some viewers (e.g. LL 3.3.4) or something OpenSimulator isn't getting quite right.
2013-03-20 01:46:50 +00:00
9151b9d233
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-03-20 01:36:28 +00:00
90b9121e66
BulletSim: change 'degenerate mesh' message from Error to Debug because there
...
seem to be lots of sculpties with this problem while the condition really doesn't
change region operation.
2013-03-19 17:15:24 -07:00
3648164219
Prevent multiple instances of the same item ID being appended to an AvatarAppearance
...
It looks like this was happening when AttachmentsModule.RezAttachments was doing a secondary set of each attachment to update with the asset ID (initially they only have the inventory ID).
However, with multi-attach this was appending a second copy of the same attachment rather than updating the data that was already there.
This commit requires both simulator and service to be updated.
2013-03-19 21:49:29 +00:00
c2e4f8aed5
For the moment, disable the output of the 'scene' statistics in SimExtraStatsCollector
...
and thus for the command 'show stats' because it is ugly and most of the information
is already output in the formatted printout that appears before.
2013-03-19 12:37:44 -07:00
1dd2d432f1
For those people collecting and comparing logfiles from servers scattered
...
around the world, change LogWriter to use DateTime.UtcNow rather than
DateTime.Now.
2013-03-19 11:40:10 -07:00
8360223fed
BulletSim: code to generate a higher resolution terrain mesh. Parameter
...
TerrainMeshMagnification controls number of vertices generated per
heightmap point. Default is 3.
2013-03-19 00:00:03 -07:00
8510f57ad4
BulletSim: add terrain contact processing threshold parameter. Initialize contact processing threshold for static object as well as mesh terrain.
2013-03-19 00:00:02 -07:00
8d9bfda727
Merge branch 'avination' into careminster
2013-03-19 01:24:14 +00:00
566ab7ccf9
Fix merge artefacts
2013-03-19 01:19:33 +00:00
8553a37881
Merge commit '3611d33b00650ccc71994b331e4c6595f95d3131' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
2013-03-19 01:00:09 +00:00
5b950ca36a
Merge commit '464201b41d5f5fdd7c88ab5e95dd7b6fbae6d766' into careminster
2013-03-19 00:54:23 +00:00
397379cd3f
Process default attachment point in AttachObjectInternal before we check whether a worn object needs to displace an existing attachment on the same point if we are not using multi-attach.
2013-03-19 00:39:58 +00:00
55ab6f015a
Fix tests for multiattach
2013-03-18 23:48:03 +00:00
5e1f651e21
Merge branch 'master' into newmultiattach
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
2013-03-18 23:31:27 +00:00
0635d9d174
Merge commit 'ccd6f443e1092cb410f565e921f7cf4dd8cd2dac' into newmultiattach
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
2013-03-18 23:21:01 +00:00
e4a70b9f9a
Limit each attachment point to 5 items as per spec
2013-03-18 22:56:26 +00:00
d07943c262
Multiattach, part 2
2013-03-18 22:56:17 +00:00
fcecfc81bb
Multiattach, part 1
...
Conflicts:
OpenSim/Framework/AvatarAppearance.cs
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2013-03-18 22:56:03 +00:00
3611d33b00
Improve rejection of any attempt to reattach an object that is already attached.
...
This also adds/extends regression tests for wearing attachments directly for the scene and attempting to reattach/rewear already attached objects.
2013-03-18 22:04:27 +00:00
a7a9a8a614
Fix recent regression where an item worn to an attachment point that was already occupied did not remove the previous attachment (current behaviour)
...
Regression was commit ccd6f4 (Tue Mar 5 23:47:36 2013)
Added regression test for this case.
2013-03-18 20:48:50 +00:00
46a81b3527
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2013-03-17 23:07:12 +00:00
464201b41d
BulletSim: add INI parameter for angular banking timescale fudge parameter.
2013-03-16 15:34:07 -07:00
fc84ebb819
BulletSim: Working Implementation of Angular Banking for Vehicles (Not SL Grade, Other features when implemented should slow it down for now be Strong with Vertical Angular attraction setting and conservative with Angular Velocity on X axis)
...
Signed-off-by: Robert Adams <Robert.Adams@intel.com>
2013-03-16 15:13:40 -07:00
455da9dd20
* Ignores VolumeDetect enabled prim in the camera raycast call. Note: The SceneRaycast call doesn't have a filter option in the interface and physics will use the lower level one for all sorts of goodies so it wouldn't be appropriate to ignore it at the physics layer yet.. though that would be better once the API has filters.
2013-03-16 11:09:49 -04:00
6e1b3f9951
*Yet another HTTPServer update code changes in OpenSim Libs. * This fixes a connection close issue by getting rid of the socket references * This adds a connection timeout checker to shutdown poor or evil connections and combats DOS attempts that just connect and make no complete requests and just wait. It also actually implements KeepAlive... instead of just understanding the connection header in the request... you can test by connecting and requesting a keepalive header and sending another request on the same connection. The new timeout checker closes expired keepalive sessions, just make sure you send the request within 70 seconds of connecting or the timeout checker will timeout the connection.
2013-03-16 03:14:11 -04:00
f081b7e9ef
Merge branch 'avination' of ssh://3dhosting.de/var/git/careminster into avination
2013-03-16 01:48:04 +01:00
1dcdea6ac4
Fix case where the string member of a LSL_String in a list is null
2013-03-16 01:47:26 +01:00
03075359b5
Finally remove the 'REST' ApplicationPlugins code which has been non-functional and largely commented out for many years.
2013-03-15 23:48:40 +00:00
7e5d553781
Make the LSL memory functions virtual so script engines can override them if they have different memory management.
2013-03-15 23:46:49 +00:00
b9146a7922
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Framework/Servers/BaseOpenSimServer.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2013-03-15 23:45:32 +00:00
35843e8ec8
Change the table and field names of XAssetService mysql db tables to be capitalized like Avatars, Friends, etc.
...
Also fixes access time being set on assets rather than XAssetsMeta
This is to try and be somewhat consistent with other service tables that are mainly in this style.
No migration is supplied, since nobody should be using this service yet except on a test basis.
2013-03-15 23:42:16 +00:00
e9f3cd1a60
Implement access time updates on assets for XAssetService.
...
This only happens if access time is older than 30 days currently, in order to reduce database updates.
The idea is to give some idea of assets which haven't been accessed for a very, very long time.
These might conceivably be deleteable, though this will be a risk due to caching at other points in the chain.
This is actually currently much less useable on the xasset service since access time is on metadata rather than the data itself.
And many metadata entries may point to the same data. Probably need to address this.
2013-03-15 23:17:54 +00:00
45dee383db
refactor: Reuse Get() method in AssetService to eliminate some copy/paste in other Get methods
2013-03-15 22:42:34 +00:00
bd0c1d9b6a
Migrate assets from chained asset service to xassetservice as they are requested.
...
This shrinks the asset database over time as duplicate assets are fetched.
2013-03-15 22:33:39 +00:00
d05af4bdad
Fix bug in AssetService where requesting data only for an asset would throw an exception if the asset did not exist.
2013-03-15 22:14:34 +00:00
7fb458b055
minor: log an error rather than info if a connector fails to load.
2013-03-15 22:08:11 +00:00
3a7d9f740e
minor: Make logged message in ServerUtils more consistent.
2013-03-15 22:05:18 +00:00
8cc3adb585
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-03-15 21:57:25 +00:00
924d6e892a
Make it possible to chain another asset service underneath the de-duplicating XAssetService.
...
This makes it possible to use the dedupliicating service without needing to migrate all the existing asset data beforehand.
Currently controlled by a ChainedServiceModule setting in [AssetService] (e.g. ChainedServiceModule = "OpenSim.Services.AssetService.dll:AssetService")
Not yet ready for use.
2013-03-15 21:53:39 +00:00
78b25094dc
BulletSim: Tweak vertical angular attraction to remove double VehicleOrientation application fixing the problem with the vertical attractor pushing vehicles nose first into ground when tilted on side.
...
Signed-off-by: Robert Adams <Robert.Adams@intel.com>
2013-03-15 14:05:38 -07:00
c10c43d6f6
Fix server statistics always reporting zero for total network bytes in/out.
...
Clean up some parameter code in Statistics.Binary.
2013-03-15 13:59:34 -07:00
d3e76730bd
Add example code to DOExampleModule to pull data from that previously saved by DAExampleModule when instantiating a dynamc object.
2013-03-15 00:49:35 +00:00
cb74186888
Add ParentGroup.HasGroupChanged = true setting to DAExampleModule as this is necessary to get attributes to save (though this probably happens anyway due to the prim move)
2013-03-15 00:27:06 +00:00
e25ba116a3
refactor: make llGetLinkName() and llGetLinkKey() use a common GetLinkEntity() method
2013-03-15 00:06:42 +00:00
081271e1d7
minor: remove mono compiler warnings in LSL_Api.cs
2013-03-14 23:44:16 +00:00
12900ea84e
Log same environment information to Robust log as is already done for simulator logs, for debug purposes
2013-03-14 23:39:15 +00:00
2fbc08d7dd
refactor: minor cleanup in osGetAvatarList()
2013-03-14 23:19:18 +00:00
0ea0f8aa83
Fix bug in osCauseHealing() if called with an avatar ID for an avatar that is not in the scene.
2013-03-14 23:16:39 +00:00
56b333f301
minor: Use more compact libomv primitive constructors in osNpcGetPos() and osNpcGetRot()
2013-03-14 23:12:58 +00:00
55204ccde6
Fix minor race conditions in OSSL_Api functions where a parcel could be misidentified for moving prims.
2013-03-14 23:09:59 +00:00
f8dab4f93f
refactor: Use LSL_Vector(Vector3) constructor in llCastRay()
2013-03-14 23:06:54 +00:00
ca99f418d8
refactor: Use ILandChannel.GetLandObject(Vector3) in LSL_Api rather than having to continually take intermediate Vector3s to avoid race conditions
2013-03-14 23:05:21 +00:00
c1115e4c2e
Add ILandChannel.GetLandObject(Vector3 position) as this is a very common input to GetLandObject()
...
This conforms to the existing ILandChannel.ParcelsNearPoint() method
2013-03-14 22:56:26 +00:00
c09f4ff483
Fix minor race condition in llGetCameraRot() where inconsistent information could be returned for a rotating camera
2013-03-14 22:49:08 +00:00
Justin Clark-Casey (justincc)