ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-06-07 20:15:43 +08:00
Code Issues Packages Projects Releases Wiki Activity
22,681 Commits 5 Branches 97 Tags
d3892bbd0674e4f6912ce89e54712ea405dbbfb8
Commit Graph

2316 Commits

Author SHA1 Message Date
Melanie
d3892bbd06 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Data/MySQL/MySQLSimulationData.cs
	OpenSim/Framework/Servers/VersionInfo.cs
	OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
 2013-02-05 21:30:12 +00:00
Melanie
6bce4bc112 Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim 2013-02-05 20:09:45 +00:00
Melanie
2163bebeb4 Try to fix uploaded mesh rotations - code from Avination code base. 2013-02-05 20:09:02 +00:00
Justin Clark-Casey (justincc)
1f1da23097 Bump version and assembly version numbers from 0.7.5 to 0.7.6 
This is mostly Bluewall's work but I am also bumping the general version number
OpenSimulator 0.7.5 remains in the release candidate stage.
I'm doing this because master is significantly adding things that will not be in 0.7.5
This update should not cause issues with existing external binary DLLs because our DLLs do not have strong names
and so the exact version match requirement is not in force.
 2013-02-05 00:23:17 +00:00
Melanie
7482ad1c22 Merge branch 'master' into careminster 2013-02-04 19:21:39 +00:00
teravus
6b0310b829 Adds the ability to load more then one IClientNetworkServer thereby allowing additional client network servers at the same time. Use comma separated values in clientstack_plugin in your config. Additional plugins lying around shouldn't be picked up because the loader only loads configured dll assemblies and breaks at the first IClientNetworkServer found in the assembly. (the only new functionality is the ability to specify more in config). Note: The existing functionality also passes in a nini config.. and has a boolean to determine if the client network server should be initialized for a specific scene. 2013-02-03 08:13:52 -05:00
Melanie
9a4de546fe Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
 2013-01-31 02:53:11 +00:00
teravus
7c4e0ff03c * Adds a satisfying angular roll when an avatar is flying and turning. (General, not physics). Makes flying not feel as stiff. 2013-01-30 06:22:05 -05:00
Melanie
e6e6e8ab15 Merge branch 'avination' into careminster 2013-01-27 01:09:07 +00:00
teravus
9d1989e64f * Handle a NRE with Baked Textures that may result in a failed appearance. This may be an issue, or it may be a symptom. 2013-01-22 18:49:50 -05:00
Melanie
2d3a57a002 Merge branch 'avination' 
Conflicts:
	OpenSim/Framework/ThrottleOutPacketType.cs
	OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
	OpenSim/Region/CoreModules/Avatar/Groups/GroupsModule.cs
 2013-01-19 21:49:33 +01:00
Melanie
7bd9a0edb7 Remove group IM test code also mentioning "OpenSimulator Testing" 2013-01-19 14:30:38 +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
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
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
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