aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-08-2615-131/+193
|\
| * More on mantis #4985Diva Canto2010-08-261-6/+14
| * Addresses mantis #4985 -- exceptions in DataSnapshotDiva Canto2010-08-261-7/+23
| * 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
| |/
* | Send a null result search packet when no results are passsed inMelanie2010-08-261-1/+4
|/
* Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2010-08-263-31/+47
|\
| * 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
* | 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
|/
* 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
|\
| * Patch by Apelsin that fixes behaviour of llSetPos and llGetLocalPos for attac...Marck2010-08-241-8/+17
| * Plumb the region type through to the ProductName field in estate messagesMelanie2010-08-243-3/+5
* | 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
* | minor: stop test using obsolete propertyJustin Clark-Casey (justincc)2010-08-241-1/+1
* | refactor TestMoveTaskInventoryItemNoParent()Justin Clark-Casey (justincc)2010-08-241-24/+37
* | Add automated test at the opensim 'api' level to check that a given item goes...Justin Clark-Casey (justincc)2010-08-2411-32/+170
|/
* Add system lookup folder fix to the RemoveXInventoryServiceConnector as well ...Justin Clark-Casey (justincc)2010-08-231-0/+17
* minor: some doc for the MoveTaskInventoryItem method in Scene.Inventory.csJustin Clark-Casey (justincc)2010-08-231-1/+5
* Fix bug in llGiveInventory() where items were disappearing on relogJustin Clark-Casey (justincc)2010-08-235-16/+38
* Remove various warnings and improve logging messages. No functional changes.Justin Clark-Casey (justincc)2010-08-2317-79/+78
* Correct a minor typoMelanie2010-08-211-1/+1
* Finally putting estate_settings.xml to rest. There will be no more attemptsMelanie2010-08-211-198/+0
* Don't allow oversized search reply packetsMelanie Thielker2010-08-211-17/+42
* Forward-port a small improvement to the land out connectorMelanie Thielker2010-08-211-1/+2
* Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2010-08-206-20/+65
|\
| * Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensimDiva Canto2010-08-201-27/+32
| |\
| * \ Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensimDiva Canto2010-08-204-70/+109
| |\ \
| * | | Unit test breakage fix.Diva Canto2010-08-206-20/+65
* | | | Some code cleanup for console command "create region".Marck2010-08-202-31/+36
| |_|/ |/| |
* | | OpenSim.ini.example FreeSwitch section improvements, move of XML-RPC section ...Ai Austin2010-08-201-27/+32
| |/ |/|
* | Make some small corrections to ini.example file changes. These are not funct...Justin Clark-Casey (justincc)2010-08-202-20/+12
* | Robust.ini.example and Robust.HG.ini.example default: corrected comment about...Ai Austin2010-08-202-40/+53