aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes (follow)
Commit message (Expand)AuthorAgeFilesLines
* Comment debug spamMelanie2012-01-301-3/+3
* Merge branch 'master' into careminsterMelanie2012-01-301-5/+7
|\
| * lock SceneObjectGroupsByFullID in SceneGraph.ForEachSOG() to stop failure if ...Justin Clark-Casey (justincc)2012-01-301-5/+7
* | Merge branch 'master' into careminsterMelanie2012-01-284-11/+33
|\ \ | |/
| * Add an overloaded SceneObjectPart.UpdateTextureEntry(Primitive.TextureEntry t...Justin Clark-Casey (justincc)2012-01-281-4/+12
| * Add experimental --publish option to "save oar" so that OARs reloaded to the ...Justin Clark-Casey (justincc)2012-01-282-5/+21
| * Comment out xfer section in Scene.UpdateTaskInventory() which was causing spu...Justin Clark-Casey (justincc)2012-01-281-13/+20
* | Merge branch 'master' into careminsterMelanie2012-01-261-0/+27
|\ \ | |/
| * Support rejecting a teleport if a user is banned in all parcels that haveMelanie2012-01-261-0/+30
* | Merge branch 'master' into careminsterMelanie2012-01-262-0/+87
|\ \ | |/
| * Add basic TestAddScript() regression testJustin Clark-Casey (justincc)2012-01-262-0/+87
* | Merge branch 'master' into careminsterMelanie2012-01-262-89/+108
|\ \ | |/
| * refactor: change RezScriptFromAgentInventory(), RezNewScript() and AddInvento...Justin Clark-Casey (justincc)2012-01-262-31/+34
| * refactor: decompose most of RezScript() into RezScriptFromAgentInventory(), R...Justin Clark-Casey (justincc)2012-01-251-79/+95
* | Merge branch 'master' into careminsterMelanie2012-01-251-6/+0
|\ \ | |/
| * Removed unused delegates in SceneGraph: ObjectDuplicateDelegate, ObjectCreate...Dan Lake2012-01-241-6/+0
* | Merge branch 'master' into careminsterMelanie2012-01-251-12/+0
|\ \ | |/
| * Removed unused events in SceneGraph: OnObjectCreate, OnObjectRemove, OnObject...Dan Lake2012-01-241-13/+0
| * Teleport routing, part 1Melanie2012-01-241-0/+53
* | Add handling bans properlyMelanie2012-01-241-1/+1
* | Add teleport routing, first partMelanie2012-01-241-0/+59
* | Merge branch 'master' into careminsterMelanie2012-01-161-1/+1
|\ \ | |/
| * Comment out noisy log lines I accidentally included in the nant build target ...Justin Clark-Casey (justincc)2012-01-161-1/+1
| * Remove monocov and other obsolete nant build targets.Justin Clark-Casey (justincc)2012-01-161-1/+1
* | Fix mergeMelanie2012-01-141-5/+0
* | Merge branch 'master' into careminsterMelanie2012-01-141-34/+30
|\ \ | |/
| * Cleaned up the LookAt code in SOP and SOG. Added support for incrementallyMic Bowman2012-01-132-45/+30
* | Merge branch 'master' into careminsterMelanie2012-01-122-7/+7
|\ \ | |/
| * HG: normalize all externalized user ULRs to be the Home URL, i.e. the locatio...Diva Canto2012-01-122-6/+6
| * If deserializing a scene object fails during IAR load then ignore the object ...Justin Clark-Casey (justincc)2012-01-111-1/+1
* | Remove ViewObjectInventory method unsupported by coreMelanie2012-01-121-17/+0
* | Merge branch 'master' into careminsterMelanie2012-01-101-5/+6
|\ \ | |/
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-01-101-2/+0
| |\
| * | HG landing points: this hopefully fixes some confusion that was making HG avi...Diva Canto2012-01-101-5/+6
* | | Merge branch 'master' into careminsterMelanie2012-01-102-19/+32
|\ \ \ | | |/ | |/|
| * | Teleport DebuggingBlueWall2012-01-101-2/+0
| |/
| * Add some run-time debugging supportBlueWall2012-01-092-1/+6
| * Use our TeleportFlagsBlueWall2012-01-092-22/+30
| * TP Routing debugBlueWall2012-01-091-2/+5
* | Merge branch 'master' into careminsterMelanie2012-01-091-1/+20
|\ \ | |/
| * Fix teleport routing for incoming HG+OwnerBlueWall2012-01-091-18/+19
| * Debugging HG teleport routingBlueWall2012-01-091-0/+18
* | Merge branch 'master' into careminsterMelanie2012-01-091-2/+4
|\ \ | |/
| * Fix HG teleport routingBlueWall2012-01-091-2/+4
| * Fix a build breakMelanie2012-01-091-1/+1
| * Add the HG case to landing point checksMelanie2012-01-091-1/+1
| * Update teleport routing to match AvinationMelanie2012-01-081-16/+58
| * Fix teleport routingBlueWall2012-01-081-0/+17
* | Update teleport routing to match AvinationMelanie2012-01-081-1/+2
* | Merge branch 'master' into careminsterMelanie2012-01-072-20/+22
|\ \ | |/