aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-10-123-215/+316
|\
| * Get rid of accidental scene start left in ScenePresenceAutopilotTestsJustin Clark-Casey (justincc)2012-10-121-1/+0
| * Fix problems with regression tests by allowing invoke of Update() with a fini...Justin Clark-Casey (justincc)2012-10-122-3/+5
| * Add "active true|false" to "debug scene" console command.Justin Clark-Casey (justincc)2012-10-121-3/+37
| * minor: Add method doc to EventManager.OnNewClient, OnClientLogin, ClientClose...Justin Clark-Casey (justincc)2012-10-101-0/+14
| * Lock on AgentCircuitData during Scene.AddClient() and RemoveClient() to preve...Justin Clark-Casey (justincc)2012-10-101-201/+256
| * minor: elaborate method doc on Scene.NewUserConnection()Justin Clark-Casey (justincc)2012-10-091-6/+13
| * Merge branch 'master' of git://opensimulator.org/git/opensimDan Lake2012-10-081-1/+1
| |\
| * | Add bool to TriggerSceneObjectPartUpdated where full = true indicates a full ...Dan Lake2012-10-052-5/+5
| * | Trigger ObjectAddedToScene when loading objects from oarfile. Already trigger...Dan Lake2012-10-051-1/+8
* | | Fix merge issuesMelanie2012-10-071-7/+0
* | | Merge branch 'master' into careminsterMelanie2012-10-072-2/+29
|\ \ \ | | |/ | |/|
| * | On receiving TaskInventoryAccepted with a destination folder in the binary bu...Justin Clark-Casey (justincc)2012-10-061-1/+1
| |/
| * minor: Add missing license information from the top of IUserManagementJustin Clark-Casey (justincc)2012-10-051-1/+28
| * Forgot to actually remove the packetpool set code from scene.Justin Clark-Casey (justincc)2012-10-051-7/+0
* | Merge branch 'master' into careminsterMelanie2012-10-043-16/+62
|\ \ | |/
| * Allow default animation to be stopped to be replaced with another one.Melanie2012-10-042-16/+29
| * Add generic PercentageStat.Justin Clark-Casey (justincc)2012-10-041-1/+1
| * Add experimental "slow frames" stat, available in "show stats" and via the mo...Justin Clark-Casey (justincc)2012-10-041-0/+33
* | Merge branch 'master' into careminsterMelanie2012-10-032-0/+15
|\ \ | |/
| * implementing osDropAttachment & osDropAttachmentAtSignpostMarv2012-10-021-0/+9
| * Prevent the ExtraSettings code from crashing SQLite driven sims.Melanie2012-10-021-0/+6
| * Add MaxPrimsUndo config setting to [Startup] section of OpenSim.ini.Justin Clark-Casey (justincc)2012-09-275-19/+12
| * Don't store undo states if a scene object is manipulated when it is not in a ...Justin Clark-Casey (justincc)2012-09-262-3/+26
| * refactor: Change control structures in SOP.StoreUndoState() to reduce nesting.Justin Clark-Casey (justincc)2012-09-261-45/+43
| * Make it possible to rescale SOGs when they are not in a scene.Justin Clark-Casey (justincc)2012-09-262-34/+40
| * Enforce existing 5 action hardcoded undo limit.Justin Clark-Casey (justincc)2012-09-263-27/+65
| * Add basic undo/redo regression tests.Justin Clark-Casey (justincc)2012-09-263-8/+137
* | Merge branch 'avination' into careminsterMelanie2012-09-274-10/+21
|\ \
| * | add missing transactionID in SendInventoryItemCreateUpdate. and make useUbitUmarov2012-09-241-4/+15
| * | Merge branch 'ubitwork' into avinationMelanie2012-09-241-1/+1
| |\ \
| | * | If an asset upload transaction doesn't exist for a CreateInventory request,Melanie2012-09-241-1/+1
| * | | Comment out asset error for sculpts/meshes. If an asset is missing it's missing.Melanie2012-09-231-4/+4
| |/ /
| * | Make IncomingCloseChildAgent not send a stop packet. This may preventMelanie2012-09-161-1/+1
* | | Remove a core undo call that we don't need.Melanie2012-09-271-2/+0
* | | Make it possible to rescale SOGs when they are not in a scene.Justin Clark-Casey (justincc)2012-09-272-31/+42
* | | Merge commit '77355295dadaf3be54ac29d6b3d30901e95c0a32' into careminsterMelanie2012-09-271-2/+190
|\ \ \ | | |/ | |/|
| * | Documenting object-related eventsSignpostMarv2012-09-241-0/+43
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-09-241-10/+17
| |\ \
| * | | Documenting LSL script-related eventsSignpostMarv2012-09-241-2/+147
* | | | Merge branch 'master' into careminsterMelanie2012-09-243-55/+261
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-09-211-0/+52
| |\ \ \ | | |/ /
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-09-221-0/+36
| | |\ \
| | * | | Documenting non-LSL script-related eventsSignpostMarv2012-09-221-0/+52
| * | | | This fixes HG attachments' missing assets (textures, etc).Diva Canto2012-09-211-10/+17
| | |/ / | |/| |
| * | | Moved the small HGUuidGatherer class to the file where its parent class is. N...Diva Canto2012-09-211-0/+36
| |/ /
| * | Rename UuidGather.m_assetCache to m_assetService. If HGUuidGatherer hasn't b...Justin Clark-Casey (justincc)2012-09-211-7/+4
| * | Simplify UuidGatherer by performing asset fetch synchronously rather than usi...Justin Clark-Casey (justincc)2012-09-211-40/+44
| * | Documentation of teleport-related eventsSignpostMarv2012-09-201-0/+19
| * | minor tweaks to existing comments for IDE goodnessSignpostMarv2012-09-201-4/+7