| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ... | Melanie | 2013-03-26 | 7 | -6/+11 |
|\ |
|
| * | Phase 1 of implementing a transfer permission. Overwrite libOMV's PermissionMask | Melanie | 2013-03-24 | 6 | -3/+9 |
| * | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster | Melanie | 2013-03-23 | 4 | -23/+144 |
| |\ |
|
| * | | Fix SceneManager to use the new automatic property throughout. | Melanie | 2013-03-21 | 1 | -3/+2 |
* | | | Merge branch 'master' into careminster | Melanie | 2013-03-23 | 3 | -6/+22 |
|\ \ \
| |_|/
|/| | |
|
| * | | Fix teleporting into the non-SW 256x256 corner of a megaregion, though curren... | Justin Clark-Casey (justincc) | 2013-03-23 | 1 | -0/+7 |
| * | | Add "show borders" command to show the borders of a region. | Justin Clark-Casey (justincc) | 2013-03-23 | 3 | -6/+16 |
* | | | Merge branch 'master' into careminster | Melanie | 2013-03-22 | 4 | -23/+144 |
|\ \ \
| |/ /
| | /
| |/
|/| |
|
| * | On a teleport, lock m_agentsInTransit whilst we grab the value to check for c... | Justin Clark-Casey (justincc) | 2013-03-21 | 1 | -4/+4 |
| * | minor: disable logging on regression TestCrossOnSameSimulator() that I accide... | Justin Clark-Casey (justincc) | 2013-03-20 | 1 | -1/+1 |
| * | minor: don't bother with the pause before rezzing attachments if we are runni... | Justin Clark-Casey (justincc) | 2013-03-20 | 1 | -1/+15 |
| * | On the later forms of teleport failure, tell the user if this was because vie... | Justin Clark-Casey (justincc) | 2013-03-20 | 2 | -23/+121 |
| * | Insert a short delay on the simulator side rezzing of attachments in order to... | Justin Clark-Casey (justincc) | 2013-03-20 | 1 | -1/+1 |
| * | Force a viewer object update for attachments at the end of the final Scene.Co... | Justin Clark-Casey (justincc) | 2013-03-20 | 1 | -0/+9 |
| * | Merge branch 'master' into newmultiattach | Melanie | 2013-03-18 | 6 | -129/+264 |
| |\ |
|
| * | | Multiattach, part 1 | Melanie | 2013-03-18 | 2 | -2/+2 |
* | | | Merge branch 'avination' into careminster | Melanie | 2013-03-19 | 1 | -11/+36 |
|\ \ \ |
|
| * | | | * Ignores VolumeDetect enabled prim in the camera raycast call. Note: The ... | teravus | 2013-03-16 | 1 | -11/+36 |
* | | | | Merge branch 'master' into careminster | Melanie | 2013-03-14 | 2 | -3/+55 |
|\ \ \ \
| | |_|/
| |/| | |
|
| * | | | Make llGetObjectDetails() return the correct world rotation for a sitting avatar | Justin Clark-Casey (justincc) | 2013-03-14 | 1 | -5/+35 |
| * | | | Remove unnecessary instation of DOMap() in SOP from commit 5c53660 since this... | Justin Clark-Casey (justincc) | 2013-03-13 | 1 | -1/+0 |
| * | | | Add prototype dynamic objects map for scene object parts | Justin Clark-Casey (justincc) | 2013-03-13 | 1 | -0/+22 |
| * | | | minor: remove mono compiler warning in SceneObjectUndoRedoTests | Justin Clark-Casey (justincc) | 2013-03-11 | 1 | -2/+2 |
* | | | | Merge branch 'master' into careminster | Melanie | 2013-03-11 | 1 | -0/+17 |
|\ \ \ \
| |/ / / |
|
| * | | | * Apparently, sometimes texture entries come in from the wire with no default... | teravus | 2013-03-08 | 1 | -0/+17 |
* | | | | Merge branch 'master' into careminster | Melanie | 2013-03-08 | 4 | -122/+189 |
|\ \ \ \
| |/ / / |
|
| * | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2013-03-06 | 1 | -1/+13 |
| |\ \ \ |
|
| | * | | | Per discussions with justincc... split the JsonStore type | Mic Bowman | 2013-03-05 | 1 | -1/+13 |
| | | |/
| | |/| |
|
| * | | | Add code for testing event queue messages recevied on region cross. | Justin Clark-Casey (justincc) | 2013-03-06 | 1 | -5/+22 |
| * | | | Add regression test for presence crossing between regions on the same simulator. | Justin Clark-Casey (justincc) | 2013-03-06 | 3 | -121/+159 |
| |/ / |
|
* | | | * Separate two if trees that got merged into one if tree with borked logic. | teravus | 2013-03-06 | 1 | -2/+25 |
* | | | Merge branch 'avination' into careminster | Melanie | 2013-03-06 | 2 | -2/+2 |
|\ \ \
| | |/
| |/| |
|
| * | | Multiattach, part 1 | Melanie | 2013-03-05 | 2 | -2/+2 |
* | | | Merge branch 'master' into careminster | Melanie | 2013-03-05 | 1 | -2/+10 |
|\ \ \
| | |/
| |/| |
|
| * | | Move AllowedClients and BannedClients section to new [AccessControl] section ... | Justin Clark-Casey (justincc) | 2013-03-02 | 1 | -2/+10 |
* | | | Merge branch 'avination' into careminster | Melanie | 2013-03-03 | 3 | -21/+43 |
|\ \ \
| | |/
| |/| |
|
| * | | Make Keyframe motion cross regions again | Melanie | 2013-03-03 | 2 | -2/+4 |
| * | | Fix an issue where the viewer would request the seed cap before | Melanie | 2013-02-18 | 2 | -19/+39 |
* | | | Merge branch 'master' into careminster | Melanie | 2013-02-28 | 2 | -18/+13 |
|\ \ \
| | |/
| |/| |
|
| * | | Add regression tests for llGetNotecardLine() | Justin Clark-Casey (justincc) | 2013-02-28 | 1 | -2/+2 |
| * | | Get "show modules" console command to obey selected command line region/s | Justin Clark-Casey (justincc) | 2013-02-27 | 1 | -16/+11 |
* | | | Merge branch 'master' into careminster | Melanie | 2013-02-27 | 1 | -0/+11 |
|\ \ \
| |/ / |
|
| * | | Add regression test for llRequestUrl() | Justin Clark-Casey (justincc) | 2013-02-26 | 1 | -0/+11 |
* | | | Merge branch 'master' into careminster | Melanie | 2013-02-26 | 1 | -2/+9 |
|\ \ \
| |/ / |
|
| * | | Move map related settings from [Startup] to a new [Map] section in OpenSim.ini | Justin Clark-Casey (justincc) | 2013-02-25 | 1 | -2/+9 |
* | | | Merge branch 'master' into careminster | Melanie | 2013-02-23 | 1 | -0/+6 |
|\ \ \
| |/ / |
|
| * | | minor: Add doc to ScenePresence.IsInTransit to make it clear that this is set... | Justin Clark-Casey (justincc) | 2013-02-22 | 1 | -0/+6 |
* | | | Merge branch 'master' into careminster | Melanie | 2013-02-22 | 3 | -3/+6 |
|\ \ \
| |/ / |
|
| * | | Fix the JsonStore path set problem justincc found earlier today and | Mic Bowman | 2013-02-19 | 1 | -1/+0 |
| * | | Deleted all AssemblyFileVersion directives | Diva Canto | 2013-02-19 | 1 | -1/+1 |