aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2011-12-105-0/+18
|\
| * Implement handler for TeleportCancel inbound packetMelanie2011-12-105-0/+18
| |
* | Merge branch 'master' into careminsterMelanie2011-12-1011-105/+58
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
| * minor: remove a mono compiler warningJustin Clark-Casey (justincc)2011-12-091-1/+1
| |
| * Print out one log message for every missing baked texture, rather than two.Justin Clark-Casey (justincc)2011-12-091-22/+4
| |
| * minor: comment out "unpacked appearance" log mesasge for nowJustin Clark-Casey (justincc)2011-12-091-1/+1
| |
| * Comment out ChildAgentDataUpdate.Pack() "Pack data" message for now.Justin Clark-Casey (justincc)2011-12-091-1/+1
| |
| * Do some clean up Scene.cs log messages.Justin Clark-Casey (justincc)2011-12-091-24/+38
| | | | | | | | | | 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.
| * Get rid of IScene.PresenceChildStatus() which always had to execute a lookup ↵Justin Clark-Casey (justincc)2011-12-097-57/+16
| | | | | | | | in favour of IClientAPI.ISceneAgent.IsChildAgent instead.
* | Merge branch 'master' into careminsterMelanie2011-12-096-16/+106
|\ \ | |/
| * remove some unused fields in ScenePresenceJustin Clark-Casey (justincc)2011-12-091-4/+0
| |
| * Fix "fix-phantoms" help message. Thanks Garmin Kawaguichi.Justin Clark-Casey (justincc)2011-12-091-4/+5
| |
| * Move client id check in Scene.Inventory.cs:UpdateInventoryItemAsset so that ↵Justin Clark-Casey (justincc)2011-12-091-4/+6
| | | | | | | | | | | | 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.
| * Add commented log lines to FetchInventoryDescendents2 path for future use.Justin Clark-Casey (justincc)2011-12-093-4/+95
| | | | | | | | Haven't been able to resolve issue where attachments are removed by the viewer on relog on a localhost
* | Restore the Avination way of position and angle calculation so resizersMelanie2011-12-091-5/+2
| | | | | | | | work again.
* | Fix llGetLinkKey to report avatars properlyMelanie2011-12-091-19/+0
| |
* | Merge branch 'master' into bigmergeMelanie2011-12-0910-279/+323
|\ \ | |/
| * Revert "Revert "Stop performing the asset save part of baked texture ↵Justin Clark-Casey (justincc)2011-12-081-5/+9
| | | | | | | | | | | | | | | | uploading on the UploadBakedTexture cap asynchronously."" This turned out not to be the upload texture issue. This reverts commit 8721841fc3944ce0cdf5ce76297e73f9ed269751.
| * Don't reply with an ack packet if the client is not authorized.Justin Clark-Casey (justincc)2011-12-082-45/+31
| |
| * Extend TestAddClient() to check that the first packet received is an ack packetJustin Clark-Casey (justincc)2011-12-083-93/+116
| |
| * Add OpenSim.Region.ClientStack.LindenUDP.Tests.dll back into the test suiteJustin Clark-Casey (justincc)2011-12-081-1/+1
| |
| * Reactivate BasicCircuitTests.TestAddClient()Justin Clark-Casey (justincc)2011-12-084-125/+167
| | | | | | | | This checks that the initial UseCircuitCode packet is handled correctly for a normal client login.
| * Remove unnecessary AgentCircuitData null check from Scene.AddNewClient().Justin Clark-Casey (justincc)2011-12-084-19/+10
| | | | | | | | | | 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
| * minor: remove some mono compiler warningsJustin Clark-Casey (justincc)2011-12-082-3/+1
| |
* | Merge branch 'bigmerge' of ssh://melanie@3dhosting.de/var/git/careminster ↵Melanie2011-12-081-26/+14
|\ \ | | | | | | | | | into bigmerge
| * | Remove superfluous try blockMelanie2011-12-081-27/+14
| | |
* | | Merge branch 'master' into bigmergeMelanie2011-12-0813-100/+203
|\ \ \ | | |/ | |/| | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * | When a client connects to a scene, send other avatar appearance data ↵Justin Clark-Casey (justincc)2011-12-081-6/+6
| | | | | | | | | | | | | | | | | | asynchronously to reduce hold up in the IN UDP packet processing loop. This is already being done for the initial object data send.
| * | On a new client circuit, send the initial reply ack to let the client know ↵Justin Clark-Casey (justincc)2011-12-0813-78/+171
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | Simplify Scene.AddNewClient()Justin Clark-Casey (justincc)2011-12-081-17/+28
| | | | | | | | | | | | | | | 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.
* | | Merge branch 'master' into bigmergeMelanie2011-12-081-1/+0
|\ \ \ | |/ / | | / | |/ |/|
| * Remove a left over log outputMelanie2011-12-081-2/+1
| |
* | Merge branch 'bigmerge' of ssh://3dhosting.de/var/git/careminster into bigmergeMelanie2011-12-0814-1742/+1515
|\ \
| * \ Merge branch 'master' into bigmergeMelanie2011-12-081-3/+3
| |\ \ | | |/
| | * Remove warning in admin_save_oar xmlrpc method where noassets == true was ↵Justin Clark-Casey (justincc)2011-12-071-1/+1
| | | | | | | | | | | | comparing against an object rather than a string
| | * Have admin_load_heighmap and admin_save_heightmap xmlrpcadmin methods return ↵Justin Clark-Casey (justincc)2011-12-071-2/+2
| | | | | | | | | | | | success = true on success rather than false
| | * Refactor RemoteAdminPlugin so that every xmlrpc method calls a common block ↵Justin Clark-Casey (justincc)2011-12-071-1711/+1370
| | | | | | | | | | | | of code to do password checks, etc., instead of copy/pasting this code into every method
| * | Adapt to justincc's remote admin refactorMelanie2011-12-081-1744/+1394
| | |
| * | Merge commit 'eda770e978c09c756d15ba62dbbf6ee34a61b2f5' into bigmergeMelanie2011-12-0814-106/+229
| |\ \ | | |/ | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| | * Remove unused SceneManager.TryGetAvatarsScene()Justin Clark-Casey (justincc)2011-12-071-20/+0
| | | | | | | | | | | | | | | It makes far more sense anyway to use TryGetRootScenePresence().Scene, in common with the rest of the code This method could also return any scene for child or root agents, depending in which order the scenes happened to lie in the list
| | * On an Exception in Scene.RemoveClient(), always remove the client (and SP) ↵Justin Clark-Casey (justincc)2011-12-071-19/+28
| | | | | | | | | | | | structure so that logout on unexpired packets isn't retriggered, causing the same exception
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2011-12-071-0/+1
| | |\
| | | * Trigger a Jenkins buildBlueWall2011-12-071-0/+1
| | | |
| | * | Implement XMLRPCAdmin command admin_teleport_agent.Justin Clark-Casey (justincc)2011-12-075-5/+157
| | |/ | | | | | | | | | This allows someone with access to this command on the XMLRPCAdmin interface to teleport an avatar to an arbitrary region and/or position.
| | * properly lock CapsHandlers.m_capsHandlersJustin Clark-Casey (justincc)2011-12-071-26/+40
| | |
| | * Stop also adding an ordinary http handler when we set up a poll http handler.Justin Clark-Casey (justincc)2011-12-075-36/+13
| | | | | | | | | | | | It appears that this is entirely unnecessary since the poll http handlers are dealt with on a separate code path.
| | * Stop accidentally setting up the UploadTexture caps handler with the same ↵Justin Clark-Casey (justincc)2011-12-062-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | url for all users This meant that if a user exited the region, the UploadTexture handler would be effectively removed for everyone, causing subsequent failures. This hopefully resolves the recent UploadTexture LLSD problems This was a regression in 5640f2e (Thu Dec 1 23:24:15 2011 +0000)
* | | Recover from an internal mess-up in the outgoing packet queues by creatingMelanie2011-12-081-19/+36
|/ / | | | | | | a new queue object.
* | Fix intersim object give messagesMelanie2011-12-071-0/+6
| |
* | Fix up intersim give messagingMelanie2011-12-071-1/+41
| |
generated by cgit v1.1 at 2024-12-18 17:46:03 +0000