aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2011-12-1011-105/+58
|\
| * 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
| * Get rid of IScene.PresenceChildStatus() which always had to execute a lookup ...Justin Clark-Casey (justincc)2011-12-097-57/+16
* | 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 i...Justin Clark-Casey (justincc)2011-12-091-4/+6
| * Add commented log lines to FetchInventoryDescendents2 path for future use.Justin Clark-Casey (justincc)2011-12-093-4/+95
* | Restore the Avination way of position and angle calculation so resizersMelanie2011-12-091-5/+2
* | 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 uploadin...Justin Clark-Casey (justincc)2011-12-081-5/+9
| * 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
| * Remove unnecessary AgentCircuitData null check from Scene.AddNewClient().Justin Clark-Casey (justincc)2011-12-084-19/+10
| * 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 int...Melanie2011-12-081-26/+14
|\ \
| * | Remove superfluous try blockMelanie2011-12-081-27/+14
* | | Merge branch 'master' into bigmergeMelanie2011-12-0813-100/+203
|\ \ \ | | |/ | |/|
| * | When a client connects to a scene, send other avatar appearance data asynchro...Justin Clark-Casey (justincc)2011-12-081-6/+6
| * | On a new client circuit, send the initial reply ack to let the client know it...Justin Clark-Casey (justincc)2011-12-0813-78/+171
| * | Simplify Scene.AddNewClient()Justin Clark-Casey (justincc)2011-12-081-17/+28
* | | 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 com...Justin Clark-Casey (justincc)2011-12-071-1/+1
| | * Have admin_load_heighmap and admin_save_heightmap xmlrpcadmin methods return ...Justin Clark-Casey (justincc)2011-12-071-2/+2
| | * Refactor RemoteAdminPlugin so that every xmlrpc method calls a common block o...Justin Clark-Casey (justincc)2011-12-071-1711/+1370
| * | Adapt to justincc's remote admin refactorMelanie2011-12-081-1744/+1394
| * | Merge commit 'eda770e978c09c756d15ba62dbbf6ee34a61b2f5' into bigmergeMelanie2011-12-0814-106/+229
| |\ \ | | |/
| | * Remove unused SceneManager.TryGetAvatarsScene()Justin Clark-Casey (justincc)2011-12-071-20/+0
| | * On an Exception in Scene.RemoveClient(), always remove the client (and SP) st...Justin Clark-Casey (justincc)2011-12-071-19/+28
| | * 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
| | |/
| | * 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
| | * Stop accidentally setting up the UploadTexture caps handler with the same url...Justin Clark-Casey (justincc)2011-12-062-3/+1
* | | Recover from an internal mess-up in the outgoing packet queues by creatingMelanie2011-12-081-19/+36
|/ /
* | Fix intersim object give messagesMelanie2011-12-071-0/+6
* | Fix up intersim give messagingMelanie2011-12-071-1/+41
* | Fix task inventory givingMelanie2011-12-074-56/+39
* | Remove harmless merge artefactMelanie2011-12-061-1/+1
generated by cgit v1.1 at 2024-12-16 19:34:51 +0000