aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework (follow)
Commit message (Expand)AuthorAgeFilesLines
...
| * | | Merge branch 'master' into careminsterMelanie2013-03-233-6/+22
| |\ \ \ | | | |/ | | |/|
| | * | Fix teleporting into the non-SW 256x256 corner of a megaregion, though curren...Justin Clark-Casey (justincc)2013-03-231-0/+7
| | * | Add "show borders" command to show the borders of a region.Justin Clark-Casey (justincc)2013-03-233-6/+16
* | | | Export permission, part two. Setting export perms for textures and clothing w...Melanie2013-03-313-11/+66
| |_|/ |/| |
* | | Phase 1 of implementing a transfer permission. Overwrite libOMV's PermissionMaskMelanie2013-03-246-3/+9
* | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminsterMelanie2013-03-234-23/+144
|\ \ \ | |/ /
| * | Merge branch 'master' into careminsterMelanie2013-03-224-23/+144
| |\ \ | | |/
| | * On a teleport, lock m_agentsInTransit whilst we grab the value to check for c...Justin Clark-Casey (justincc)2013-03-211-4/+4
| | * minor: disable logging on regression TestCrossOnSameSimulator() that I accide...Justin Clark-Casey (justincc)2013-03-201-1/+1
| | * minor: don't bother with the pause before rezzing attachments if we are runni...Justin Clark-Casey (justincc)2013-03-201-1/+15
| | * On the later forms of teleport failure, tell the user if this was because vie...Justin Clark-Casey (justincc)2013-03-202-23/+121
| | * Insert a short delay on the simulator side rezzing of attachments in order to...Justin Clark-Casey (justincc)2013-03-201-1/+1
| | * Force a viewer object update for attachments at the end of the final Scene.Co...Justin Clark-Casey (justincc)2013-03-201-0/+9
| | * Merge branch 'master' into newmultiattachMelanie2013-03-186-129/+264
| | |\
| | * | Multiattach, part 1Melanie2013-03-182-2/+2
* | | | Fix SceneManager to use the new automatic property throughout.Melanie2013-03-211-3/+2
|/ / /
* | | Merge branch 'avination' into careminsterMelanie2013-03-191-11/+36
|\ \ \
| * | | * Ignores VolumeDetect enabled prim in the camera raycast call. Note: The ...teravus2013-03-161-11/+36
* | | | Merge branch 'master' into careminsterMelanie2013-03-142-3/+55
|\ \ \ \ | | |_|/ | |/| |
| * | | Make llGetObjectDetails() return the correct world rotation for a sitting avatarJustin Clark-Casey (justincc)2013-03-141-5/+35
| * | | Remove unnecessary instation of DOMap() in SOP from commit 5c53660 since this...Justin Clark-Casey (justincc)2013-03-131-1/+0
| * | | Add prototype dynamic objects map for scene object partsJustin Clark-Casey (justincc)2013-03-131-0/+22
| * | | minor: remove mono compiler warning in SceneObjectUndoRedoTestsJustin Clark-Casey (justincc)2013-03-111-2/+2
* | | | Merge branch 'master' into careminsterMelanie2013-03-111-0/+17
|\ \ \ \ | |/ / /
| * | | * Apparently, sometimes texture entries come in from the wire with no default...teravus2013-03-081-0/+17
* | | | Merge branch 'master' into careminsterMelanie2013-03-084-122/+189
|\ \ \ \ | |/ / /
| * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-03-061-1/+13
| |\ \ \
| | * | | Per discussions with justincc... split the JsonStore typeMic Bowman2013-03-051-1/+13
| | | |/ | | |/|
| * | | Add code for testing event queue messages recevied on region cross.Justin Clark-Casey (justincc)2013-03-061-5/+22
| * | | Add regression test for presence crossing between regions on the same simulator.Justin Clark-Casey (justincc)2013-03-063-121/+159
| |/ /
* | | * Separate two if trees that got merged into one if tree with borked logic.teravus2013-03-061-2/+25
* | | Merge branch 'avination' into careminsterMelanie2013-03-062-2/+2
|\ \ \ | | |/ | |/|
| * | Multiattach, part 1Melanie2013-03-052-2/+2
* | | Merge branch 'master' into careminsterMelanie2013-03-051-2/+10
|\ \ \ | | |/ | |/|
| * | Move AllowedClients and BannedClients section to new [AccessControl] section ...Justin Clark-Casey (justincc)2013-03-021-2/+10
* | | Merge branch 'avination' into careminsterMelanie2013-03-033-21/+43
|\ \ \ | | |/ | |/|
| * | Make Keyframe motion cross regions againMelanie2013-03-032-2/+4
| * | Fix an issue where the viewer would request the seed cap beforeMelanie2013-02-182-19/+39
* | | Merge branch 'master' into careminsterMelanie2013-02-282-18/+13
|\ \ \ | | |/ | |/|
| * | Add regression tests for llGetNotecardLine()Justin Clark-Casey (justincc)2013-02-281-2/+2
| * | Get "show modules" console command to obey selected command line region/sJustin Clark-Casey (justincc)2013-02-271-16/+11
* | | Merge branch 'master' into careminsterMelanie2013-02-271-0/+11
|\ \ \ | |/ /
| * | Add regression test for llRequestUrl()Justin Clark-Casey (justincc)2013-02-261-0/+11
* | | Merge branch 'master' into careminsterMelanie2013-02-261-2/+9
|\ \ \ | |/ /
| * | Move map related settings from [Startup] to a new [Map] section in OpenSim.iniJustin Clark-Casey (justincc)2013-02-251-2/+9
* | | Merge branch 'master' into careminsterMelanie2013-02-231-0/+6
|\ \ \ | |/ /
| * | minor: Add doc to ScenePresence.IsInTransit to make it clear that this is set...Justin Clark-Casey (justincc)2013-02-221-0/+6
* | | Merge branch 'master' into careminsterMelanie2013-02-223-3/+6
|\ \ \ | |/ /
| * | Fix the JsonStore path set problem justincc found earlier today andMic Bowman2013-02-191-1/+0
| * | Deleted all AssemblyFileVersion directivesDiva Canto2013-02-191-1/+1