Melanie
7bf33d333a
Plumb the path from the client to the extra physics params and back
2013-02-07 22:25:28 +00:00
Melanie
8b78b9429d
Merge branch 'avination' into careminster
2013-02-07 21:26:55 +00:00
Melanie
bbda7b94b3
Rename Bounciness to Restitution
2013-02-07 21:25:55 +00:00
Melanie
338b02a8bc
Send the new physics params to the viewer build dialog
2013-02-07 21:23:35 +00:00
Melanie
6aa876a83b
Rename Bounciness to Restitution
2013-02-07 03:40:48 +00:00
Melanie
598f891d70
Move SoubleQueu to Util. Change HTTP inv to prioritize COF. Determine COF for SP
2013-02-06 04:03:32 +01:00
teravus
2104e4d4d4
* the root prim was being given an OffsetPosition in addition to setting the position when creating the root prim. The offset position caused the positioning code to re-move the root prim when you selected it and released it.
2013-02-05 18:46:02 -05:00
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
cc1781926b
* Adds a satisfying angular roll when an avatar is flying and turning. (General, not physics). Makes flying not feel as stiff.
...
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
2013-01-31 20:37:58 +00: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
ubit
2eab339b87
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2013-01-26 04:40:48 +01: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
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
