aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminster-presence-refactorMelanie2010-08-3039-735/+982
|\
| * Fix a casting operation to use ToString()Melanie2010-08-301-1/+1
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-08-300-0/+0
| |\
| | * local commit with parcel media bitsJonathan Freedman2010-08-3013-205/+311
| * | Implements parcel media setting persistence and packet / CAPS handlingJonathan Freedman2010-08-3013-205/+311
| |/
| * Replace hardcoded 0 with KickFlags provided by the client.Justin Clark-Casey (justincc)2010-08-281-1/+1
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2010-08-281-0/+9
| |\
| | * Addresses mantis #4991 -- HG between two regions with the same map coordinate...Diva Canto2010-08-271-0/+9
| * | very minor log message and var name tweaking for iar savingJustin Clark-Casey (justincc)2010-08-282-5/+8
| |/
| * Improve liveness by operating on list copies of SOG.Children where appropriateJustin Clark-Casey (justincc)2010-08-289-371/+384
| * minor: reduce log chattiness of "load iar" for IARs with lots of foldersJustin Clark-Casey (justincc)2010-08-271-1/+1
| * allow inventory path specified in "load iar" to start with a / (e.g. /Objects...Justin Clark-Casey (justincc)2010-08-273-13/+45
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2010-08-273-15/+41
| |\
| | * Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensimDiva Canto2010-08-261-1/+4
| | |\
| | | * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-08-2615-131/+193
| | | |\
| | | * | Send a null result search packet when no results are passsed inMelanie2010-08-261-1/+4
| | * | | Deleted Check4096 from Robust.ini.exampleDiva Canto2010-08-261-2/+1
| | | |/ | | |/|
| | * | More on mantis #4985Diva Canto2010-08-261-6/+14
| | * | Addresses mantis #4985 -- exceptions in DataSnapshotDiva Canto2010-08-261-7/+23
| * | | refactor: Make IAR tests set up standard iar for loadingJustin Clark-Casey (justincc)2010-08-272-48/+71
| |/ /
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2010-08-261-3/+12
| |\ \
| | * | Addresses mantis #4984 -- Datasnapshot exceptions.Diva Canto2010-08-261-3/+12
| | |/
| * | minor: remove mono compiler warningJustin Clark-Casey (justincc)2010-08-261-3/+4
| * | refactor: Move Scene.Inventory.UpdateKnownItem() into Attachments module sinc...Justin Clark-Casey (justincc)2010-08-262-49/+58
| * | refactor: break out attachment position change code in Scene.UpdatePrimPositi...Justin Clark-Casey (justincc)2010-08-263-25/+41
| * | minor: change log message from info to debugJustin Clark-Casey (justincc)2010-08-261-1/+1
| * | Rename Newtonsoft.Json.dll to properly reflect its actual assembly nameJustin Clark-Casey (justincc)2010-08-261-0/+0
| * | Remove mono compiler warningsJustin Clark-Casey (justincc)2010-08-267-36/+7
| * | Reinstate kill record check that prevents an entity update being sent to a cl...Justin Clark-Casey (justincc)2010-08-261-1/+19
| * | Use SOP.ParentGroup in Prioritizer instead of Scene.GetGroupByPrim()Justin Clark-Casey (justincc)2010-08-261-2/+16
| |/
* | Remove CRLF endingsMelanie2010-08-301-1045/+1045
* | Fix a horrible bug in SG, where iteration of scene objects is carriedMelanie Thielker2010-08-261-2/+4
* | Correct whitespaceMelanie Thielker2010-08-261-510/+0
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-08-2623-607/+1277
|\ \ | |/
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2010-08-263-31/+47
| |\
| * | Remove parts locking from data classes since these are using a copy of the sc...Justin Clark-Casey (justincc)2010-08-264-168/+155
| * | replace m_parts.Count linknum with 0 in CopyRootPart since m_parts.Count is a...Justin Clark-Casey (justincc)2010-08-261-1/+1
| * | Improve consistency of locking for SOG.m_parts in order to avoid race conditi...Justin Clark-Casey (justincc)2010-08-2623-741/+906
| * | minor: remove mono compiler warningJustin Clark-Casey (justincc)2010-08-251-3/+1
| * | If setting SOG.UUID, update the SOG.m_parts index as well as the root part UUIDJustin Clark-Casey (justincc)2010-08-251-1/+10
| * | refactor: Push item retrieval and fixing part of Scene.RezObject() down into ...Justin Clark-Casey (justincc)2010-08-253-55/+82
* | | Merge branch 'master' into careminster-presence-refactorMelanie2010-08-2515-107/+320
|\ \ \ | | |/ | |/|
| * | Prevent an object disposed exception that made forms comms unreliable. AfterMelanie Thielker2010-08-251-2/+7
| * | Make scene object directories more robust and prevent deleted SOP's fromMelanie Thielker2010-08-252-18/+29
| * | Change some e.Message to e.ToString. Don't use e.Message, it doesn't carryMelanie Thielker2010-08-251-2/+2
| |/
| * TypoDiva Canto2010-08-241-1/+1
| * Split out actual scene object insertion code from Scene.Inventory.RezObject a...Justin Clark-Casey (justincc)2010-08-243-25/+62
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2010-08-244-11/+22
| |\
| * | refactor: make RezObject() more readableJustin Clark-Casey (justincc)2010-08-241-69/+68
| * | add test to check move of task item to user inventory when a target folder is...Justin Clark-Casey (justincc)2010-08-241-0/+26