aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into bigmergeMelanie2011-12-0912-282/+357
|\
| * 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-082-4/+2
| * Reactivate BasicCircuitTests.TestAddClient()Justin Clark-Casey (justincc)2011-12-085-125/+200
| * 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
|\ \
| * \ Merge branch 'bigmerge' of ssh://3dhosting.de/var/git/careminster into bigmergeMelanie2011-12-080-0/+0
| |\ \
| * | | 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-0819-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
| * | Adapt to justincc's remote admin refactorMelanie2011-12-081-1744/+1394
| * | Merge commit 'fb2f4f158c42ecfea114eb7cefd9074dc001626f' into bigmergeMelanie2011-12-080-0/+0
| |\ \ | | |/
| | * Refactor RemoteAdminPlugin so that every xmlrpc method calls a common block o...Justin Clark-Casey (justincc)2011-12-071-1711/+1370
| * | Merge commit 'eda770e978c09c756d15ba62dbbf6ee34a61b2f5' into bigmergeMelanie2011-12-0819-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-076-0/+1
| | |\
| | | * Trigger a Jenkins buildBlueWall2011-12-071-0/+1
| | | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimBlueWall2011-12-076-62/+53
| | | |\
| | | * | Update libomv to 0.9.1BlueWall2011-12-074-0/+0
| | | * | Merge branch 'master' of /home/opensim/var/repo/opensimBlueWall2011-12-0761-134/+821
| | | |\ \
| | | * \ \ Merge branch 'master' of /home/opensim/var/repo/opensimBlueWall2011-12-0522-243/+355
| | | |\ \ \
| | | * \ \ \ Merge branch 'master' of /home/opensim/var/repo/opensimBlueWall2011-12-023-5/+85
| | | |\ \ \ \
| | | * \ \ \ \ Merge branch 'master' of /home/opensim/var/repo/opensimBlueWall2011-12-022-23/+28
| | | |\ \ \ \ \
| | | * \ \ \ \ \ Merge branch 'master' of /home/opensim/var/repo/opensimBlueWall2011-12-023-29/+35
| | | |\ \ \ \ \ \
| | | * \ \ \ \ \ \ Merge branch 'master' of /home/opensim/var/repo/opensimBlueWall2011-12-028-244/+430
| | | |\ \ \ \ \ \ \
| | | * | | | | | | | Make fix to Nini for null references in some cases.BlueWall2011-11-291-0/+0
| | * | | | | | | | | 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
* | | | | | | | Fix phantom and temp flags not takingMelanie2011-12-062-2/+10
* | | | | | | | Merge branch 'master' into bigmergeMelanie2011-12-066-27/+436
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Revert "Stop performing the asset save part of baked texture uploading on the...Justin Clark-Casey (justincc)2011-12-061-9/+5
generated by cgit v1.1 at 2024-12-30 01:21:15 +0000