3341bbbc3b
Merge branch 'avination-current'
2014-08-23 19:12:12 +02:00
39e052982b
Fix a null ref that will cause an exception if a grid region doesnt' specify a URI.
2014-08-23 19:10:15 +02:00
5f51abada9
If GridUserService is asked for a nonexistent user, bail gracefully
2014-08-23 18:17:33 +02:00
d34599b1a5
If GridUserService is asked for a nonexistent user, bail gracefully
2014-08-23 18:16:11 +02:00
1a7efc2c64
Change the map tile system to be multi-grid hosting compatible
...
Conflicts:
OpenSim/Server/Handlers/Map/MapRemoveServerConnector.cs
2014-08-23 17:33:14 +02:00
cbd7c7b9ec
Change the map tile system to be multi-grid hosting compatible
2014-08-23 17:27:01 +02:00
8fd836c299
back to sending attachment sog kills in place of the hack. This is the
...
official way of doing it
2014-08-23 12:03:55 +01:00
1aa335078a
sop SendFullUpdate() goes by presence if it is a attachment
2014-08-22 21:54:00 +01:00
fabab7414f
Remove database connection locking in MySQLXAssetData. This is unnecessary as connections aren't shared and transactions are already in place where necessary.
2014-08-22 20:34:33 +01:00
0cb805a64c
Remove query locking in MySQLUserProfileData. This is not necessary as the connection is not shared.
2014-08-22 20:28:56 +01:00
709038aa2a
Remove some use of database connection locking from MySQLSimulationData - this has not been necessary for some time as database connections are not shared.
...
However, many locks remain since they may effectively be providing transactionality in some operations (e.g. prim updates across multiple tables).
These are candidates for being replaced with proper database transactions, since this would not block unrelated operations (e.g. land save and object save)
or unrelated operations on the same tables (e.g. storage of one linkset whilst another is being removed).
In practice, any performance deg due to contention is probably rare and short lived as the major prim operations are performed in memory and only persisted some time afterwards.
2014-08-22 20:23:48 +01:00
0295e6822d
some cleanup ( well or not )
2014-08-22 20:01:07 +01:00
d899bdcb9b
Remove lock in MySQLFramework. This is not necessary as the connection is not shared.
2014-08-22 19:52:03 +01:00
f129b824c3
Removing locking on requests in MySQLAssetData.
...
These locks are not necessary since the connection is taken from the underlying mysql pool and not shared.
Such locking is already not done by some other parts of OpenSim.Data.MySQL.
Pointed out by arribasim-dev
2014-08-22 19:46:46 +01:00
9a8d8d2130
Merge branch 'master' into ubitworkmaster
2014-08-22 01:06:43 +01:00
c95fd60806
revert the kills, they seem even worse
2014-08-22 00:28:05 +01:00
0da7f8e863
silly...
2014-08-22 00:01:50 +01:00
be02fb3904
replace hack by sog kills on tp out
2014-08-21 23:43:06 +01:00
d5bb80798d
make the hack more extensive. Forbid sog/sop updates if Intransit but
...
release it sooner
2014-08-21 23:18:51 +01:00
6674548af0
replace AgentHasMovedAway + KillEntity by a hacked version on teleports
2014-08-21 22:42:45 +01:00
7ba3b88fb6
Merge branch 'master' into bullet-2.82
2014-08-21 06:36:19 -07:00
28ef6f83fc
Fix typo in OpenSimDefaults.ini comment
2014-08-21 06:35:27 -07:00
674be72225
BulletSim: add new Bullet 2.82 constraint type codes and rename the
...
BulletSim fixed constraint to not be confused with the native version.
2014-08-21 06:33:04 -07:00
ad83b18634
some cleanup..
2014-08-21 14:07:55 +01:00
b68c814bc6
...
2014-08-21 10:53:59 +01:00
114144407b
variations..
2014-08-21 09:32:36 +01:00
5f1cb6542d
test
2014-08-21 06:35:11 +01:00
ad6f942279
add filter sog updates
2014-08-21 06:11:19 +01:00
d98d64a61a
bug fix
2014-08-21 05:28:35 +01:00
d2f3a19838
test
2014-08-21 05:00:51 +01:00
6acfa77919
test
2014-08-21 04:35:04 +01:00
87f03c040c
bad test
2014-08-21 04:07:23 +01:00
f06f13b59d
Merge branch 'ubitworkmaster'
2014-08-21 02:38:57 +02:00
5bf145a397
add a direct sendpartfullUpdate to send a full object update to a part,
...
optionally overriding its parentID. check what it does to attachments
2014-08-21 00:49:10 +01:00
ea1c232f92
revert droping udp packet resends after 6 retries, keep resending.
2014-08-21 00:08:43 +01:00
88587b4e73
reserve updates priority queue 2 for attachments, send them by it on
...
BestAvatarResp scheme. Attachments cannot be sent on imediate queues,
since they will block everything. Changed distance to priority math,
keeping identical result, shifted to start at queue 3.
2014-08-20 21:41:16 +01:00
542118adf1
remove from use the UpdatesResend on resending udp packets. Just resend
...
the UDP packet. Also just loose packets we tried to send 6 times already
(ll says 3) A viewer may just beeing ignoring them, or then the link is just dead.
2014-08-20 18:55:06 +01:00
16cf3967b4
Reserve a extra localID for a presence ( it will be localID + 1 )
2014-08-20 17:54:23 +01:00
b21b6532b0
sending attachment kills before putting them back doesnt cover all cases
...
and seems heavy for viewers
2014-08-20 17:48:10 +01:00
24b4f6ad7b
Merge branch 'ubitworkmaster'
2014-08-20 04:39:48 +02:00
d16f7df673
also send attachment pre-kills on crossings
2014-08-19 20:33:26 +01:00
6aa60a5d97
test ....
2014-08-19 19:56:43 +01:00
cca2ae3c89
test
2014-08-19 19:47:41 +01:00
4e03d352c3
Extend drop command to "debug lludp drop <in|out>..." to allow drop of inbound packets.
...
For test/debug purposes.
2014-08-19 18:43:21 +01:00
298376d5c7
Add "debug lludp drop out <add|remove> <packet-name>" console command for debug/test purposes.
...
This drops all outbound packets that match a given packet name.
Can currently only be applied to all connections in a scene.
2014-08-19 18:34:17 +01:00
919aef1573
send zero velocity again on avatar full update or its ugly
2014-08-19 10:03:04 +01:00
ca43a7fe63
variationsss...
2014-08-19 09:42:45 +01:00
b0253362c7
remove the silly sendTerseUpdates. I was fooled by wingridproxy not
...
decoding updates correctly
2014-08-19 09:18:29 +01:00
8f0d35e59a
fix the encoding of rotation in updates, not just using the next field to
...
override w bytes. ( specially having it commented )
2014-08-19 09:04:20 +01:00
e883fb519b
test
2014-08-19 06:53:02 +01:00
Melanie Thielker