aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework (follow)
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | Documentation of agent-related eventsSignpostMarv2012-09-201-1/+34
| * | Documentation of object-related eventsSignpostMarv2012-09-201-1/+38
| * | Documentation of OnPluginConsoleSignpostMarv2012-09-201-0/+16
| * | Make ResendAppearanceUpdates = true by default in [Appearance] in OpenSimDefa...Justin Clark-Casey (justincc)2012-09-201-0/+2
| * | Cleanup from prev. commitBlueWall2012-09-181-2/+2
| * | Fix some inconsistencies in configurartion: NonPhys primsBlueWall2012-09-181-3/+3
* | | Merge branch 'master' into careminsterMelanie2012-09-171-1/+41
|\ \ \ | |/ /
| * | Documentation of IScriptModuleComms.RegisterConstant and IScriptModuleComms.L...SignpostMarv2012-09-171-1/+18
| * | Implementing ability to register script constants and invocations on a region...SignpostMarv2012-09-171-0/+23
* | | Merge branch 'master' into careminsterMelanie2012-09-171-0/+3
|\ \ \ | |/ /
| * | preventing a null reference exception from being thrownSignpostMarv2012-09-171-0/+3
* | | Merge branch 'avination' into careminsterMelanie2012-09-162-3/+3
|\ \ \ | | |/ | |/|
| * | Wait a bit longer for new scene presences to aid tps into laggy regionsMelanie2012-09-141-1/+1
| * | Add the option to have variable costing for uploadsMelanie2012-09-111-2/+2
* | | Merge branch 'master' into careminsterMelanie2012-09-165-14/+150
|\ \ \ | | |/ | |/|
| * | Added unit tests for multi-region OARsOren Hurvitz2012-09-141-1/+5
| * | Support multi-region OAR filesOren Hurvitz2012-09-142-3/+8
| * | Documentation of parcel-related eventsSignpostMarv2012-09-131-0/+44
| * | Fix indentation and issues where tabs were used instead of spaces in commit 7...Justin Clark-Casey (justincc)2012-09-121-7/+8
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-09-121-1/+1
| |\ \
| | * | Allow an incoming identifier to be specified for a JsonStore.Mic Bowman2012-09-111-1/+1
| * | | Documentation of economy-related EventManager eventsSignpostMarv2012-09-121-0/+21
| |/ /
| * | documentation (OnSceneObjectPartCopy)SignpostMarv2012-09-111-0/+3
| * | documentation (OnRemovePresence)SignpostMarv2012-09-111-0/+7
| * | documentation (OnNewPresence)SignpostMarv2012-09-111-0/+7
| * | documentation (OnClientConnect)SignpostMarv2012-09-111-0/+9
| * | documentation (OnBackup)SignpostMarv2012-09-111-0/+7
| * | documentation (OnTerrainTick)SignpostMarv2012-09-111-0/+7