aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-01-312-1/+20
|\
| * Remove scene object null check on SceneGraph.AddSceneObject(). Complain expl...Justin Clark-Casey (justincc)2012-01-311-1/+7
| * Add torture tests to test adding 10,000, 100,000 and 200,000 single prim scen...Justin Clark-Casey (justincc)2012-01-312-0/+8
* | 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-281-1/+33
|\ \ | |/
| * Add OS_NPC_SENSE_AS_AGENT option to osNpcCreate().Justin Clark-Casey (justincc)2012-01-281-1/+33
* | Merge branch 'master' into careminsterMelanie2012-01-271-1/+1
|\ \ | |/
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-01-271-0/+30
| |\
| * | Implement osNpcGetOwner(key npc):key. This returns the owner for an 'owned' ...Justin Clark-Casey (justincc)2012-01-271-1/+1
* | | 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-143-34/+81
|\ \ | |/
| * Register the UrlModule for script engine events OnScriptRemoved and OnObjectR...Justin Clark-Casey (justincc)2012-01-141-0/+13
| * Cleaned up the LookAt code in SOP and SOG. Added support for incrementallyMic Bowman2012-01-132-45/+30
| * Update RegionReadyModuleBlueWall2012-01-131-0/+38
* | Merge branch 'master' into careminsterMelanie2012-01-131-3/+0
|\ \ | |/
| * Undo some prior workBlueWall2012-01-121-3/+0
* | Merge branch 'master' into careminsterMelanie2012-01-132-0/+73
|\ \ | |/
| * Merge branch 'master' of /home/opensim/var/repo/opensimBlueWall2012-01-122-2/+10
| |\
| * | Move some interfaces to a more apropriate placeBlueWall2012-01-122-0/+73
* | | Merge branch 'master' into careminsterMelanie2012-01-122-2/+10
|\ \ \ | | |/ | |/|
| * | Add permissions checks for owned avatars to all other osNpc* functions.Justin Clark-Casey (justincc)2012-01-121-1/+1
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-01-123-7/+7
| |\ \
| | * | Renamed one var and deleted commented code. No functional changes.Diva Canto2012-01-121-1/+1
| | |/
| * | refactor: Move existing npc owner checks to NPCModule.CheckPermissions() meth...Justin Clark-Casey (justincc)2012-01-121-0/+8
* | | 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