ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-05-25 03:05:41 +08:00
Code Issues Packages Projects Releases Wiki Activity
22,464 Commits 5 Branches 93 Tags
cc4cfd9fa81fa8e7c7254bd3c35e67ef9cb20dad
Commit Graph

2297 Commits

Author SHA1 Message Date
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
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
Melanie
923e5df7ae Merge branch 'master' into careminster 2013-01-13 13:44:24 +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
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
Melanie
083ac92b34 Merge branch 'avination' into careminster 2013-01-06 10:52:22 +00: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
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
UbitUmarov
b3a77c16bd FIX small avatars movement on terrain. (avatar appearance getting even 
more messy)
 2012-12-13 07:34:27 +00: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
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
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
Melanie
fd7a83f439 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
	OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
 2012-11-25 14:13:50 +00:00
Justin Clark-Casey (justincc)
22d4c52ffc Consistenly make NUnit test cases inherit from OpenSimTestCase which automatically turns off any logging enabled between tests 2012-11-24 03:15:24 +00:00
Melanie
c3e1701d43 Merge branch 'avination' into careminster 2012-11-22 13:33:34 +00:00
teravus
98b0cb8df8 * While this is not producing any problems.. and does help in low bandwidth situations I can't demonstrate that it's better then just letting the client request what it needs in terms of responsiveness of the mesh in the scene yet. 2012-11-22 08:13:35 -05:00
Melanie
decc5318a7 Merge branch 'avination' into careminster 2012-11-20 01:21:15 +00:00
Melanie
ccc81183b0 Merge commit '619c39e5144f15aca129d6d999bcc5c34133ee64' into careminster 
Conflicts:
	OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs
 2012-11-20 01:20:59 +00:00
teravus
5e0294815f * Plumbing and basic setting of the GetMesh Cap Throttler. 
* Last step is to flip the throttle distribution.
 2012-11-17 03:47:09 -05:00
Melanie
7ad082f7c3 Merge branch 'avination' into careminster 2012-11-17 02:58:14 +00:00
Melanie
e4659a83f1 Merge branch 'master' into careminster 2012-11-17 02:03:24 +00:00
Justin Clark-Casey (justincc)
cd088757e9 Add a first draft mechanism for the IncomingPacketsProcessedStat to show the delta over time. 
The chief motivation for this is to be able to tell whether there's any impact on incoming packet processing from enabling extra packet pooling.
 2012-11-16 04:36:22 +00:00
teravus
e9153e1d1a Revert "Merge master into teravuswork", it should have been avination, not master. 
This reverts commit dfac269032, reversing
changes made to 619c39e514.
 2012-11-15 10:05:16 -05:00
teravus
dfac269032 Merge master into teravuswork 2012-11-15 09:46:41 -05:00
Melanie
5895c4cc6f Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
 2012-11-15 03:46:10 +00:00
Justin Clark-Casey (justincc)
daf03bfb56 Handle Map block requests on a separate thread rather than the main packet handling thread. 
This prevents a slow grid information network call from holding up the main packet handling thread.
There's no obvious race condition reason for not doing this asynchronously.
 2012-11-15 03:09:20 +00:00
Justin Clark-Casey (justincc)
57273ef7b2 Do HandleMapLayerRequest on its own thread rather than on the main inbound udp packet handling thread. 
There's no obvious race condition reason for doing this on the main packet handling thread.
 2012-11-15 03:07:45 +00:00
Justin Clark-Casey (justincc)
df4da51f04 Following on from 4f982596, launch map name requests on an async thread from LLClientView directly. 
This releases the inbound packet handling thread marginally quicker and is more consistent with the other async packet handling
 2012-11-15 03:04:46 +00:00
Justin Clark-Casey (justincc)
038528dc80 Make PacketPool class stats pull stats instead of push stats so they can be lifted up into LLUDPServer and be distiguished by scene name 2012-11-15 02:02:59 +00:00
Justin Clark-Casey (justincc)
2c36106675 Add IncomingPacketsProcessedCount stat for diagnostics. 
Also puts some packet processing counts in a container named after the scene so that stats can be collected from more than one scene.
 2012-11-15 01:14:18 +00:00
Melanie
06fa1681ae Merge branch 'master' into careminster 2012-11-15 00:43:26 +00:00
Diva Canto
aeeaa3a0a9 Added AssemblyInfos to every dll in the OpenSim.Region namespace. 2012-11-14 11:09:43 -08:00