Diva Canto
c4cd98bc34
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2014-09-21 09:23:15 -07:00
Diva Canto
94619cba58
Fixed a hard-to-run-into bug in groups: at the time of creation of a group, the OwnerRoleID in the groups table was inconsistent with the roleID in the roles table. OpenSim core was not running into this bug, but 3rd party modules (like Wifi) were.
2014-09-21 09:22:32 -07:00
Robert Adams
2ed3a918bd
Merge branch 'master' into bullet-2.82
2014-09-21 07:11:00 -07:00
Melanie Thielker
4002cd96a5
When sending http requests, close the response stream instead of waiting
...
for the finalizer to do it, if it ever does.
2014-09-20 20:42:07 +02:00
UbitUmarov
9c552212a9
exclude npcs from baked cache
2014-09-19 16:51:51 +01:00
UbitUmarov
242bb425f3
fix positions on same frames transitions
2014-09-19 01:07:20 +01:00
UbitUmarov
f35f90bd72
dont give a ring to each asset request, just one to rule them all, i mean
...
thread not ring
2014-09-18 19:40:59 +01:00
BlueWall
519c753e46
This fixes the Scene thread renaming issue
2014-09-17 20:25:27 -04:00
BlueWall
96a2449122
Undo "Revert "Small changes to threading to send thread names to unmanaged threads. Needs Mono 3.6+ to see thread names in utilities like top -H . Some formatting of the thread name to fin in the 16 byte limit on Linux. Please test on Windows to see if the work has any adverse effects.""
...
Fix for break in next commit
This reverts commit 376fab1402
.
2014-09-17 20:03:54 -04:00
Justin Clark-Casey (justincc)
1f40630a9a
Add eeyore to contributors
2014-09-17 23:45:53 +01:00
Edward
427240f935
Changes to be committed: modified: OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs modified: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs This solves mantis bug# 5005: llRegionSay script does not trigger ChatFromWorld event. This was solved by adding World.SimChat() command to the llRegionSay() function (per suggestion of DrCuriosity). Additionally this fixes llRegionSayTo() which was also not functioning by adding a World.SimChat() command and adding a new SimChatToAgent() overrided function to Scene.PacketHandlers.cs This is the second patch revision. Corrections made to the position of World.SimChat() and removal of tabs per suggestion by justincc.
2014-09-17 23:37:18 +01:00
BlueWall
376fab1402
Revert "Small changes to threading to send thread names to unmanaged threads. Needs Mono 3.6+ to see thread names in utilities like top -H . Some formatting of the thread name to fin in the 16 byte limit on Linux. Please test on Windows to see if the work has any adverse effects."
...
This reverts commit af286d5fcb
.
Issue with Jenkins builds
2014-09-17 18:11:41 -04:00
BlueWall
af286d5fcb
Small changes to threading to send thread names to unmanaged threads. Needs Mono 3.6+ to see thread names in utilities like top -H . Some formatting of the thread name to fin in the 16 byte limit on Linux. Please test on Windows to see if the work has any adverse effects.
2014-09-17 17:56:10 -04:00
UbitUmarov
6e015125c5
Merge branch 'master' into ubitworkmaster
2014-09-17 21:48:36 +01:00
UbitUmarov
ce8ea55f4e
... and a few more..
2014-09-17 17:25:07 +01:00
UbitUmarov
060984502e
and another one
2014-09-17 17:00:13 +01:00
UbitUmarov
9f07c64690
another close()
2014-09-17 16:51:07 +01:00
UbitUmarov
df389dceb8
add some _response.close. RestClient still looks bad. It should be a
...
proper IDisposable object.
2014-09-17 16:19:00 +01:00
UbitUmarov
9bf3e2a257
dispose some tmp streams
2014-09-17 15:36:22 +01:00
UbitUmarov
f254761649
turn off Nangle on users of ServivePointManager like webrequests
2014-09-17 14:47:36 +01:00
UbitUmarov
1953a0f4e0
Dont add to physics in a child update. It is missing several checks like
...
sit. makeroot should to it
2014-09-17 13:36:39 +01:00
UbitUmarov
affcdcce8b
try to send fly state on tps
2014-09-16 21:25:06 +01:00
Melanie Thielker
8014ce7f1a
Fix a nullref in a debug message. If we have no SceneAgent, we can't output data from it.
2014-09-15 23:15:27 +02:00
Melanie Thielker
d43d3df724
Reinstate closing the client if CloseAgen returns false. This was part
...
of the last Ubit patch.
2014-09-14 20:46:22 +02:00
UbitUmarov
3d9f25a19d
revert changes to m_pendingCache and remove client close if there is no
...
SP, as requested
2014-09-14 02:28:42 +01:00
UbitUmarov
52cde5fe96
Merge branch 'master' into ubitworkmaster
2014-09-14 01:18:03 +01:00
UbitUmarov
908e0e1cef
do not use a blind expire of m_pendingCache. Entries must be valid while
...
respective HandleUseCircuitCode, no matter how long it takes, so a viewer
retry doesnt start a overlapping one. It HandleUseCircuitCode
responsability to always remove entries, even on fails. Remove a client
even if m_scene.CloseAgent fails.
2014-09-13 20:37:20 +01:00
Melanie Thielker
8ab5f2ce84
When CloseAgnt is called with an agent id that doesn't have a presence, check for stray clients and clean them up instead of failing.
2014-09-13 16:39:56 +02:00
Melanie Thielker
42b2248960
If a client's SceneAgent is null, that client is not fully logged in or
...
crashed while logging out. Don't reuse it, create a new one.
2014-09-13 00:49:32 +02:00
Justin Clark-Casey (justincc)
2d3072f053
When osNpcMoveToTarget() is called for a sitting avatar then silently do nothing rather than throwing an error.
...
Resolves http://opensimulator.org/mantis/view.php?id=7311
2014-09-12 23:37:44 +01:00
UbitUmarov
ffe5ede550
taskInventory request: give each transfer a diferent filename, Add more
...
agressive lock
2014-09-12 11:48:43 +01:00
Justin Clark-Casey (justincc)
3f35c5a421
Add cinderblocks and bobshaffer2 to contributors.
2014-09-12 00:36:45 +01:00
Justin Clark-Casey (justincc)
70953dbfcd
Fix issues where setting llSetTextureAnim(FALSE... did not work properly).
...
I ended up amalgamating patches from http://opensimulator.org/mantis/view.php?id=7313 and http://opensimulator.org/mantis/view.php?id=7318
Thanks a lot to both bobshaffer2 and cinderblocks.
2014-09-12 00:34:39 +01:00
Justin Clark-Casey (justincc)
a3bd708e77
Fix regression from recent a02dae5
where stand positions are no longer correct when a sit target is specified.
...
Adjusts stand position using just avatar position relative to the root prim instead.
Fixes http://opensimulator.org/mantis/view.php?id=7315 and preserves previous fix for http://opensimulator.org/mantis/view.php?id=7299
2014-09-11 20:59:20 +01:00
UbitUmarov
df8eae1957
handle AO sit ground case
2014-09-10 20:55:00 +01:00
UbitUmarov
f66b58cf00
*TEST* add movement states SIT and SITGROUND. ScenePresence on SIT,
...
SITGROUND or STAND, sets directly the state, and desired sitAnimation for
default sits
2014-09-10 19:30:57 +01:00
Melanie Thielker
0caa59b286
Fix a nullref that can hit Vivox voice
2014-09-10 02:43:51 +02:00
UbitUmarov
724d174a77
it its a default ( internal ) animation return its name in lower case
2014-09-09 23:36:10 +01:00
UbitUmarov
13cb6ef6ef
remove the check animState == anim for same reasons
2014-09-09 23:30:31 +01:00
UbitUmarov
4842806ea8
look for animation on part inventory before default animations, so
...
user can use same name. Search directly on default animations using
uppercase.
2014-09-09 23:22:36 +01:00
UbitUmarov
e37fd5e716
force update of movement animation
2014-09-09 22:27:21 +01:00
UbitUmarov
9d815e2d2a
on SetAnimationOverride do a UpdateMovementAnimations();
2014-09-09 22:07:03 +01:00
UbitUmarov
016e58e354
*test*
2014-09-09 21:53:27 +01:00
Melanie Thielker
87a4abac50
Plumb the rest of the serverside AO
2014-09-09 20:50:41 +02:00
Melanie Thielker
339904bc52
Merge branch 'ubitworkmaster'
2014-09-09 20:16:43 +02:00
Melanie Thielker
2d2823f1de
Add some case magic and send an anim pack when an override is set
2014-09-09 20:16:02 +02:00
UbitUmarov
002a2deaf9
add full delete if uuid iz zero and state is ALL
2014-09-09 19:09:06 +01:00
Justin Clark-Casey (justincc)
b4ce71df1e
Make proper fix for last commit wrt Mantis 7317 by replacing disallowed c char and not literal 'c'
2014-09-09 18:57:02 +01:00
Justin Clark-Casey (justincc)
e271607bef
For stat names containing periods, replace with '#' rather than throw exception
...
In relation to http://opensimulator.org/mantis/view.php?id=7317
2014-09-09 18:56:58 +01:00
UbitUmarov
46abe0c86d
Merge branch 'master' into ubitworkmaster
2014-09-09 13:54:00 +01:00