ubit
5b86af36e6
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2013-01-16 20:23:45 +01:00
Melanie
582cb89beb
Add a way to put things at the front of the queue for any throttle group.
...
Adds a DoubleLocklessQueue and uses it for the outgoing buckets. Added
a flag value to the Throttle Type (again) because although it's hacky, it's
the best of a bad bunch to get the message through the UDP stack to where it's
needed.
2013-01-16 19:29:27 +01:00
Melanie
206bfe0657
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
OpenSim/Region/ScriptEngine/Shared/Instance/Tests/CoopTerminationTests.cs
2013-01-16 17:05:37 +00:00
Melanie
9c99ed26eb
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2013-01-16 16:52:57 +00:00
Melanie
5563a8916e
Complete removal of the now unused state queue
2013-01-16 16:45:18 +00:00
Melanie
518326b049
Merge branch 'ubitwork' into avination
2013-01-16 16:47:21 +01:00
Melanie
91138014e2
Change all uses of the removed state queue to the task queue for now.
2013-01-16 17:12:56 +00:00
Melanie
85aa1804df
Complete removal of the now unused state queue
2013-01-16 17:06:25 +00:00
ubit
778ed1c05a
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2013-01-16 16:35:09 +01:00
UbitUmarov
4d92c6b39f
fix STATE udp queue data rate since it is in use again, after being
...
removed by intel folks (?)( should it be used or removed ??)
2013-01-16 15:30:58 +00:00
ubit
503705bfad
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2013-01-16 14:24:23 +01:00
UbitUmarov
94710a17a4
Merge branch 'avination' into ubitwork
2013-01-16 13:11:02 +00:00
Melanie
70fa41863d
Merge commit 'f54b398540698e6e09022fe77b6405624b532f5c' into careminster
2013-01-16 01:13:14 +00:00
dahlia
055b8a2d58
move resit fix to ScenePresence.cs and allow for requesting sit on objects other than the object currently sat on
2013-01-14 22:24:24 -08:00
ubit
ee6333f89b
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2013-01-13 16:27:47 +01:00
UbitUmarov
b263587e21
try to patch getmesh Throttle (test)
2013-01-13 15:25:51 +00:00
Melanie
923e5df7ae
Merge branch 'master' into careminster
2013-01-13 13:44:24 +00:00
dahlia
2eb0d8b617
add some sanity checking to HandleAgentRequestSit handler
2013-01-13 13:43:59 +00:00
dahlia
72cc94cfbc
add some sanity checking to HandleAgentRequestSit handler
2013-01-10 20:21:18 -08:00
Melanie
3a495ccd56
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Timer.cs
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
2013-01-10 01:38:03 +00:00
Melanie
aecb32b74e
Merge branch 'avination' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2013-01-10 01:25:07 +00:00
ubit
f392fa96c3
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2013-01-09 18:03:04 +01:00
Melanie
2ac96dd181
Add the new UpdateAgentInformation cap to make maturity on more recent viewers
...
work.
2013-01-08 22:52:14 +00:00
Melanie
0a393b317d
Add the new UpdateAgentInformation cap to make maturity on more recent viewers
...
work.
2013-01-08 22:32:39 +01:00
ubit
152407f341
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2013-01-08 15:11:04 +01:00
Melanie
083ac92b34
Merge branch 'avination' into careminster
2013-01-06 10:52:22 +00:00
ubit
41a44d7165
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2013-01-02 09:28:55 +01:00
teravus
2805ec6466
* Fixed a bug that replayed old cached appearance when changing outfits
...
* Added suser(bad client) DOS protection by limiting the max cacheitems to the maximum sane amount.
* Prevents potential numerous loops from running amok and index errors if the client purposely provides bad cache info.
* If the XBakes service wasn't running, the SetAvatarAppearance routine would crash when contacting the XBakes service even though it was in a Try/Catch for the appropriate error type. It only properly error handles with the type Exception :(. (commented on that because it's unusual)
2012-12-31 23:04:28 -05:00
teravus
6797ac1474
* This finishes the implementation of AgentCachedTexture. Requires the XBakes Module and service for full functionality. Previous no-cache functionality works without the service and module. In some ways, I would have been happier not putting an AssetBase in WearableCacheItem.. but turns out it was probably unavoidable. No additional locks, yay.
2012-12-29 08:53:58 -05:00
teravus
77cc7ce399
* Partial Commit for Avatar Appearance to include the functionality of Cached Bakes.
2012-12-21 19:12:30 -05:00
Melanie
569f39e124
Merge branch 'master' into careminster
2012-12-21 22:13:41 +00:00
teravus
c648325d7c
Merge branch 'avination' of careminster:/var/git/careminster into teravuswork
2012-12-19 11:53:26 -05:00
Justin Clark-Casey (justincc)
ae67435146
Disable UDPPacketBuffer pooling for now to resolve an issue on Windows of interference between incoming packets.
...
On Windows, concurrent multi-threaded processing of inbound UDP somehow allows different data input processing to interfere with each other.
Possibly the endpoint reference is being switched, though I don't yet know the mechanism. Not seen on Mono.
Also resolveable by setting RecyclePackets = false or RecycleBaseUDPPackets = false in [PacketPool]
Or async_packet_handling = false in [ClientStack.LindenUDP]
For now, will simply disable this particular pooling though will revisit this issue.
In response to http://opensimulator.org/mantis/view.php?id=6468
2012-12-19 01:51:30 +00:00
ubit
021485b581
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-12-18 11:09:53 +01:00
Melanie
79bdf464d3
Merge branch 'avination' into careminster
2012-12-18 09:48:12 +00:00
Melanie
0a876a305c
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
2012-12-16 21:19:30 +00:00
Melanie
1d713bcdb8
Merge branch 'ubitwork' into avination
2012-12-14 03:57:31 +01:00
Melanie
7a093df24b
Prevent a failed user relogi from throwing exceptions in poll services
2012-12-14 03:35:55 +01:00
Justin Clark-Casey (justincc)
0b93a68030
minor: add some more detail to the logging if an LLClientView fails to process a packet
2012-12-13 23:32:28 +00:00
ubit
3cf0d8b165
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-12-13 08:36:18 +01:00
UbitUmarov
b3a77c16bd
FIX small avatars movement on terrain. (avatar appearance getting even
...
more messy)
2012-12-13 07:34:27 +00:00
ubit
020bc9c358
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-12-13 04:36:47 +01:00
UbitUmarov
20773dcfcc
add a Check method to flotsamAssetCache, so to check if a asset is in
...
cache without actually loading it. Make use limited use of it in
avatarfactory textures check. Also on llclientview
HandleAgentTextureCached that now should work. Other asset cache modules
for now will return false, so are broken. baked textures logic
still unchanged. *UNTESTED*
2012-12-13 02:55:36 +00:00
ubit
a1f0e3d95a
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-12-11 05:37:33 +01:00
UbitUmarov
c6430b14db
typo fix
2012-12-10 11:25:30 +00:00
UbitUmarov
ecdd0e225f
add velocityinterpolator packets handling but actually do nothing, since
...
they don't do what i was looking for.
2012-12-09 00:55:09 +00:00
teravus
6c1a852137
* This is a better way to do the last commit.
2012-12-08 00:05:12 -05:00
teravus
0e2b717b4d
* Should promote faster self appearance.
2012-12-07 20:15:32 -05:00
ubit
fc33b7e9eb
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-12-07 22:28:48 +01:00
UbitUmarov
93bede4e6a
revert the use of avatar skeleton and use avatar size provided by viewers,
...
since at least for now seems good enought
2012-12-07 21:26:58 +00:00
