UbitUmarov
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
UbitUmarov
0760fa3106
process AgentUpdates in order with rest of packets. Only give higher priority to chat
2014-08-13 00:17:03 +01:00
UbitUmarov
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
UbitUmarov
f811efde85
do the significance test invalidation at MoveAgentToRegion
2014-08-12 22:36:17 +01:00
UbitUmarov
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
UbitUmarov
dbbfaf3ac3
force AgentUpdate after CompleteAgentMovement to pass by significance test
2014-08-12 22:17:15 +01:00
Melanie Thielker
96d89c5906
Merge branch 'ubitworkmaster'
2014-08-12 22:46:28 +02:00
UbitUmarov
3e7f475e58
fix the damm thing
2014-08-12 21:08:01 +01:00
UbitUmarov
bf269c871a
use Vector3.normalize in place of util.GetNormalize
2014-08-12 20:59:36 +01:00
UbitUmarov
c7e3e59953
try no send current LookAt, remove redundant incomplete position height
...
check
2014-08-12 20:37:34 +01:00
UbitUmarov
4997a9e87a
fix VS creative indentation
2014-08-12 18:42:18 +01:00
UbitUmarov
a0f26dc6ec
change XMLIrpgGroups attach to events, using the more correct
...
\addons\Groups\... model
2014-08-12 18:28:01 +01:00
Melanie Thielker
22d472e34a
Merge branch 'ubitworkmaster'
2014-08-11 18:45:39 +02:00
UbitUmarov
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
UbitUmarov
ba33d78af9
dont do ParcelCrossCheck() on child avatars
2014-08-11 01:44:12 +01:00
Melanie Thielker
0eaabef1dc
Fix a condition check
2014-08-11 02:31:29 +02:00
Melanie Thielker
519df0d2a3
Fix a condition check
2014-08-11 02:30:09 +02:00
Melanie Thielker
036017bba7
Make texture anims work right on singu
2014-08-11 02:08:17 +02:00
Melanie Thielker
01e381fa33
Make texture anims work right on singu
2014-08-11 02:07:23 +02:00
UbitUmarov
e860dd33fa
remove confusing defonly control
2014-08-11 00:54:30 +01:00
UbitUmarov
306875fc61
... one day..
2014-08-11 00:49:11 +01:00
UbitUmarov
9217d5ca31
will get there..
2014-08-11 00:44:34 +01:00
UbitUmarov
0a9925ff4a
validatebaked still not ok
2014-08-11 00:28:14 +01:00
UbitUmarov
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
Melanie Thielker
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
Melanie Thielker
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
UbitUmarov
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
UbitUmarov
c0378d5430
actually let delay match throttles as original design
2014-08-10 16:36:20 +01:00
UbitUmarov
ebc18a80bf
OutgoingPacketHandler can not be paced by hits on SendPacket()
2014-08-10 14:49:58 +01:00
UbitUmarov
a363ed484e
Merge branch 'master' into ubitworkmaster
2014-08-10 13:02:39 +01:00
UbitUmarov
c84a3c3630
also on other case
2014-08-09 16:22:46 +01:00
UbitUmarov
601c50dc1e
return even zero costs ( prims on other regions )
2014-08-09 16:19:07 +01:00
Melanie Thielker
52dc27991f
Give extra info on the call stack when SQL errors happen
2014-08-09 16:25:40 +02:00
UbitUmarov
2eb1c1c377
move from RegisterInventoryServiceHandlers to
...
RegisterRegionServiceHandlers what belongs there ( readabilitly only )
2014-08-09 15:15:27 +01:00
UbitUmarov
dc7b9c1cc3
dont do for children what is for growups ( root agents) ( needs check)
2014-08-09 15:12:02 +01:00
UbitUmarov
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
Melanie Thielker
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
UbitUmarov
ebbf236abc
of course.. bug..
2014-08-08 02:25:31 +01:00
UbitUmarov
9aa6389b8b
lock set appearence during ValidateBakedTextureCache there seems to be a
...
overlap in same cases
2014-08-08 02:22:18 +01:00
UbitUmarov
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
UbitUmarov
c6cdd597f3
add wearables array size checks on unpack
2014-08-08 01:32:16 +01:00
UbitUmarov
2a457c862e
Merge branch 'master' into ubitworkmaster
2014-08-08 00:52:41 +01:00
UbitUmarov
16bcd86dfb
back to max 15 wearables until its safe ( and before i kill other grid
...
regions)
2014-08-08 00:01:49 +01:00
UbitUmarov
a8e49a4538
max 16 for testing
2014-08-07 23:33:48 +01:00
UbitUmarov
4ae0bb7df1
add limites checks on wearables size, revert to max 15 for
...
compatibility/testing
2014-08-07 23:29:31 +01:00
Melanie Thielker
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
UbitUmarov
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
UbitUmarov
73cbdf2c6b
bug
2014-08-07 22:00:23 +01:00
UbitUmarov
6d372f3d9e
remove annoying debug msg . still a lot of spam, but to remove later
2014-08-07 21:37:11 +01:00
UbitUmarov
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
UbitUmarov
38e2e5942c
bug on upload new bakes decision
2014-08-07 19:16:51 +01:00
UbitUmarov
dfa9ba0937
minor clean, dont check for cache if we aren't using it..
2014-08-07 08:47:03 +01:00
UbitUmarov
1408c9eee7
reply to cached checks with same serial number
2014-08-07 07:55:56 +01:00
UbitUmarov
a95afb7fc5
bug
2014-08-07 07:36:23 +01:00
UbitUmarov
12d8ed2dcd
only send to bakedmodule the baked textures :)
2014-08-07 07:08:01 +01:00
UbitUmarov
b7f24bacce
bugg
2014-08-07 06:09:56 +01:00
UbitUmarov
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
UbitUmarov
552b4e45e8
bakemodule didnt like last changes
2014-08-06 05:56:10 +01:00
UbitUmarov
66dea8fe05
some debug to remove later
2014-08-06 05:17:30 +01:00
UbitUmarov
bd3d58dd00
try to make the baked textures cache work
2014-08-06 04:54:14 +01:00
UbitUmarov
e1a5a1f829
apply objectSlamSale to all roots of coalescence objects. replace the
...
single object condition for renaming
2014-08-05 23:25:08 +01:00
UbitUmarov
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
UbitUmarov
2c4908578e
revert to old avn-current code, not using ApplyPermissionsOnRez() till its
...
reviewed/fixed
2014-08-05 21:55:42 +01:00
UbitUmarov
01780d4dc6
put back a check for null foldedperms
2014-08-05 19:59:21 +01:00
UbitUmarov
31b5a587a4
Merge branch 'master' into ubitworkmaster
2014-08-05 19:28:56 +01:00
UbitUmarov
c80322f1e6
dont change agentItem.BasePermissions where avination-current didn't
...
change
2014-08-05 19:03:11 +01:00
UbitUmarov
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
UbitUmarov
507a29d581
diference fix
2014-08-04 21:55:58 +01:00
UbitUmarov
3cca5ec667
check...
2014-08-04 21:52:29 +01:00
UbitUmarov
3d81f25e34
Revert "start sending terrain in scenePresence after well defined avatar. Minor"
...
This reverts commit 05a2feba5d
.
2014-08-04 20:32:11 +01:00
UbitUmarov
05a2feba5d
start sending terrain in scenePresence after well defined avatar. Minor
...
change on significante AgentUpdate check.
2014-08-04 19:57:47 +01:00
UbitUmarov
8cf945544c
local chat gods bug fix
2014-08-04 00:43:57 +01:00
UbitUmarov
b07b0ff555
missing child login parcel overlay
2014-08-04 00:16:56 +01:00
UbitUmarov
14250c776a
missing currentParcelUUID update
2014-08-03 23:44:51 +01:00
UbitUmarov
bad01fbb41
some mess cleanup
2014-08-03 22:57:08 +01:00
UbitUmarov
0d71a2bb8f
mess update ( hide avatars )
2014-08-03 22:38:50 +01:00
UbitUmarov
21aa325883
remove debug msgs at attachments deRez
2014-08-03 19:41:48 +01:00
UbitUmarov
6b3f10790e
bugg
2014-08-03 19:35:16 +01:00
UbitUmarov
c2d9a6499a
dont get script states for NPCs on deRez
2014-08-03 19:08:13 +01:00
UbitUmarov
ca8b0e6a1d
replace debug msgs by others
2014-08-03 19:00:01 +01:00
UbitUmarov
ed47874197
several debug msgs, need to be removed asap
2014-08-03 18:22:00 +01:00
Melanie Thielker
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
UbitUmarov
bcab663ad7
debug...
2014-08-03 06:16:30 +01:00
UbitUmarov
cc16fe68cc
....
2014-08-03 02:26:39 +01:00
UbitUmarov
b9443b186e
test...
2014-08-03 02:09:07 +01:00
UbitUmarov
53e95803a5
test not rezzing attachments on a FireAndForget
2014-08-03 01:20:34 +01:00
UbitUmarov
9f5e19127d
comment out a debug msg. more on gods being Gods
2014-08-03 00:22:21 +01:00
UbitUmarov
addca0737c
testing...
2014-08-02 23:38:18 +01:00
UbitUmarov
009e8ee76c
testing
2014-08-02 23:04:18 +01:00
UbitUmarov
e87f70e277
god also read local chat
2014-08-02 22:45:28 +01:00
UbitUmarov
580604c231
let gods see hidden avatars ( test )
2014-08-02 22:32:51 +01:00
UbitUmarov
35616339f3
remove the groups restrictions for npcs since they do nothing usefull
2014-08-02 21:01:44 +01:00
UbitUmarov
46da95d1b7
bug hunt: disable group for npc
2014-08-02 19:33:38 +01:00
UbitUmarov
01981fdf58
dont fire a thread on npc creation keeping the main one just waiting
2014-08-02 18:57:43 +01:00
UbitUmarov
74447d14cd
add some filters for NPCs
2014-08-02 18:32:28 +01:00
UbitUmarov
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
UbitUmarov
20eeeba0d2
initial state change
2014-08-02 03:17:39 +01:00
UbitUmarov
c11c4c0daa
add a hide check at end of region arrival
2014-08-02 02:26:54 +01:00
UbitUmarov
46add98071
remove a few more
2014-08-02 01:45:32 +01:00
UbitUmarov
bdac5058c8
remove some ischild tests
2014-08-02 01:21:24 +01:00
UbitUmarov
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
UbitUmarov
ef1f37cf20
handle change of hide avatars flag. Parcel limits edition still need work
2014-08-01 18:59:08 +01:00
UbitUmarov
cb43dff2dc
remove unnecessary sendparceloverlay
2014-08-01 02:55:34 +01:00
UbitUmarov
e5f9f064a7
filter local chat from avatars or attachment acording to parcel hide (
...
not fully tested)
2014-08-01 01:43:12 +01:00
UbitUmarov
0a1e9d731d
work on hide avatars
2014-08-01 00:34:52 +01:00
UbitUmarov
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
UbitUmarov
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
UbitUmarov
17f9f1c247
restrict other avatar sounds to parcel flags ( untested )
2014-07-30 16:32:25 +01:00
UbitUmarov
d6dbfd1687
missing file in commit 5fe1f87837
2014-07-30 15:43:54 +01:00
UbitUmarov
2a2a772408
mute avatar collision sounds if parcel doesnt allow
2014-07-30 15:36:49 +01:00
UbitUmarov
5fe1f87837
changes to parcels code (still more to to)
2014-07-30 14:53:56 +01:00
Melanie Thielker
ec5f96b272
Persist new land fields for access control
2014-07-29 05:53:40 +02:00
Melanie Thielker
6a0be97974
Correct nomenclature for LLSD messages. LL sure suck
2014-07-29 05:06:53 +02:00
Melanie Thielker
0c2537bb24
Try to plumb the other half
2014-07-29 04:41:38 +02:00
Melanie Thielker
dfa9780c8c
Send new parcel permissions to activate viewer options - done right this time
2014-07-29 04:19:01 +02:00
Melanie Thielker
477b5b5623
Add new fields to parcel update
2014-07-29 03:40:05 +02:00
Melanie Thielker
181142c5ce
Change some ORs to assignments as they should be
2014-07-29 02:37:36 +02:00
UbitUmarov
6b0521d3c9
fix the mess about exclusive fields and flags on land overlay
2014-07-29 01:24:43 +01:00
UbitUmarov
3e1d2df261
change parcel overlay bytes adding LocalSound.. changed others also NEEDS
...
checking
2014-07-29 00:39:08 +01:00
UbitUmarov
f32bd24a2c
dont mess with sound gain on stop
2014-07-27 17:03:53 +01:00
UbitUmarov
55df2b317c
dont send packets twice
2014-07-27 12:02:59 +01:00
UbitUmarov
c3b5a6c2ab
change how sounds work. May be bad.. needs testing
2014-07-27 08:18:27 +01:00
UbitUmarov
5a7a609683
remove forgotten lines
2014-07-27 08:11:27 +01:00
UbitUmarov
eb55e69d4a
serialize sound parameters for llLoopSound
2014-07-27 08:08:01 +01:00
UbitUmarov
43cf184603
clear script controls on crossing (untested)(possible should be done
...
elsewhere/othe way)
2014-07-26 16:56:21 +01:00
UbitUmarov
b6af41ec11
dont standup avatar on crossing
2014-07-26 05:59:38 +01:00
UbitUmarov
4aa55204a2
allow reset default animation to default as core does
2014-07-26 05:27:36 +01:00
UbitUmarov
70890e211a
add queue transition code needs review/more testing
2014-07-25 17:33:01 +01:00
UbitUmarov
fa59cddc28
remove old and dead code that its only making it hard to understand
2014-07-25 13:03:40 +01:00
UbitUmarov
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
UbitUmarov
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
UbitUmarov
05d071a430
let BlockingQueue timeout work as its suposed to and not wait for ever
2014-07-24 05:37:56 +01:00
UbitUmarov
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
UbitUmarov
9936f13c1b
on transfer fail of sited avatars, only do
2014-07-24 00:56:48 +01:00
UbitUmarov
46695ddbfe
fix line ending
2014-07-24 00:30:38 +01:00
UbitUmarov
8808549669
on sit use root prim camera at and eye if child as neither
2014-07-23 23:09:13 +01:00
UbitUmarov
f6af5f4996
change last commit setting intransit without messing flight
2014-07-23 22:28:51 +01:00
UbitUmarov
f9ae7ea2e6
do CompleteMovement with InTransit set as core
2014-07-23 21:14:35 +01:00
UbitUmarov
237075ce21
cleanup a bit presence CheckForBorderCrossing removing dead code
2014-07-23 20:31:54 +01:00
UbitUmarov
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
UbitUmarov
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
UbitUmarov
0331159d2c
clamp avatar standup position within region
2014-07-22 21:34:21 +01:00
UbitUmarov
f394fabfc0
if sited avatar cross fails, dont add it to physics and dont mess scripts
...
(?)
2014-07-22 16:28:30 +01:00
UbitUmarov
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
UbitUmarov
ed905418b3
consider that CrossPrimGroupIntoNewRegion removes DIE_AT_EDGE and
...
RETURN_AT_EDGE from simulation
2014-07-22 15:47:42 +01:00
UbitUmarov
f9fdf26ec3
make ResetChildPrimPhysicsPositions only do what it is supposed to do and
...
not what AbsolutePosition does
2014-07-22 15:13:37 +01:00
UbitUmarov
cf132430ae
tell scripts about positions changes after they are actually changed
2014-07-22 14:50:17 +01:00
UbitUmarov
5269511339
dont try to cross with avatars on DIE_AT_EDGE or RETURN_AT_EDGE sog
2014-07-22 14:31:47 +01:00
UbitUmarov
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
UbitUmarov
3e73e96bef
fix HUD attachment update filter to allow avatar center etc
2014-07-22 01:49:42 +01:00
UbitUmarov
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
UbitUmarov
0239c7ba1c
avatar collisions fix
2014-07-21 23:54:53 +01:00
UbitUmarov
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
UbitUmarov
d9797b6478
change ava to ava collisions a bit
2014-07-21 19:16:23 +01:00
UbitUmarov
726490a994
bug fix
2014-07-21 19:15:51 +01:00
Melanie Thielker
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
Melanie Thielker
34c40a1e1a
Remove some already commented lines
2014-07-20 23:58:16 +02:00
Melanie Thielker
c37a88d4f1
Fix LSL portions of sit positioning
2014-07-20 23:54:06 +02:00
UbitUmarov
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
UbitUmarov
5f364dbed5
another change to standup
2014-07-20 16:09:34 +01:00
UbitUmarov
d6f56a4f99
change avatar standup code
2014-07-20 16:03:05 +01:00
UbitUmarov
a5fcc0c0c0
remove avn hack on sitted avatars positions
2014-07-20 14:47:35 +01:00
UbitUmarov
79aea3e588
physicsSit SendSitResponse also relative to parent prim
2014-07-20 09:21:00 +01:00
UbitUmarov
931434de87
fix physics sit for physical child prims
2014-07-20 09:15:29 +01:00
UbitUmarov
32b060a608
physics engine cannot change internal positions of linksets, at least not
...
in teaseupdates
2014-07-20 05:54:51 +01:00
Melanie Thielker
b3068355bc
Merge branch 'ubitworkmaster'
2014-07-20 02:27:08 +02:00
UbitUmarov
dc717303d4
replace old Attachoffset by AttachedPos. Comented out possible merge
...
artifacts
2014-07-20 01:15:33 +01:00
Melanie Thielker
bef76bf3c5
Fix duplicate attach message being sent to objects picked up from the ground
2014-07-20 01:52:26 +02:00
Melanie Thielker
95f0d582a5
Fix coalesced objects not showing up as "piles" of prims (AVN only bug)
2014-07-20 00:18:28 +02:00
Melanie Thielker
5000a5c038
Fix coalesced objects not showing up as "piles" of prims (AVN only bug)
2014-07-20 00:17:35 +02:00
Melanie Thielker
07c0ee1fbf
Fix taking objects
2014-07-19 23:17:26 +02:00
Melanie Thielker
e1b2ecdfdc
Merge branch 'avination-current'
...
Conflicts:
OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
2014-07-19 22:32:07 +02:00
UbitUmarov
95b89dd450
fix attachments
2014-07-19 22:18:12 +02:00
UbitUmarov
9654b81b2d
revert to capsule representation of avatar collider
2014-07-19 16:16:13 +01:00
UbitUmarov
748fc66ef1
reduce avatar hover in basic ode plugin
2014-07-18 13:19:24 +01:00
UbitUmarov
d5e0437465
fix Xengine script instance load
2014-07-18 11:43:31 +01:00
UbitUmarov
19d33c571d
Merge branch 'avination-current' into ubitwork
2014-07-16 16:22:32 +01:00
UbitUmarov
fc1bd4567d
Merge branch 'avination-current' of ssh://3dhosting.de/var/git/careminster into avination-current
2014-07-16 16:16:37 +01:00
Melanie Thielker
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
Melanie Thielker
527c2cdb1e
Merge commit '68c8633ba18f0a11cfc0ed04d1d0c7c59e6cec76'
2014-06-21 00:23:11 +02:00
Melanie Thielker
5908e7d0c2
Merge commit '69bc37acd66e9ac9938d4a657dc6b9a0ba9f021e'
2014-06-21 00:22:51 +02:00
Melanie Thielker
e0f360e495
Merge commit '4153cfbf14132931b981168b7b3e7c5b8d5be8b5'
2014-06-21 00:22:29 +02:00
Melanie Thielker
711441f922
Merge commit '84eb25da23765b3a4f7ae5513e8a238680bb99f2'
2014-06-21 00:21:29 +02:00
Melanie Thielker
94650c43cd
Add forgotten file
2014-06-21 00:08:39 +02:00
Melanie Thielker
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
Melanie Thielker
1d1e444aed
Convert region loading to new format
2014-04-26 02:43:13 +02:00
Melanie Thielker
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
Justin Clark-Casey (justincc)
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
Dev Random
fb321a0573
Prevent sending Land Properties for unprivileged users
2014-04-23 22:59:13 +01:00
Melanie Thielker
f93dac9239
Implement Oren's fix to prevent a privilege escalation with groups
2014-04-20 10:47:31 +02:00
Melanie Thielker
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
Melanie Thielker
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
Melanie Thielker
075cf2baa3
Remove the spammy "voice not enabled" message some viewers trigger in non voice parcels
2014-03-25 03:17:04 +01:00
Melanie Thielker
17aeec8860
Reinstate the timed region change signal
2014-03-25 03:16:37 +01:00
Melanie Thielker
c0cdc6b74f
Add delete maptile ability to MapImageService - yet untested
2014-03-18 02:16:00 +01:00
Melanie
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
Melanie
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
Justin Clark-Casey (justincc)
cd35d298fa
Merge branch 'justincc-master'
2014-01-28 00:23:10 +00:00
Oren Hurvitz
2cf224166f
Added osGetRegionSize(), which returns the region size in meters and recognizes megaregions
2014-01-28 00:11:50 +00:00
Justin Clark-Casey (justincc)
f7172095e0
Convert tabs to spaces from previous commit 8c2b41b01
2014-01-28 00:04:55 +00:00
Dev Random
8c2b41b01d
Make inidirectory files supercede distro files
2014-01-27 23:56:10 +00:00
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
e2fbc88d98
Re-enabled NPCModuleTests.TestCreate()
2014-01-27 22:56:51 +00:00
Justin Clark-Casey (justincc)
0eda7dd1c7
Merge branch 'justincc-master'
2014-01-24 19:41:41 +00:00
Justin Clark-Casey (justincc)
fea8345f56
minor: remove long unused state queue from "show queues" console reports
2014-01-24 19:40:14 +00:00
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
966ab21839
Merge branch 'justincc-master'
2014-01-24 00:17:39 +00:00
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
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
Mic Bowman
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
dahlia
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
dahlia
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
dahlia
719810e9d8
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2014-01-20 11:54:36 -08:00
dahlia
1cae3664a5
add null texture entry face check before converting legacy materials
2014-01-20 11:53:33 -08:00
Justin Clark-Casey (justincc)
5fc871027e
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2014-01-20 19:38:47 +00:00
Justin Clark-Casey (justincc)
2cf7478b9a
Merge branch 'justincc-master'
2014-01-20 19:34:55 +00:00
Mic Bowman
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
Justin Clark-Casey (justincc)
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
dahlia
36d8a24a86
force SOG update when converting legacy materials to ensure changes are persisted
2014-01-20 03:11:01 -08:00
dahlia
95c926b2cd
delay texture entry parsing until absolutely necessary while converting legacy materials
2014-01-20 03:02:30 -08:00
dahlia
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
Oren Hurvitz
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
Oren Hurvitz
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
Oren Hurvitz
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
Oren Hurvitz
ca0336d834
Renamed MaterialsDemoModule to MaterialsModule
2014-01-20 00:38:41 -08:00
Oren Hurvitz
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
Robert Adams
4fb3d314b8
Fix casting error for float type INI file parameter parsing.
2014-01-19 07:37:14 -08:00
Justin Clark-Casey (justincc)
d466446df3
Merge branch 'justincc-master'
2014-01-18 01:39:45 +00:00
Justin Clark-Casey (justincc)
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
Oren Hurvitz
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
Justin Clark-Casey (justincc)
0cbe5f8424
Remove redundant methods in FlotsamAssetCache
2014-01-18 00:55:49 +00:00
Justin Clark-Casey (justincc)
b9453a8f6f
implement CoreAssetCache.Check()
2014-01-18 00:52:36 +00:00
Justin Clark-Casey (justincc)
427ffd3387
implement GlynnTuckerAssetCache.Check()
2014-01-18 00:48:20 +00:00
Justin Clark-Casey (justincc)
fc7ccfdafa
Properly implement CenomeAssetCache.Check()
2014-01-18 00:30:23 +00:00
Justin Clark-Casey (justincc)
ee8ba1ab9a
Simplify FlotsamAssetCache.CheckFromMemoryCache()
2014-01-18 00:21:53 +00:00
Justin Clark-Casey (justincc)
d381da81d6
minor: Add method doc to IImproveAssetCache
2014-01-18 00:15:38 +00:00
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
12bfce7b9f
elminate unnecessary asset != null check in FlotsamAssetCache.UpdateFileCache()
...
Passed in asset is always not null
2014-01-18 00:06:12 +00:00
Justin Clark-Casey (justincc)
b52b50ee56
minor: reinsert some method doc back into IEntityTransferModule
2014-01-17 23:36:23 +00:00
Justin Clark-Casey (justincc)
9fefbcf7fc
minor: since structs are values, assigning them to another variable copies it. Instantiation is unnecessary.
2014-01-17 23:32:37 +00:00
Justin Clark-Casey (justincc)
14c72d4a5b
Revert "Fixed: Windlight functions caused an error if called when the script's owner isn't in the scene"
...
This reverts commit 39e5785c0f
.
Did not mean to apply this yet.
2014-01-17 01:58:10 +00:00
Oren Hurvitz
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
Justin Clark-Casey (justincc)
4fa843ff19
Reorder checks in SP.CompleteMovement() to fix test failures
2014-01-16 23:44:17 +00:00
Justin Clark-Casey (justincc)
f467121c51
Merge branch 'justincc-master'
2014-01-16 23:33:30 +00:00
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
1a8b56fa87
Merge branch 'justincc-master'
2014-01-16 00:33:04 +00:00
Oren Hurvitz
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
Oren Hurvitz
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
Oren Hurvitz
21bc799a17
Fixed offline IM
2014-01-16 00:10:10 +00:00
Justin Clark-Casey (justincc)
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
Melanie
321bde8a3a
Minor: Add prentheses to make a condition clearer
2014-01-15 22:20:42 +01:00
Robert Adams
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
Justin Clark-Casey (justincc)
b5ef585069
Merge branch 'justincc-master'
2014-01-11 01:22:42 +00:00
Oren Hurvitz
bc0ff5e7d4
Allow Boolean nodes in XML to be specified as "0/1". AuroraSim does that.
2014-01-11 00:54:41 +00:00
Justin Clark-Casey (justincc)
09e800f4b1
Merge branch 'justincc-master'
2014-01-10 20:46:00 +00:00
David Rowe
08f2fc63cd
Fixed llTextBox error message text
2014-01-10 20:43:24 +00:00
Justin Clark-Casey (justincc)
68cbccb288
Merge branch 'justincc-master'
2014-01-10 20:37:14 +00:00
Melanie
9050c152b4
Dynamically adjust to the number of visual params sent.
2014-01-10 20:31:52 +00:00
Oren Hurvitz
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
Justin Clark-Casey (justincc)
5e72de1908
Merge branch 'justincc-master'
2014-01-10 20:19:38 +00:00
Oren Hurvitz
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
Oren Hurvitz
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
Oren Hurvitz
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
Oren Hurvitz
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
Justin Clark-Casey (justincc)
32e9c16957
Merge branch 'justincc-master'
2014-01-08 01:04:26 +00:00
Justin Clark-Casey (justincc)
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
Melanie
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
Melanie
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
Melanie
31279a3308
Merge commit '08750501617ca332ab196b2f25030e3c635c9dd6' into careminster
2014-01-05 20:03:48 +00:00
Robert Adams
38148bd4b6
Some missing definitions needed for successful compilation.
2014-01-04 19:01:05 -08:00
Robert Adams
8ff2ff1a36
Remove some chatty DebugFormat statements. No functional changes.
2014-01-04 19:01:04 -08:00
Robert Adams
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
Robert Adams
004ecee314
varregion: send region size in LLLoginResponse.
2014-01-04 19:01:03 -08:00
Robert Adams
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
Melanie
dd96fef940
Dynamically adjust to the number of visual params sent.
2014-01-04 21:18:37 +00:00
Robert Adams
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
Robert Adams
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
Justin Clark-Casey (justincc)
540fa84842
Merge branch 'justincc-master'
2013-12-21 01:12:45 +00:00
Justin Clark-Casey (justincc)
2f94165dcc
Add lsl arg syntax checking for control event
2013-12-21 01:00:50 +00:00
Justin Clark-Casey (justincc)
f1cd813a29
refactor: rename internal lsl parser VectorDeclaration -> VecDeclaration for consistency
2013-12-21 00:49:01 +00:00
Justin Clark-Casey (justincc)
871ac5b16c
Add arg checking for at_target lsl event
2013-12-21 00:46:34 +00:00
Justin Clark-Casey (justincc)
a5e4780547
Add lsl event arg checking for at_rot_target
2013-12-21 00:37:56 +00:00
Justin Clark-Casey (justincc)
b757ab2586
Add lsl event argument checking for attach and on_rez
2013-12-21 00:08:36 +00:00
Justin Clark-Casey (justincc)
68773ee7c4
Merge branch 'justincc-master'
2013-12-19 01:41:04 +00:00
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
a5ca15c428
Create regression test TestSendAgentGroupDataUpdate() for groups agent data sending
2013-12-18 23:35:38 +00:00
BlueWall
141d771a93
Fix issue with editing notes for other avatars
2013-12-16 17:36:21 -05:00
BlueWall
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
Melanie
fe01e7d1cc
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2013-12-16 22:11:03 +00:00
Melanie
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
Justin Clark-Casey (justincc)
00e632ec3a
Merge branch 'justincc-master'
2013-12-14 02:49:23 +00:00
Justin Clark-Casey (justincc)
51da52f904
Extend TestLlGetNotecardLine() regression test to contain chars that are two bytes in utf8
2013-12-14 02:48:29 +00:00
Justin Clark-Casey (justincc)
38d7d46c17
Merge branch 'justincc-master'
2013-12-14 02:33:08 +00:00
Kevin Cozens
957449e62c
ParseNotecardToList() returned data past end of notecard text (mantis #6881 ).
2013-12-14 02:25:28 +00:00
Justin Clark-Casey (justincc)
ee163b5751
Merge branch 'justincc-master'
2013-12-14 02:23:12 +00:00
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
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
Eva Comaroski
63ccc3dbf5
Convert if-blocks to return statements in small functions such as GetStartParameter().
2013-12-14 01:20:24 +00:00
Justin Clark-Casey (justincc)
bf826699a5
Merge branch 'justincc-master'
2013-12-14 01:13:17 +00:00
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
5ddd818238
minor: Make wind console commands print out to console rather than log
2013-12-14 00:50:06 +00:00
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
11f177d6a8
Eliminate unnecessary line from my previous commit 1d605642
2013-12-13 23:30:08 +00:00
Justin Clark-Casey (justincc)
1d605642f7
Refix sitting on child prims by reinserting relevant code back into SP.HandleAgentSit()
2013-12-11 23:59:52 +00:00
Melanie
82ebb86d58
Replace proprietary file header with BSD one
2013-12-11 01:51:57 +00:00
Melanie
92aad6f1bb
Add missing files *blush*
2013-12-11 01:44:03 +00:00
Melanie
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
Melanie
3df8990e6f
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2013-12-11 00:14:16 +00:00
Melanie
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
dahlia
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
Melanie
958a8f274b
Revert "Add support for user preferences (im via email)"
...
This reverts commit 1842388bb4
.
2013-12-07 01:29:15 +00:00
Melanie
ba48816fb6
Merge branch 'master' into careminster
2013-12-07 01:19:20 +00:00
Melanie
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
dahlia
8f221a3077
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-12-06 16:25:26 -08:00
dahlia
c0380d1bfe
apparently mono DeflateStream has no CopyTo method =(
2013-12-06 16:24:44 -08:00
Diva Canto
5047bd7b44
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-12-06 16:02:03 -08:00
Diva Canto
4058e5f709
Fixed misleading comment
2013-12-06 16:01:29 -08:00
dahlia
aba2a44453
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-12-06 15:58:51 -08:00
dahlia
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
BlueWall
1842388bb4
Add support for user preferences (im via email)
2013-12-06 02:52:13 -05:00
BlueWall
04f8fc1ce9
Adding profile partners fix to SQLite and PgSQL drivers
2013-12-05 20:25:28 -05:00
BlueWall
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
Fernando Oliveira
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
Justin Clark-Casey (justincc)
bb4f4d9480
minor: Use enums for setting inv/asset types on data upload rather than magic numbers
2013-12-06 00:38:18 +00:00
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
4bd4f1cd83
Remove nudgehack from SP.HandleAgentUpdate by making MovementFlag a uint rather than a byte
2013-11-30 01:14:12 +00:00
Justin Clark-Casey (justincc)
8b3a4367ea
Still send CameraEyeOffset in UDP SendSitReponse even if at offset is Vector3.Zero
2013-11-29 02:51:35 +00:00
Justin Clark-Casey (justincc)
5f0e763062
Remove unused sp.ParentPosition, which has not been used for some time
2013-11-29 02:48:59 +00:00
Justin Clark-Casey (justincc)
84bfde3bdf
Comment out debug sit message accidently left active
2013-11-29 02:45:14 +00:00
Justin Clark-Casey (justincc)
ca079c378a
Merge branch 'link-sitting'
2013-11-29 02:41:32 +00:00
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
f9193e3c51
Restore SP.AbsolutePosition to properly return actual absolute position when sitting
2013-11-29 01:50:12 +00:00
Justin Clark-Casey (justincc)
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
Mic Bowman
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
dahlia
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
Justin Clark-Casey (justincc)
0785210e29
Fix stand positions rather than having the stand jump to the root prim.
2013-11-27 02:08:22 +00:00
dahlia
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
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
36d146bf27
fix position changes when sitting on a prim with position and/or orientation explicitly specified
2013-11-26 00:43:35 +00:00
Fernando Oliveira
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