| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'master' into bigmerge | Melanie | 2011-12-09 | 12 | -282/+357 |
|\ |
|
| * | Revert "Revert "Stop performing the asset save part of baked texture uploadin... | Justin Clark-Casey (justincc) | 2011-12-08 | 1 | -5/+9 |
| * | Don't reply with an ack packet if the client is not authorized. | Justin Clark-Casey (justincc) | 2011-12-08 | 2 | -45/+31 |
| * | Extend TestAddClient() to check that the first packet received is an ack packet | Justin Clark-Casey (justincc) | 2011-12-08 | 3 | -93/+116 |
| * | Add OpenSim.Region.ClientStack.LindenUDP.Tests.dll back into the test suite | Justin Clark-Casey (justincc) | 2011-12-08 | 2 | -4/+2 |
| * | Reactivate BasicCircuitTests.TestAddClient() | Justin Clark-Casey (justincc) | 2011-12-08 | 5 | -125/+200 |
| * | Remove unnecessary AgentCircuitData null check from Scene.AddNewClient(). | Justin Clark-Casey (justincc) | 2011-12-08 | 4 | -19/+10 |
| * | minor: remove some mono compiler warnings | Justin Clark-Casey (justincc) | 2011-12-08 | 2 | -3/+1 |
* | | Merge branch 'bigmerge' of ssh://melanie@3dhosting.de/var/git/careminster int... | Melanie | 2011-12-08 | 1 | -26/+14 |
|\ \ |
|
| * \ | Merge branch 'bigmerge' of ssh://3dhosting.de/var/git/careminster into bigmerge | Melanie | 2011-12-08 | 0 | -0/+0 |
| |\ \ |
|
| * | | | Remove superfluous try block | Melanie | 2011-12-08 | 1 | -27/+14 |
* | | | | Merge branch 'master' into bigmerge | Melanie | 2011-12-08 | 13 | -100/+203 |
|\ \ \ \
| |_|/ /
|/| | /
| | |/
| |/| |
|
| * | | When a client connects to a scene, send other avatar appearance data asynchro... | Justin Clark-Casey (justincc) | 2011-12-08 | 1 | -6/+6 |
| * | | On a new client circuit, send the initial reply ack to let the client know it... | Justin Clark-Casey (justincc) | 2011-12-08 | 13 | -78/+171 |
| * | | Simplify Scene.AddNewClient() | Justin Clark-Casey (justincc) | 2011-12-08 | 1 | -17/+28 |
* | | | Merge branch 'master' into bigmerge | Melanie | 2011-12-08 | 1 | -1/+0 |
|\ \ \
| |/ /
| | /
| |/
|/| |
|
| * | Remove a left over log output | Melanie | 2011-12-08 | 1 | -2/+1 |
* | | Merge branch 'bigmerge' of ssh://3dhosting.de/var/git/careminster into bigmerge | Melanie | 2011-12-08 | 19 | -1742/+1515 |
|\ \ |
|
| * \ | Merge branch 'master' into bigmerge | Melanie | 2011-12-08 | 1 | -3/+3 |
| |\ \
| | |/ |
|
| | * | Remove warning in admin_save_oar xmlrpc method where noassets == true was com... | Justin Clark-Casey (justincc) | 2011-12-07 | 1 | -1/+1 |
| | * | Have admin_load_heighmap and admin_save_heightmap xmlrpcadmin methods return ... | Justin Clark-Casey (justincc) | 2011-12-07 | 1 | -2/+2 |
| * | | Adapt to justincc's remote admin refactor | Melanie | 2011-12-08 | 1 | -1744/+1394 |
| * | | Merge commit 'fb2f4f158c42ecfea114eb7cefd9074dc001626f' into bigmerge | Melanie | 2011-12-08 | 0 | -0/+0 |
| |\ \
| | |/ |
|
| | * | Refactor RemoteAdminPlugin so that every xmlrpc method calls a common block o... | Justin Clark-Casey (justincc) | 2011-12-07 | 1 | -1711/+1370 |
| * | | Merge commit 'eda770e978c09c756d15ba62dbbf6ee34a61b2f5' into bigmerge | Melanie | 2011-12-08 | 19 | -106/+229 |
| |\ \
| | |/ |
|
| | * | Remove unused SceneManager.TryGetAvatarsScene() | Justin Clark-Casey (justincc) | 2011-12-07 | 1 | -20/+0 |
| | * | On an Exception in Scene.RemoveClient(), always remove the client (and SP) st... | Justin Clark-Casey (justincc) | 2011-12-07 | 1 | -19/+28 |
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2011-12-07 | 6 | -0/+1 |
| | |\ |
|
| | | * | Trigger a Jenkins build | BlueWall | 2011-12-07 | 1 | -0/+1 |
| | | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | BlueWall | 2011-12-07 | 6 | -62/+53 |
| | | |\ |
|
| | | * | | Update libomv to 0.9.1 | BlueWall | 2011-12-07 | 4 | -0/+0 |
| | | * | | Merge branch 'master' of /home/opensim/var/repo/opensim | BlueWall | 2011-12-07 | 61 | -134/+821 |
| | | |\ \ |
|
| | | * \ \ | Merge branch 'master' of /home/opensim/var/repo/opensim | BlueWall | 2011-12-05 | 22 | -243/+355 |
| | | |\ \ \ |
|
| | | * \ \ \ | Merge branch 'master' of /home/opensim/var/repo/opensim | BlueWall | 2011-12-02 | 3 | -5/+85 |
| | | |\ \ \ \ |
|
| | | * \ \ \ \ | Merge branch 'master' of /home/opensim/var/repo/opensim | BlueWall | 2011-12-02 | 2 | -23/+28 |
| | | |\ \ \ \ \ |
|
| | | * \ \ \ \ \ | Merge branch 'master' of /home/opensim/var/repo/opensim | BlueWall | 2011-12-02 | 3 | -29/+35 |
| | | |\ \ \ \ \ \ |
|
| | | * \ \ \ \ \ \ | Merge branch 'master' of /home/opensim/var/repo/opensim | BlueWall | 2011-12-02 | 8 | -244/+430 |
| | | |\ \ \ \ \ \ \ |
|
| | | * | | | | | | | | Make fix to Nini for null references in some cases. | BlueWall | 2011-11-29 | 1 | -0/+0 |
| | * | | | | | | | | | Implement XMLRPCAdmin command admin_teleport_agent. | Justin Clark-Casey (justincc) | 2011-12-07 | 5 | -5/+157 |
| | | |_|_|_|_|_|_|/
| | |/| | | | | | | |
|
| | * | | | | | | | | properly lock CapsHandlers.m_capsHandlers | Justin Clark-Casey (justincc) | 2011-12-07 | 1 | -26/+40 |
| | * | | | | | | | | Stop also adding an ordinary http handler when we set up a poll http handler. | Justin Clark-Casey (justincc) | 2011-12-07 | 5 | -36/+13 |
| | | |_|_|_|_|_|/
| | |/| | | | | | |
|
| | * | | | | | | | Stop accidentally setting up the UploadTexture caps handler with the same url... | Justin Clark-Casey (justincc) | 2011-12-06 | 2 | -3/+1 |
* | | | | | | | | | Recover from an internal mess-up in the outgoing packet queues by creating | Melanie | 2011-12-08 | 1 | -19/+36 |
|/ / / / / / / / |
|
* | | | | | | | | Fix intersim object give messages | Melanie | 2011-12-07 | 1 | -0/+6 |
* | | | | | | | | Fix up intersim give messaging | Melanie | 2011-12-07 | 1 | -1/+41 |
* | | | | | | | | Fix task inventory giving | Melanie | 2011-12-07 | 4 | -56/+39 |
* | | | | | | | | Remove harmless merge artefact | Melanie | 2011-12-06 | 1 | -1/+1 |
* | | | | | | | | Fix phantom and temp flags not taking | Melanie | 2011-12-06 | 2 | -2/+10 |
* | | | | | | | | Merge branch 'master' into bigmerge | Melanie | 2011-12-06 | 6 | -27/+436 |
|\ \ \ \ \ \ \ \
| |/ / / / / / / |
|
| * | | | | | | | Revert "Stop performing the asset save part of baked texture uploading on the... | Justin Clark-Casey (justincc) | 2011-12-06 | 1 | -9/+5 |