943b37b8e6
Send changed animation event asynchronously
2011-12-12 11:08:50 +01:00
3c55d2e776
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-12-12 00:41:53 -08:00
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
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
3a91085ac2
Implement handler for TeleportCancel inbound packet
2011-12-10 15:17:34 +00:00
323ffd7a89
Fix a regression that causes data from the attachments module to fail loading
2011-12-10 15:28:32 +01:00
db98698bbe
Prevent spurious error message when client tries to move a null item
2011-12-10 14:47:00 +01:00
6b080d57cb
Merge branch 'master' into careminster
2011-12-10 15:19:31 +00:00
3f42183797
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
2011-12-10 00:40:41 +00:00
e88ad5aab9
minor: remove a mono compiler warning
2011-12-09 23:55:54 +00:00
5f276c3212
Print out one log message for every missing baked texture, rather than two.
2011-12-09 23:54:39 +00:00
0daa5d8b4d
minor: comment out "unpacked appearance" log mesasge for now
2011-12-09 23:44:34 +00:00
f24898d049
Comment out ChildAgentDataUpdate.Pack() "Pack data" message for now.
2011-12-09 23:24:52 +00:00
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
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
5f6a4c4111
Merge branch 'master' into careminster
2011-12-09 22:55:08 +00:00
fc27806e90
remove some unused fields in ScenePresence
2011-12-09 22:52:54 +00:00
cb0da425d5
Fix "fix-phantoms" help message. Thanks Garmin Kawaguichi.
2011-12-09 22:41:39 +00:00
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
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
00b36eb0fe
Restore the Avination way of position and angle calculation so resizers
...
work again.
2011-12-09 20:55:48 +01:00
f025387f10
Set adaptive throttles false by default because it doesn't play nice with AVN
...
code
2011-12-09 19:56:03 +01:00
07c26111af
Fix llGetLinkKey to report avatars properly
2011-12-09 16:36:25 +01:00
cf97809ff1
Reverse the last one
2011-12-09 10:59:47 +01:00
4eb3622bfe
Dummy commit
2011-12-09 10:58:47 +01:00
96b3eed1b0
Merge branch 'careminster' into bigmerge
2011-12-09 11:23:34 +00:00
d913303875
Merge branch 'master' into bigmerge
2011-12-09 08:13:57 +00:00
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
50eebb5cba
Don't reply with an ack packet if the client is not authorized.
2011-12-08 22:00:59 +00:00
32d0ef89c6
Extend TestAddClient() to check that the first packet received is an ack packet
2011-12-08 21:45:02 +00:00
14e407aff3
Add OpenSim.Region.ClientStack.LindenUDP.Tests.dll back into the test suite
2011-12-08 20:55:38 +00:00
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
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
55de189752
minor: remove some mono compiler warnings
2011-12-08 18:56:07 +00:00
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
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
3b991a2222
Merge branch 'bigmerge' of ssh://melanie@3dhosting.de/var/git/careminster into bigmerge
2011-12-08 18:30:09 +00:00
96539ffc79
Merge branch 'master' into bigmerge
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
2011-12-08 18:29:19 +00:00
355cde464a
Simplify Scene.AddNewClient()
...
If sp becomes null right after we've checked or created it, then behaviour down the line is going to be wrong anyway.
So instead retain the check/create ScenePresence reference and use this.
2011-12-08 16:10:47 +00:00
8d7c353500
Merge branch 'master' into bigmerge
2011-12-08 05:47:45 +00:00
43732794dd
Remove a left over log output
2011-12-08 05:46:59 +00:00
3217bccfcd
Merge branch 'bigmerge' of ssh://3dhosting.de/var/git/careminster into bigmerge
2011-12-08 05:29:13 +01:00
1e4842eaba
Remove superfluous try block
2011-12-08 05:28:54 +01:00
7c7dd6269a
Merge branch 'bigmerge' of ssh://3dhosting.de/var/git/careminster into bigmerge
2011-12-08 03:37:48 +01:00
ea1f5fb08d
Merge branch 'master' into bigmerge
2011-12-08 03:53:30 +00:00
603ad905e1
Adapt to justincc's remote admin refactor
2011-12-08 03:53:09 +00:00
ac82fc60f9
Merge commit 'fb2f4f158c42ecfea114eb7cefd9074dc001626f' into bigmerge
2011-12-08 03:30:23 +00:00
50aa89dae6
Merge commit 'eda770e978c09c756d15ba62dbbf6ee34a61b2f5' into bigmerge
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
2011-12-08 03:24:25 +00:00
b459239833
Recover from an internal mess-up in the outgoing packet queues by creating
...
a new queue object.
2011-12-08 01:08:40 +01:00
dae58e0937
Remove warning in admin_save_oar xmlrpc method where noassets == true was comparing against an object rather than a string
2011-12-07 22:42:05 +00:00
Melanie