aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-02-052-5/+4
|\
| * Make configuration uniformBlueWall2012-02-051-3/+3
| * change NonPhysicalPrimMax to NonphysicalPrimMax in Scenes.cs to make thenebadon2012-02-041-1/+1
* | Merge branch 'master' into careminsterMelanie2012-02-045-88/+57
|\ \ | |/
| * Only look for an uploaded transactional asset in Scene.UpdateTaskInventory if...Justin Clark-Casey (justincc)2012-02-043-22/+21
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-02-031-8/+7
| |\
| | * Check for null scene in ScheduleFullUpdate and ScheduleTerseUpdate before tri...Dan Lake2012-02-031-4/+7
| * | Change SceneObjectSerializer to use common ExternalRepresentationUtils.Execut...Justin Clark-Casey (justincc)2012-02-031-74/+29
* | | Merge branch 'master' into careminsterMelanie2012-02-034-41/+98
|\ \ \ | |/ /
| * | Commenting out new event until I can fix OpenSim tests. Currently, testing ob...Dan Lake2012-02-021-6/+6
| * | OpenSim tests do not always create an EventManager so calls to trigger events...Dan Lake2012-02-021-2/+6
| |/
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDan Lake2012-02-022-14/+17
| |\
| | * Improve reliability of script state saving by covering various savingMelanie2012-02-022-14/+17
| * | ObjectAddedToScene event should be fired when duplicating objectsDan Lake2012-02-022-20/+22
| * | Add event RegionHeartbeatEnd for modules interested in coordinating activity ...Dan Lake2012-02-012-10/+36
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDan Lake2012-02-0119-354/+792
| |\ \ | | |/
| * | Trigger event when prims are scheduled for an update. This gives modules earl...Dan Lake2012-01-192-0/+28
| * | Cleaned up Color and Text parameters in SOP and made LocalFlags public for mo...Dan Lake2012-01-191-20/+6
| * | Add a version of GetGroupByPrim to Scene which accepts UUID instead of localIDDan Lake2012-01-192-1/+12
* | | Streamline banning code using existing methods.Melanie2012-02-021-3/+13
* | | Fix remembering attachment point and position when an item is rezzed in world.Melanie2012-02-021-1/+19
* | | Improve reliability of script state saving by covering various savingMelanie2012-02-022-13/+16
* | | Merge branch 'master' into careminsterMelanie2012-02-013-7/+23
|\ \ \ | | |/ | |/|
| * | Small optimization to last commitMelanie2012-02-011-5/+5
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2012-02-011-0/+6
| |\ \
| | * | Implement "show object uuid <uuid>" console command.Justin Clark-Casey (justincc)2012-01-311-0/+6
| * | | Fix copy/paste errorsMelanie2012-02-012-3/+3
| * | | Straighten out some attachment mess. Don't save attachment states for HGMelanie2012-02-011-1/+11
| |/ /
* | | Merge branch 'master' into careminsterMelanie2012-01-311-104/+0
|\ \ \ | |/ /
| * | Move object delete commands into a commands region module, in preparation for...Justin Clark-Casey (justincc)2012-01-311-104/+0
* | | 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
|\ \ \ | |/ /