Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Rename Newtonsoft.Json.dll to properly reflect its actual assembly name | Justin Clark-Casey (justincc) | 2010-08-26 | 1 | -0/+0 |
| | |||||
* | Remove mono compiler warnings | Justin Clark-Casey (justincc) | 2010-08-26 | 7 | -36/+7 |
| | |||||
* | Reinstate kill record check that prevents an entity update being sent to a ↵ | Justin Clark-Casey (justincc) | 2010-08-26 | 1 | -1/+19 |
| | | | | | | | client after it has been told that the entity has been deleted. On Linden Lab clients and some derivatives, receiving an entity update after an entity deletion notice results in an undeleteable prim that disappears upon client relog. This check was dropped in 0.7 for unknown reasons but renewed testing demonstrates that queued updates can still be present after a scene object has been deleted. | ||||
* | Use SOP.ParentGroup in Prioritizer instead of Scene.GetGroupByPrim() | Justin Clark-Casey (justincc) | 2010-08-26 | 1 | -2/+16 |
| | | | | By the time a scheduled update is triggered, a sog may have been removed from the scene. This change prevents NullReferenceExceptions in these situations. | ||||
* | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2010-08-26 | 3 | -31/+47 |
|\ | | | | | | | | | | | | | Resolve merge conflicts Conflicts: OpenSim/Region/Framework/Scenes/SceneGraph.cs | ||||
| * | Prevent an object disposed exception that made forms comms unreliable. After | Melanie Thielker | 2010-08-25 | 1 | -2/+7 |
| | | | | | | | | | | starting an asynchronous write, one should not close the channel it will be written to synchrnously, that leads to grief. | ||||
| * | Make scene object directories more robust and prevent deleted SOP's from | Melanie Thielker | 2010-08-25 | 2 | -18/+29 |
| | | | | | | | | sticking around | ||||
| * | Change some e.Message to e.ToString. Don't use e.Message, it doesn't carry | Melanie Thielker | 2010-08-25 | 1 | -2/+2 |
| | | | | | | | | | | any useful information. Error messages are useless without location information. It looks more elegant, but is totally pointless. | ||||
* | | Remove parts locking from data classes since these are using a copy of the ↵ | Justin Clark-Casey (justincc) | 2010-08-26 | 4 | -168/+155 |
| | | | | | | | | scene object | ||||
* | | replace m_parts.Count linknum with 0 in CopyRootPart since m_parts.Count is ↵ | Justin Clark-Casey (justincc) | 2010-08-26 | 1 | -1/+1 |
| | | | | | | | | always 0 (and any other number would cause an error anyway) | ||||
* | | Improve consistency of locking for SOG.m_parts in order to avoid race ↵ | Justin Clark-Casey (justincc) | 2010-08-26 | 23 | -741/+906 |
| | | | | | | | | conditions in linking and unlinking | ||||
* | | minor: remove mono compiler warning | Justin Clark-Casey (justincc) | 2010-08-25 | 1 | -3/+1 |
| | | |||||
* | | If setting SOG.UUID, update the SOG.m_parts index as well as the root part UUID | Justin Clark-Casey (justincc) | 2010-08-25 | 1 | -1/+10 |
| | | | | | | | | Being able to change a SOG.UUID is useful for region modules that want to supply their own UUID, before the object is rezzed | ||||
* | | refactor: Push item retrieval and fixing part of Scene.RezObject() down into ↵ | Justin Clark-Casey (justincc) | 2010-08-25 | 3 | -55/+82 |
|/ | | | | SceneObjectPartInventory | ||||
* | Typo | Diva Canto | 2010-08-24 | 1 | -1/+1 |
| | |||||
* | Split out actual scene object insertion code from Scene.Inventory.RezObject ↵ | Justin Clark-Casey (justincc) | 2010-08-24 | 3 | -25/+62 |
| | | | | | | | | and move into SceneGraph.AddNewSceneObject() The new SceneGraph method is more consumable by region modules that want to extract objects from inventory and add them to the scene in separate stages. This change also reduces the number of redundant client updates scheduled when an object is rezzed directly by a script or region module This code does not touch direct rez by a user | ||||
* | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2010-08-24 | 4 | -11/+22 |
|\ | |||||
| * | Patch by Apelsin that fixes behaviour of llSetPos and llGetLocalPos for ↵ | Marck | 2010-08-24 | 1 | -8/+17 |
| | | | | | | | | | | | | | | | | attachments. This fixes Mantis #3923. Signed-off-by: Melanie <melanie@t-data.com> | ||||
| * | Plumb the region type through to the ProductName field in estate messages | Melanie | 2010-08-24 | 3 | -3/+5 |
| | | |||||
* | | refactor: make RezObject() more readable | Justin Clark-Casey (justincc) | 2010-08-24 | 1 | -69/+68 |
| | | |||||
* | | add test to check move of task item to user inventory when a target folder ↵ | Justin Clark-Casey (justincc) | 2010-08-24 | 1 | -0/+26 |
| | | | | | | | | is explicitly given | ||||
* | | minor: stop test using obsolete property | Justin Clark-Casey (justincc) | 2010-08-24 | 1 | -1/+1 |
| | | |||||
* | | refactor TestMoveTaskInventoryItemNoParent() | Justin Clark-Casey (justincc) | 2010-08-24 | 1 | -24/+37 |
| | | |||||
* | | Add automated test at the opensim 'api' level to check that a given item ↵ | Justin Clark-Casey (justincc) | 2010-08-24 | 11 | -32/+170 |
|/ | | | | | | goes to the correct directory Also removes some mono compiler warnings | ||||
* | Add system lookup folder fix to the RemoveXInventoryServiceConnector as well ↵ | Justin Clark-Casey (justincc) | 2010-08-23 | 1 | -0/+17 |
| | | | | since this presumably suffers from the same problem. | ||||
* | minor: some doc for the MoveTaskInventoryItem method in Scene.Inventory.cs | Justin Clark-Casey (justincc) | 2010-08-23 | 1 | -1/+5 |
| | |||||
* | Fix bug in llGiveInventory() where items were disappearing on relog | Justin Clark-Casey (justincc) | 2010-08-23 | 5 | -16/+38 |
| | | | | | This was a regression - the code to look up the correct type folder was no longer being called if items were added without a parent folder set This may have been broken since commit bd49985a on 2010-05-02 | ||||
* | Remove various warnings and improve logging messages. No functional changes. | Justin Clark-Casey (justincc) | 2010-08-23 | 17 | -79/+78 |
| | |||||
* | Correct a minor typo | Melanie | 2010-08-21 | 1 | -1/+1 |
| | |||||
* | Finally putting estate_settings.xml to rest. There will be no more attempts | Melanie | 2010-08-21 | 1 | -198/+0 |
| | | | | to read or write this file. | ||||
* | Don't allow oversized search reply packets | Melanie Thielker | 2010-08-21 | 1 | -17/+42 |
| | |||||
* | Forward-port a small improvement to the land out connector | Melanie Thielker | 2010-08-21 | 1 | -1/+2 |
| | |||||
* | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2010-08-20 | 6 | -20/+65 |
|\ | |||||
| * | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim | Diva Canto | 2010-08-20 | 1 | -27/+32 |
| |\ | |||||
| * \ | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim | Diva Canto | 2010-08-20 | 4 | -70/+109 |
| |\ \ | |||||
| * | | | Unit test breakage fix. | Diva Canto | 2010-08-20 | 6 | -20/+65 |
| | | | | |||||
* | | | | Some code cleanup for console command "create region". | Marck | 2010-08-20 | 2 | -31/+36 |
| |_|/ |/| | | | | | | | | | | | | | | Make region name an optional command parameter. Avoid question for region name if it has already been specified. Extend help text. | ||||
* | | | OpenSim.ini.example FreeSwitch section improvements, move of XML-RPC section ↵ | Ai Austin | 2010-08-20 | 1 | -27/+32 |
| |/ |/| | | | | | away from end and correction of typo "fro" (fixes Mantis 4833) | ||||
* | | Make some small corrections to ini.example file changes. These are not ↵ | Justin Clark-Casey (justincc) | 2010-08-20 | 2 | -20/+12 |
| | | | | | | | | functional changes. | ||||
* | | Robust.ini.example and Robust.HG.ini.example default: corrected comment ↵ | Ai Austin | 2010-08-20 | 2 | -40/+53 |
| | | | | | | | | about realm for UserAccountService to state default is useraccount, and include default realm commented out in every case | ||||
* | | minor: remove mono compiler warning | Justin Clark-Casey (justincc) | 2010-08-20 | 1 | -9/+9 |
| | | |||||
* | | Some code cleanup for console command alert. | Marck | 2010-08-20 | 1 | -9/+43 |
|/ | | | | | | Made parsing of parameters more robust. Allow general alerts without specifying keyword 'general'. Extended help texts. | ||||
* | Cleaned up a few more things related to incoming agents. | Diva Canto | 2010-08-20 | 1 | -45/+42 |
| | |||||
* | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-08-20 | 11 | -164/+213 |
|\ | |||||
| * | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim | Diva Canto | 2010-08-19 | 1 | -1/+6 |
| |\ | |||||
| * | | Finished implementing ViaLogin vs ViaHGLogin. Removed lookup on ↵ | Diva Canto | 2010-08-19 | 4 | -119/+48 |
| | | | | | | | | | | | | myipaddress.com. Also removed client IP verification upon UDP connection that had been left there -- we can't do that in general. | ||||
| * | | Partial rewrite of client IP verification. Not completely finished yet, and ↵ | Diva Canto | 2010-08-19 | 8 | -47/+167 |
| | | | | | | | | | | | | untested. Committing to move to my other computer. | ||||
* | | | Add some maptile options, change maptile generation from OpenSimBase to Scene | Melanie | 2010-08-20 | 3 | -17/+60 |
| |/ |/| | | | | | to make it more configurable. | ||||
* | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-08-19 | 1 | -40/+28 |
|\ \ | |/ | |||||
| * | These files want to be committed. This time I'm doing it separately from ↵ | Diva Canto | 2010-08-19 | 2 | -327/+327 |
| | | | | | | | | other commits. |