Melanie
69f29cb53e
Merge branch 'master' into careminster
2011-12-14 19:50:43 +00:00
Justin Clark-Casey (justincc)
e830a77860
Simplify some manipulation of _taintedActors in OdeScene
2011-12-14 18:33:44 +00:00
Justin Clark-Casey (justincc)
a110a7bd6a
Eliminate _taintedPrimsH and _taintedPrimsL (and _taintedPrimLock) in favour of just a _taintedPrims HashSet.
...
There's no point maintaining a list because any pending taint operations are all carried out in the same call anyway.
2011-12-14 18:03:25 +00:00
Justin Clark-Casey (justincc)
cec88872ae
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-12-14 17:59:55 +00:00
Justin Clark-Casey (justincc)
84023c8162
Fix off by one bug in objects GrabbingBehaviour of pCampBot.exe
...
Also fix usage message.
2011-12-14 16:43:49 +00:00
Melanie
898549d13e
Merge branch 'master' into careminster
2011-12-14 08:57:55 +00:00
Dan Lake
f43e5f92fd
Just adding a comment to SendFullUpdatToClient
2011-12-13 23:34:59 -08:00
Dan Lake
39736e52d8
Reorder clearing of upate schedule on SOP to before sending updates. Fix potential race condition.
2011-12-13 21:37:17 -08:00
Justin Clark-Casey (justincc)
b242ceda1e
In AvatarFactoryModule.SetApperance(), perform ValidateBakedTextureCache() in the same thread rather than on another one.
...
The caller is already an async thread from LLClientView so this doesn't hold up the client.
However, launching on a separate thread does remove the effect of m_setAppearanceLock
This was potentially allowing two different SetAppearance threads to interfere with each other, though this probably rarely happens, if at all.
2011-12-13 20:42:39 +00:00
Melanie
df65245671
Spin off terrain save into a new thread and make it so that it uses the old
...
values for places where NaN are found.
2011-12-13 12:58:28 +01:00
Melanie
6d1d1c0dbf
Comment debug spam
2011-12-13 00:36:44 +01:00
Melanie
d18a9f22e7
Prevent a nasty deadlock on teleport
2011-12-12 23:43:45 +01:00
Justin Clark-Casey (justincc)
4dfd2c7d47
minor: remove pointless comment from OdeScene.cs
2011-12-12 19:31:50 +00:00
Melanie
8418288e26
Make m_attachments private
2011-12-12 18:29:54 +01:00
Melanie
afab4b276e
Remove spammy log messages when querying sim health
2011-12-12 13:51:31 +01:00
Dan Lake
c34ab0ee66
Cleaned up ScenePresence parameters for Flying, WasFlying, FlyingOld and IsColliding
2011-12-12 02:43:38 -08:00
Melanie
95d533ce8a
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
2011-12-12 11:09:13 +01:00
Melanie
52a4dbccbe
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Framework/RegionInfo.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2011-12-12 11:42:22 +00:00
Melanie
943b37b8e6
Send changed animation event asynchronously
2011-12-12 11:08:50 +01:00
Dan Lake
3c55d2e776
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-12-12 00:41:53 -08:00
Dan Lake
db8fd1eb9f
Added an option for extra settings within region ini file. Any non-hardcoded key-value string pair can be added per-region and referenced by any part of OpenSim with access to the RegionInfo
2011-12-12 00:21:19 -08:00
nebadon
8ae824ff09
Mantis 5816: osParseJSON Decoding Problems
...
osParseJSON uses hand-crafted decoding that has two issues
* does not seem to handle top-level JSON lists
* does not seem to handle unicode text
thanks otakup0pe!
2011-12-11 23:25:12 -07:00
Melanie
3a91085ac2
Implement handler for TeleportCancel inbound packet
2011-12-10 15:17:34 +00:00
Melanie
323ffd7a89
Fix a regression that causes data from the attachments module to fail loading
2011-12-10 15:28:32 +01:00
Melanie
db98698bbe
Prevent spurious error message when client tries to move a null item
2011-12-10 14:47:00 +01:00
Melanie
6b080d57cb
Merge branch 'master' into careminster
2011-12-10 15:19:31 +00:00
Melanie
3f42183797
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
2011-12-10 00:40:41 +00:00
Justin Clark-Casey (justincc)
e88ad5aab9
minor: remove a mono compiler warning
2011-12-09 23:55:54 +00:00
Justin Clark-Casey (justincc)
5f276c3212
Print out one log message for every missing baked texture, rather than two.
2011-12-09 23:54:39 +00:00
Justin Clark-Casey (justincc)
0daa5d8b4d
minor: comment out "unpacked appearance" log mesasge for now
2011-12-09 23:44:34 +00:00
Justin Clark-Casey (justincc)
f24898d049
Comment out ChildAgentDataUpdate.Pack() "Pack data" message for now.
2011-12-09 23:24:52 +00:00
Justin Clark-Casey (justincc)
13b1c8c173
Do some clean up Scene.cs log messages.
...
This prints out both exception message and stacktrace (Exception.ToString()) isn't enough on Windows.
This also uses m_log.*Format() which is more efficient than string concat.
2011-12-09 23:21:54 +00:00
Justin Clark-Casey (justincc)
af3cd00048
Get rid of IScene.PresenceChildStatus() which always had to execute a lookup in favour of IClientAPI.ISceneAgent.IsChildAgent instead.
2011-12-09 23:07:53 +00:00
Melanie
5f6a4c4111
Merge branch 'master' into careminster
2011-12-09 22:55:08 +00:00
Justin Clark-Casey (justincc)
fc27806e90
remove some unused fields in ScenePresence
2011-12-09 22:52:54 +00:00
Justin Clark-Casey (justincc)
cb0da425d5
Fix "fix-phantoms" help message. Thanks Garmin Kawaguichi.
2011-12-09 22:41:39 +00:00
Justin Clark-Casey (justincc)
94c242f792
Move client id check in Scene.Inventory.cs:UpdateInventoryItemAsset so that it doesn't trigger an exception if the item hasn't been found.
...
In this situation we will now put out a slightly more meaningful log error message instead.
2011-12-09 22:36:51 +00:00
Justin Clark-Casey (justincc)
4e9f50b878
Add commented log lines to FetchInventoryDescendents2 path for future use.
...
Haven't been able to resolve issue where attachments are removed by the viewer on relog on a localhost
2011-12-09 22:32:28 +00:00
Melanie
00b36eb0fe
Restore the Avination way of position and angle calculation so resizers
...
work again.
2011-12-09 20:55:48 +01:00
Melanie
07c26111af
Fix llGetLinkKey to report avatars properly
2011-12-09 16:36:25 +01:00
Melanie
d913303875
Merge branch 'master' into bigmerge
2011-12-09 08:13:57 +00:00
Justin Clark-Casey (justincc)
63fe673af1
Revert "Revert "Stop performing the asset save part of baked texture uploading on the UploadBakedTexture cap asynchronously.""
...
This turned out not to be the upload texture issue.
This reverts commit 8721841fc3
2011-12-08 23:45:53 +00:00
Justin Clark-Casey (justincc)
50eebb5cba
Don't reply with an ack packet if the client is not authorized.
2011-12-08 22:00:59 +00:00
Justin Clark-Casey (justincc)
32d0ef89c6
Extend TestAddClient() to check that the first packet received is an ack packet
2011-12-08 21:45:02 +00:00
Justin Clark-Casey (justincc)
14e407aff3
Add OpenSim.Region.ClientStack.LindenUDP.Tests.dll back into the test suite
2011-12-08 20:55:38 +00:00
Justin Clark-Casey (justincc)
bc13855e64
Reactivate BasicCircuitTests.TestAddClient()
...
This checks that the initial UseCircuitCode packet is handled correctly for a normal client login.
2011-12-08 20:52:34 +00:00
Justin Clark-Casey (justincc)
0e265889dd
Remove unnecessary AgentCircuitData null check from Scene.AddNewClient().
...
The only caller is the LLUDP stack and this has to validate the UDP circuit itself, so we know that it exists.
This allows us to eliminate another null check elsewhere and simplifies the method contract
2011-12-08 19:25:24 +00:00
Justin Clark-Casey (justincc)
55de189752
minor: remove some mono compiler warnings
2011-12-08 18:56:07 +00:00
Justin Clark-Casey (justincc)
54360dd20e
When a client connects to a scene, send other avatar appearance data asynchronously to reduce hold up in the IN UDP packet processing loop.
...
This is already being done for the initial object data send.
2011-12-08 18:39:56 +00:00
Justin Clark-Casey (justincc)
f61e54892f
On a new client circuit, send the initial reply ack to let the client know it's live before sending other data.
...
This means that avatar/appearance data of other avatars and scene objects for a client will be sent after the ack rather than possibly before.
This may stop some avatars appearing grey on login.
This introduces a new OpenSim.Framework.ISceneAgent to accompany the existing OpenSim.Framework.ISceneObject and ISceneEntity
This allows IClientAPI to handle this as it can't reference OpenSim.Region.Framework.Interfaces
2011-12-08 18:34:23 +00:00
