aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-06-233-17/+36
|\
| * Change IsLocalRegion from using region handle to using regionID. This was aff...Diva Canto2013-06-221-5/+5
| * HG: avoid call on localhost between sim and UAS for standalone.Diva Canto2013-06-221-1/+20
| * Finally moved HG agent transfers to use agent fatpacks.Diva Canto2013-06-211-1/+1
| * Mantis 6608: Math error in parcel dimensions/borders seen with land show commandTalun2013-06-191-10/+10
| * Prevent an exception if no offline messages were retrieved.Kevin Cozens2013-06-181-0/+3
* | Merge branch 'avination-current' into careminsterMelanie2013-06-231-2/+6
|\ \
| * | Allow coalesced objects to be rezzed even if they extend past the sim boundsMelanie2013-06-181-2/+6
* | | Merge branch 'master' into careminsterMelanie2013-06-182-38/+74
|\ \ \ | | |/ | |/|
| * | Lock m_classifiedCache and m_classifiedInterest dictionary reads in UserProfi...Justin Clark-Casey (justincc)2013-06-151-14/+13
| * | Correct build break in previous commit 9c530d7Justin Clark-Casey (justincc)2013-06-151-10/+7
| * | refactor: In UserProfileModule, change classifiedCache and classifiedInterest...Justin Clark-Casey (justincc)2013-06-151-19/+23
| * | Add the standard OpenSimulator copyright notice to the top of InventoryCache.csJustin Clark-Casey (justincc)2013-06-151-1/+28
| * | Adjust the locking on InventoryCache. Locking for r/w of the ExpiringCache i...Justin Clark-Casey (justincc)2013-06-151-14/+23
* | | Merge branch 'master' into careminsterMelanie2013-06-132-74/+92
|\ \ \ | |/ /
| * | Uncomment Mic's code and split to create new regression TestAddTemporaryAsset...Justin Clark-Casey (justincc)2013-06-111-23/+41
| * | Removed the lock entirelyDiva Canto2013-06-111-56/+52
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-06-112-2/+22
| |\ \
| | * | Put the "script saved" and "notecard saved" messages back into the bottomMelanie2013-06-111-2/+2
| * | | Really bad idea to lock m_UserCache for so long in UserManagementModule. Adde...Diva Canto2013-06-111-13/+17
* | | | Merge branch 'avination-current' into careminsterMelanie2013-06-112-3/+3
|\ \ \ \ | | |_|/ | |/| |
| * | | Put the "script saved" and "notecard saved" messages back into the bottomMelanie2013-06-111-2/+2
| * | | Make objects attached from the ground appear in inventory again. Fixes a numberMelanie2013-06-081-1/+1
* | | | Merge branch 'master' into careminsterMelanie2013-06-115-3/+36
|\ \ \ \ | | |_|/ | |/| |
| * | | Fix test for adding temporary assets. Code for non-local temporary assetsMic Bowman2013-06-101-0/+20
| | |/ | |/|
| * | Remove Temporary from use to shortcut asset stores. The Local propertyMic Bowman2013-06-102-2/+2
| * | Catch exception triggered by incoming avatars using legacy profilesBlueWall2013-06-081-1/+10
| * | Merge branch 'profiles'BlueWall2013-06-072-0/+4
| |\ \
| | * | SQLite support for UserProfilesBlueWall2013-06-071-0/+1
| | * | Ensure selected module is the only active oneBlueWall2013-06-071-0/+3
| * | | Supply proper type information for the various types of requestsMelanie2013-06-071-6/+6
| * | | Adding Avination's PollService to round out the HTTP inventory changesMelanie2013-06-071-4/+4
| |/ /
* | | Merge branch 'master' into careminsterMelanie2013-06-072-4/+4
|\ \ \ | |/ /
| * | In LocalFriendshipTerminated, send the original client's agentId to the frien...Donnie Roberts2013-06-072-4/+4
* | | Merge branch 'master' into careminsterMelanie2013-06-061-0/+5
|\ \ \ | |/ /
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-06-052-0/+6
| |\ \
| | * | Hook up Keyframe motion to almost everything. Failing to cross a sim borderMelanie2013-06-062-0/+6
| * | | Strengthen some assumptions.Diva Canto2013-06-051-0/+5
| |/ /
* | | Merge branch 'avination-current' into careminsterMelanie2013-06-066-18/+68
|\ \ \ | | |/ | |/|
| * | Allow Linden trees to preserve their type when taken into inventory and rezze...Melanie2013-05-261-3/+12
| * | Reset "Show in search" on parcels cut off other parcels that are in searchMelanie2013-05-241-0/+2
| * | Refactor to get closer to coreMelanie2013-05-111-2/+2
| * | Remove dumb "Region found!" message from map searchMelanie2013-05-061-2/+2
| * | Implement llSetContentType using the new OpenID auth support for authenticationMelanie2013-05-051-1/+50
| * | Fix the long standing bug of items being delivered to lost and found or trash...Melanie2013-05-011-2/+3
| * | Merge branch 'avination-current' of ssh://3dhosting.de/var/git/careminster in...Melanie2013-04-301-2/+8
| |\ \
| | * | Fix bug where an agent that declined an inventory offer and subsequently empt...Justin Clark-Casey (justincc)2013-04-301-2/+8
| * | | Fix CAPS to work like they should - do not send caps to the viewer if they're...Melanie2013-04-301-1/+1
| |/ /
| * | Make the kicked user's avie truly disappear when it's god-kicked.Diva Canto2013-04-251-2/+1
| * | Gods module cleanupMelanie2013-04-251-10/+0