aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Scene.cs (follow)
Commit message (Expand)AuthorAgeFilesLines
...
* | | Merge branch 'master' into careminsterMelanie2013-05-081-1/+1
|\ \ \ | |/ /
| * | Step one of estate settings sharing - port the Avination Estate module (compl...Melanie2013-05-071-2/+3
* | | Merge branch 'master' into careminsterMelanie2013-05-061-5/+18
|\ \ \ | |/ /
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-05-061-9/+102
| |\ \
| * | | Minor reordering of operations on NewUserConnection. The agent circuit needs ...Diva Canto2013-05-061-5/+17
* | | | Merge branch 'master' into careminsterMelanie2013-05-041-2/+14
|\ \ \ \ | | |/ / | |/| |
| * | | On startup, start scenes after we're set up all local scenes, rather than sta...Justin Clark-Casey (justincc)2013-05-031-2/+14
| * | | Some more pieces of Avination's ban system - if an avatar isn't allowed on anyMelanie2013-04-291-7/+88
| |/ /
| * | Add Avination's support for parcel eject and freezeMelanie2013-04-251-15/+25
* | | Merge branch 'master' into careminsterMelanie2013-04-101-6/+6
|\ \ \ | |/ / | | / | |/ |/|
| * Fix taking (and rezzing) of coalesced objects in the non-root subregions of m...Justin Clark-Casey (justincc)2013-04-061-6/+6
* | Merge commit '23ae4c0a4d813763bcc39db7693850a21727d7f2' into careminsterMelanie2013-03-291-1/+4
|\ \ | |/
| * Fix bug where CHANGED_REGION and/or CHANGED_TELEPORT weren't firing for scrip...Justin Clark-Casey (justincc)2013-03-291-1/+4
* | Merge commit '03e421bf3d796bf3498f4f3311c59ce04fb1fea1' into careminsterMelanie2013-03-291-27/+27
|\ \ | |/
| * minor: comment out unused Scene.AgentCrossing() to reduce code complexityJustin Clark-Casey (justincc)2013-03-281-27/+27
* | Merge commit 'c2093ccce16cd5210c8e0759f23b5b4bd205b7af' into careminsterMelanie2013-03-291-29/+0
|\ \ | |/
| * Move the simulator-side RezAttachments call on login to SP.MakeRootAgent with...Justin Clark-Casey (justincc)2013-03-281-28/+0
| * Phase 1 of implementing a transfer permission. Overwrite libOMV's PermissionMaskMelanie2013-03-261-0/+1
* | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ...Melanie2013-03-261-0/+1
|\ \
| * | Phase 1 of implementing a transfer permission. Overwrite libOMV's PermissionMaskMelanie2013-03-241-0/+1
* | | Merge branch 'master' into careminsterMelanie2013-03-231-1/+0
|\ \ \ | |/ / |/| / | |/
| * Add "show borders" command to show the borders of a region.Justin Clark-Casey (justincc)2013-03-231-1/+0
* | Merge branch 'master' into careminsterMelanie2013-03-221-1/+15
|\ \ | |/
| * minor: don't bother with the pause before rezzing attachments if we are runni...Justin Clark-Casey (justincc)2013-03-201-1/+15
| * Insert a short delay on the simulator side rezzing of attachments in order to...Justin Clark-Casey (justincc)2013-03-201-1/+1
| * Multiattach, part 1Melanie2013-03-181-1/+1
* | Merge branch 'avination' into careminsterMelanie2013-03-061-1/+1
|\ \
| * | Multiattach, part 1Melanie2013-03-051-1/+1
* | | 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-031-18/+37
|\ \ \ | | |/ | |/|
| * | Make Keyframe motion cross regions againMelanie2013-03-031-2/+3
| * | Fix an issue where the viewer would request the seed cap beforeMelanie2013-02-181-16/+34
* | | 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-101-2/+7
|\ \ \ | |/ /
| * | Fix teleport/telehub issue:BlueWall2013-02-101-2/+7
* | | Merge branch 'avination' into careminsterMelanie2013-02-071-0/+7
|\ \ \ | | |/ | |/|
| * | Move SoubleQueu to Util. Change HTTP inv to prioritize COF. Determine COF for SPMelanie2013-02-061-0/+7
* | | Merge branch 'master' into careminsterMelanie2013-02-061-5/+0
|\ \ \ | | |/ | |/|
| * | Remove long unused Scene.DumpAssetsToFile boolean.Justin Clark-Casey (justincc)2013-02-061-5/+0
* | | Merge branch 'master' into careminsterMelanie2013-02-061-11/+0
|\ \ \ | |/ /
| * | Remove unused ScriptEngineLoader and ScriptEngineInterface in OpenSim.Region....Justin Clark-Casey (justincc)2013-02-061-11/+0
* | | Merge branch 'master' into careminsterMelanie2013-01-311-1/+1
|\ \ \ | |/ /
| * | Whitespace fix and removing unneccessary parenthesesMelanie2013-01-311-1/+1
* | | Merge branch 'master' into careminsterMelanie2013-01-311-108/+106
|\ \ \ | |/ /
| * | Allow use of MaptileStaticUUID in Regions.ini to override the global setting ...Jak Daniels2013-01-301-1/+6
| * | Add the Avination physics raycast glue so Core Physics can implement raycastMelanie2013-01-231-0/+13
* | | Merge branch 'avination' into careminsterMelanie2013-01-271-1/+1
|\ \ \ | | |/ | |/|
| * | Reinstate cleaning objects from parcel when avatars sit on them. Instead do itMelanie2013-01-261-1/+1