aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Framework (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-10-161-2/+6
|\
| * minor: Add/correct some doc messages associated with entity teleport.Justin Clark-Casey (justincc)2012-10-161-1/+6
* | Merge branch 'master' into careminsterMelanie2012-10-121-4/+4
|\ \ | |/
| * Move OpenSim.Data.RegionFlags -> OpenSim.Framework.RegionFlags to make it eas...Justin Clark-Casey (justincc)2012-10-091-4/+4
* | Merge branch 'master' into careminsterMelanie2012-10-072-5/+18
|\ \ | |/
| * On receiving TaskInventoryAccepted with a destination folder in the binary bu...Justin Clark-Casey (justincc)2012-10-061-5/+17
| * Finally fix build break by allowing UserManagementModule (which constructs a ...Justin Clark-Casey (justincc)2012-10-051-0/+1
* | Merge branch 'master' into careminsterMelanie2012-10-041-2/+2
|\ \ | |/
| * Output monitor data in response to console command on MainConsole.Instance ra...Justin Clark-Casey (justincc)2012-10-041-2/+2
* | Merge branch 'master' into careminsterMelanie2012-10-031-161/+170
|\ \ | |/
| * Add Flush() method to LogWriter. Also correct line endings to Linux form.Robert Adams2012-10-021-161/+170
* | Merge branch 'avination' into careminsterMelanie2012-09-272-30/+29
|\ \
| * | add missing transactionID in SendInventoryItemCreateUpdate. and make useUbitUmarov2012-09-241-1/+1
| * | If an asset upload transaction doesn't exist for a CreateInventory request,Melanie2012-09-241-29/+28
| * | Change the close tmeout from 2 to 3 seconds on teleport. This mayMelanie2012-09-161-1/+1
* | | Merge commit '3c77b8f463a852aecf3cb29fe4e5f4614f474dbf' into careminsterMelanie2012-09-273-7/+11
|\ \ \ | | |/ | |/|
| * | Use GridUser properly for foreign users.Diva Canto2012-09-261-0/+2
| * | Show the user's home url too on the console command.Diva Canto2012-09-261-4/+3
| * | Not really a change, just added a reminder to fix something here.Diva Canto2012-09-261-0/+3
| * | Oops, that should be inside the curly bracket.Diva Canto2012-09-251-3/+3
* | | Merge commit '77355295dadaf3be54ac29d6b3d30901e95c0a32' into careminsterMelanie2012-09-271-2/+0
|\ \ \ | |/ /
| * | Deleted extraneous debug messageDiva Canto2012-09-251-2/+0
* | | Merge branch 'master' into careminsterMelanie2012-09-244-101/+72
|\ \ \ | |/ /
| * | HG Rez object: warn the user if the item or asset cannot be found.Diva Canto2012-09-221-2/+7
| * | This fixes HG attachments' missing assets (textures, etc).Diva Canto2012-09-211-0/+28
| * | Moved the small HGUuidGatherer class to the file where its parent class is. N...Diva Canto2012-09-212-74/+2
| * | Removed redundant asset fetches on HGAssetMapper. The UuidGatherer already do...Diva Canto2012-09-211-18/+24
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-09-211-2/+2
| |\ \
| | * | Rename UuidGather.m_assetCache to m_assetService. If HGUuidGatherer hasn't b...Justin Clark-Casey (justincc)2012-09-211-2/+2
| * | | Minor: change the return value of unsuccessful posts to string.Empty.Diva Canto2012-09-211-1/+1
| |/ /
| * | More HG2.0: Added permission policies in HGAsset Service based on asset types...Diva Canto2012-09-201-15/+19
* | | Merge branch 'master' into careminsterMelanie2012-09-171-31/+59
|\ \ \ | |/ /
| * | HG2.0: Generalized the allowed HG appearances to be more than 1.Diva Canto2012-09-161-31/+59
* | | Merge branch 'avination' into careminsterMelanie2012-09-161-2/+2
|\ \ \ | | |/ | |/|
| * | Wait longer for arrival cofirmation to aid tps into laggy regionsMelanie2012-09-141-2/+2
* | | Merge branch 'master' into careminsterMelanie2012-09-163-3/+174
|\ \ \ | | |/ | |/|
| * | More on HG2.0: added the possibility of controlling the appearance that avies...Diva Canto2012-09-152-2/+171
| * | Restarting to work on HGSuitcaseInventoryService: added the ability for the o...Diva Canto2012-09-131-0/+2
* | | Merge branch 'avination' into careminsterMelanie2012-09-101-94/+116
|\ \ \ | | |/ | |/|
| * | Merge branch 'ubitwork' into avinationMelanie2012-09-041-0/+6
| |\ \
| | * | let avatar keep flying in tps to same region. (still bad for otherUbitUmarov2012-09-041-0/+6
| * | | Refactor avatar transfer so that the heavy (UpdateAgent) part is separated intoMelanie2012-09-041-94/+110
| |/ /
* | | Merge branch 'avination' into careminsterMelanie2012-08-311-2/+10
|\ \ \ | |/ /
| * | [possible still very broken] mess around keyframes. timer eventsUbitUmarov2012-08-281-2/+10
* | | Merge branch 'master' into careminsterMelanie2012-08-231-1/+1
|\ \ \ | |/ / |/| / | |/
| * Add --force flag to "kick user" console command to allow bypassing of recent ...Justin Clark-Casey (justincc)2012-08-201-1/+1
* | Merge branch 'master' into careminsterMelanie2012-07-281-2/+3
|\ \ | |/
| * When copying items, copy the item description field instead of the asset desc...Justin Clark-Casey (justincc)2012-07-261-2/+3
* | Merge branch 'master' into careminsterMelanie2012-07-232-1/+162
|\ \ | |/
| * BulletSim: add reference to OpenSim.Region.CoreModules in BSScene.cs attempti...Robert Adams2012-07-201-1/+1
generated by cgit v1.1 at 2024-12-29 22:51:00 +0000