aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-07-046-33/+80
|\
| * Guard against completely unknown user UUIDs.Diva Canto2013-07-041-3/+6
| * Revert "Same freeze issue, now checking if it's in estate"Diva Canto2013-07-041-1/+0
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-07-041-7/+18
| |\
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-07-043-4/+8
| | |\
| | * | With diva's permission, temporarily reinsert Unknown UserUMMAU3 to make sure ...Justin Clark-Casey (justincc)2013-07-041-7/+18
| * | | Same freeze issue, now checking if it's in estateDiva Canto2013-07-041-0/+1
| | |/ | |/|
| * | More debug, same issueDiva Canto2013-07-042-1/+3
| * | More debug, same issueDiva Canto2013-07-042-3/+5
| |/
| * More debug related to the previous commitDiva Canto2013-07-041-1/+1
| * Now trying to find a cause of freeze at login related to friends status notif...Diva Canto2013-07-041-2/+5
| * HG Friends: this was commented some commits ago, but it shouldn't have been.Diva Canto2013-07-041-25/+24
| * Revert "HG Friends: debug an issue where the friends data stored in the DB is...Diva Canto2013-07-041-1/+0
| * HG Friends: debug an issue where the friends data stored in the DB is incompl...Diva Canto2013-07-041-0/+1
| * Squoosh one last opportunity for Unknown Users to creep in.Diva Canto2013-07-021-7/+5
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-07-021-1/+1
| |\
| | * minor: Correct typo of "Descrition" to "Description" in "show object *" conso...Justin Clark-Casey (justincc)2013-07-031-1/+1
| * | Deleted debug messages. Fixed a null ref exception on the POST handler of Gri...Diva Canto2013-07-021-3/+2
| |/
| * More debug messagesDiva Canto2013-07-021-1/+6
| * This should have a strong effect on the Unknown User issue mantis #6625Diva Canto2013-07-021-2/+18
| * HG: close a loophole by which if something was wrong with the ServiceURLs it ...Diva Canto2013-07-022-1/+10
| * Update debug unknown user name UserUMMTGUN3 to UserUMMTGUN4 and UserUMMAU -> ...Justin Clark-Casey (justincc)2013-07-011-2/+2
* | Merge branch 'master' into careminsterMelanie2013-06-307-41/+77
|\ \ | |/
| * Revert "One more debug mantis #6625"Diva Canto2013-06-301-1/+0
| * Same fix to LocalInventoryServiceConnector.csDiva Canto2013-06-301-1/+2
| * More on mantis #6625Diva Canto2013-06-291-1/+2
| * Fixed previous debug messageDiva Canto2013-06-291-1/+1
| * One more debug mantis #6625Diva Canto2013-06-291-0/+1
| * More debug for mantis #6625. It looks like the home friends list is being fet...Diva Canto2013-06-291-20/+21
| * Make the concept of namespaces explicit in dynamic attributesJustin Clark-Casey (justincc)2013-06-273-18/+51
| * Update temporary "Unknown UserUMMTGUN2" name to "Unknown UserUMMTGUN3" to see...Justin Clark-Casey (justincc)2013-06-251-1/+1
* | 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