aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/World (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-05-241-0/+9
|\
| * Implement llSetSoundQueueing().Justin Clark-Casey (justincc)2013-05-221-0/+9
* | Merge branch 'master' into careminsterMelanie2013-05-122-8/+50
|\ \ | |/
| * Finalize the logic for SetHome. See comments in Land/LandManagementModule.cs ...Diva Canto2013-05-112-35/+19
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-05-111-0/+12
| |\
| | * Send up the part missing from the Avination Estate commit.Melanie2013-05-111-0/+12
| * | Handle SetHome properlyDiva Canto2013-05-111-0/+59
| |/
* | Merge branch 'master' into careminsterMelanie2013-05-082-9/+14
|\ \ | |/
| * Guard the scene list when estates are updatedMelanie2013-05-082-9/+14
* | Merge branch 'master' into careminsterMelanie2013-05-083-0/+767
|\ \ | |/
| * Step 3: Commit the Avination XEstate estate comms handlerMelanie2013-05-073-0/+767
| * Step one of estate settings sharing - port the Avination Estate module (compl...Melanie2013-05-071-13/+44
| * Add Avination's support for parcel eject and freezeMelanie2013-04-251-0/+85
| * Allow callers to set the invoice parameter for GenericMessageMelanie2013-04-221-2/+2
* | Merge branch 'master' of ssh://3dhosting.de/var/git/careminsterMelanie2013-04-221-0/+2
|\ \
| * \ Merge branch 'master' into careminsterMelanie2013-04-101-0/+2
| |\ \ | | |/
| | * Comment out rez perms logging I accidentally left in at 7f07023 (Sat Apr 6 02...Justin Clark-Casey (justincc)2013-04-091-1/+1
| | * Fix taking (and rezzing) of coalesced objects in the non-root subregions of m...Justin Clark-Casey (justincc)2013-04-061-0/+2
* | | Allow callers to set the invoice parameter for GenericMessageMelanie2013-04-221-2/+2
|/ /
* | Merge commit '4dfffa1df325c4b27a79e995585696cc20b6d905' into careminsterMelanie2013-03-291-0/+3
|\ \ | |/
| * Add Location (relative), Rotation (Relative) and Rotation (World) to "show pa...Justin Clark-Casey (justincc)2013-03-291-0/+3
| * Phase 1 of implementing a transfer permission. Overwrite libOMV's PermissionMaskMelanie2013-03-263-0/+3
* | Phase 1 of implementing a transfer permission. Overwrite libOMV's PermissionMaskMelanie2013-03-243-0/+3
* | Merge branch 'master' into careminsterMelanie2013-03-151-0/+5
|\ \ | |/
| * Add ILandChannel.GetLandObject(Vector3 position) as this is a very common inp...Justin Clark-Casey (justincc)2013-03-141-0/+5
* | Merge branch 'master' into careminsterMelanie2013-03-011-21/+33
|\ \ | |/
| * Moved permissions config vars out of [Startup] into [Permissions]. Backwards ...Diva Canto2013-03-011-21/+33
* | Merge branch 'master' into careminsterMelanie2013-02-271-1/+1
|\ \ | |/
| * Make sure we dispose of WebResponse, StreamReader and Stream in various place...Justin Clark-Casey (justincc)2013-02-271-16/+14
* | Merge branch 'master' into careminsterMelanie2013-02-263-29/+24
|\ \ | |/
| * Move map related settings from [Startup] to a new [Map] section in OpenSim.iniJustin Clark-Casey (justincc)2013-02-253-29/+24
* | Merge branch 'master' into careminsterMelanie2013-02-221-5/+5
|\ \ | |/
| * Correct mistake in parsing 'show object pos' and similar pos commands where t...Justin Clark-Casey (justincc)2013-02-201-5/+5
* | Merge branch 'master' into careminsterMelanie2013-02-161-0/+2
|\ \ | |/
| * Add regression test TestSaveNonRootFolderToIarJustin Clark-Casey (justincc)2013-02-161-0/+2
* | Merge branch 'master' into careminsterMelanie2013-02-051-0/+37
|\ \ | |/
| * Merge branch 'dynamic-attributes2'Justin Clark-Casey (justincc)2013-02-051-0/+37
| |\
| | * Added unit tests for Dynamic AttributesOren Hurvitz2013-01-251-0/+37
* | | Merge branch 'master' into careminsterMelanie2013-02-041-5/+12
|\ \ \ | |/ /
| * | Stop exceptions being thrown if GenerateMapTiles = false but no static map ti...Justin Clark-Casey (justincc)2013-02-021-5/+12
* | | Merge branch 'master' into careminsterMelanie2013-01-311-18/+63
|\ \ \ | |/ /
| * | Allow use of MaptileStaticUUID in Regions.ini to override the global setting ...Jak Daniels2013-01-301-18/+63
* | | Merge branch 'master' into careminsterMelanie2013-01-261-1/+1
|\ \ \ | |/ /
| * | Fix issue where the "set terrain texture" console command did not tell the vi...Justin Clark-Casey (justincc)2013-01-261-1/+1
* | | Merge branch 'master' into careminsterMelanie2013-01-261-5/+5
|\ \ \ | |/ /
| * | minor: Fix full scene part console report to show proper Light* names rather ...Justin Clark-Casey (justincc)2013-01-261-5/+5
| |/
* | Merge branch 'master' into careminsterMelanie2013-01-111-7/+12
|\ \ | |/
| * Move scene debug commands into separate module. Command changes from "debug ...Justin Clark-Casey (justincc)2013-01-101-7/+12
* | Merge branch 'avination' into careminsterMelanie2013-01-061-0/+13
|\ \
| * | check land permitions on sit target for unscripted sitsUbitUmarov2013-01-031-0/+13