Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2010-08-26 | 2 | -27/+38 |
|\ | | | | | | | | | | | | | Resolve merge conflicts Conflicts: OpenSim/Region/Framework/Scenes/SceneGraph.cs | ||||
| * | Make scene object directories more robust and prevent deleted SOP's from | Melanie Thielker | 2010-08-25 | 2 | -18/+29 |
| | | | | | | | | sticking around | ||||
* | | 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 | 6 | -136/+205 |
| | | | | | | | | conditions in linking and unlinking | ||||
* | | 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 | 2 | -55/+70 |
|/ | | | | SceneObjectPartInventory | ||||
* | 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 | ||||
* | 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 | 2 | -1/+105 |
| | | | | | | goes to the correct directory Also removes some mono compiler warnings | ||||
* | minor: some doc for the MoveTaskInventoryItem method in Scene.Inventory.cs | Justin Clark-Casey (justincc) | 2010-08-23 | 1 | -1/+5 |
| | |||||
* | Remove various warnings and improve logging messages. No functional changes. | Justin Clark-Casey (justincc) | 2010-08-23 | 1 | -2/+4 |
| | |||||
* | Unit test breakage fix. | Diva Canto | 2010-08-20 | 2 | -6/+11 |
| | |||||
* | 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 | 1 | -25/+27 |
|\ | |||||
| * | Finished implementing ViaLogin vs ViaHGLogin. Removed lookup on ↵ | Diva Canto | 2010-08-19 | 1 | -25/+27 |
| | | | | | | | | myipaddress.com. Also removed client IP verification upon UDP connection that had been left there -- we can't do that in general. | ||||
* | | Add some maptile options, change maptile generation from OpenSimBase to Scene | Melanie | 2010-08-20 | 1 | -9/+54 |
|/ | | | | to make it more configurable. | ||||
* | minor: Correct string format in "Can't find linkset root prim" message | Justin Clark-Casey (justincc) | 2010-08-19 | 1 | -1/+1 |
| | |||||
* | Updated the create_region command in the RemoteAdmin plugin to properly ↵ | randomhuman | 2010-08-13 | 1 | -39/+0 |
| | | | | support estates without seeking further input on the console. | ||||
* | refactor: move binary statistics logging from scene into separate region module | Justin Clark-Casey (justincc) | 2010-08-13 | 2 | -110/+12 |
| | |||||
* | refactor: move Scene.PerformObjectBuy into BuySellModule | Justin Clark-Casey (justincc) | 2010-08-13 | 2 | -160/+1 |
| | |||||
* | Establish new Objects/BuySellModule | Justin Clark-Casey (justincc) | 2010-08-13 | 1 | -22/+1 |
| | | | | Move Scene.ObjectSaleInfo() to this | ||||
* | refactor: move Scene.TerrainUnAcked() handling into TerrainModule | Justin Clark-Casey (justincc) | 2010-08-13 | 1 | -8/+0 |
| | |||||
* | refactor: remove Scene.SetRootAgentScene() in favour of existing event with ↵ | Justin Clark-Casey (justincc) | 2010-08-13 | 2 | -12/+1 |
| | | | | same name | ||||
* | refactor: move more map tile generation code from scene to IWorldMapModule | Justin Clark-Casey (justincc) | 2010-08-13 | 1 | -27/+0 |
| | |||||
* | refactor: Use SOP.Flags rather than SOP.ObjectFlags | Justin Clark-Casey (justincc) | 2010-08-13 | 3 | -12/+12 |
| | |||||
* | File wants to be committed | Diva Canto | 2010-08-11 | 1 | -2/+2 |
| | |||||
* | Changing prim color generates event CHANGED_COLOR. | Marck | 2010-08-10 | 1 | -0/+2 |
| | | | | Signed-off-by: Melanie <melanie@t-data.com> | ||||
* | Removed abstract SetText method from EntityBase to make cleaner API. | Mikko Pallari | 2010-08-10 | 3 | -8/+1 |
| | | | | Signed-off-by: Melanie <melanie@t-data.com> | ||||
* | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-08-10 | 3 | -50/+92 |
|\ | |||||
| * | On shift-copy of an object, set up a new physics actor (as appropriate) for ↵ | Justin Clark-Casey (justincc) | 2010-08-10 | 3 | -23/+44 |
| | | | | | | | | | | | | every copied prim, not just the root This addresses http://opensimulator.org/mantis/view.php?id=4295 | ||||
| * | Reduce number of paths in SOP code by setting flags via Flags property ↵ | Justin Clark-Casey (justincc) | 2010-08-10 | 1 | -15/+25 |
| | | | | | | | | | | | | | | | | rather than _flags Both ObjectFlags and Flags are effectively exactly the same property, except that ObjectFlags is uint and Flags is PrimFlags Both reference the PrimFlags _flags underneath, so you couldn't set a non PrimFlags uint anyway. Deprecated ObjectFlags in favour of Flags. | ||||
| * | Extend DuplicateObject() test to check flags on the duplicated object | Justin Clark-Casey (justincc) | 2010-08-10 | 1 | -7/+9 |
| | | |||||
| * | extend TestDuplicateObject() to a two prim object | Justin Clark-Casey (justincc) | 2010-08-10 | 1 | -10/+19 |
| | | |||||
* | | Avoid truncation of error message during region creation. | Marck | 2010-08-10 | 1 | -1/+1 |
|/ | | | | Signed-off-by: Melanie <melanie@t-data.com> | ||||
* | minor: Remove overly verbose schedule full update log message for attachments | Justin Clark-Casey (justincc) | 2010-08-07 | 1 | -2/+2 |
| | |||||
* | Add new SceneGraphTests class. Add simple TestDuplicateObject() | Justin Clark-Casey (justincc) | 2010-08-07 | 3 | -2/+72 |
| | |||||
* | Remove old test classes that don't actually test anything not done elsewhere | Justin Clark-Casey (justincc) | 2010-08-07 | 2 | -233/+0 |
| | | | | Also comment out log4net line in InventoryArchiverTests | ||||
* | minor: a few miscellaneous comments | Justin Clark-Casey (justincc) | 2010-08-07 | 2 | -0/+9 |
| | |||||
* | Merge branch 'moap' | Justin Clark-Casey (justincc) | 2010-08-06 | 5 | -8/+173 |
|\ | |||||
| * | add userExposed parameter to part copy event | Justin Clark-Casey (justincc) | 2010-07-28 | 3 | -4/+13 |
| | | |||||
| * | relocate moap specific cloning code to MoapModule | Justin Clark-Casey (justincc) | 2010-07-28 | 2 | -15/+29 |
| | | |||||
| * | Fix problem where changes to media textures for prims duplicated by shify ↵ | Justin Clark-Casey (justincc) | 2010-07-28 | 1 | -1/+18 |
| | | | | | | | | | | | | copy would change both prims until server restart I also found out that you can crash the current viewer by giving it more media entrys than it's expecting | ||||
| * | Add EventManager.OnSceneObjectPreSave() for future use. This is triggered ↵ | Justin Clark-Casey (justincc) | 2010-07-26 | 2 | -3/+37 |
| | | | | | | | | immediately before a copy of the group is persisted to storage | ||||
| * | Add EventManager.OnSceneObjectLoaded() for future use. This is fired ↵ | Justin Clark-Casey (justincc) | 2010-07-26 | 2 | -3/+33 |
| | | | | | | | | immediately after a scene object is loaded from storage. | ||||
| * | implement serverside checks for media texture navigation in order to stop ↵ | Justin Clark-Casey (justincc) | 2010-07-26 | 1 | -1/+18 |
| | | | | | | | | naughty clients | ||||
| * | implement prim media control permissions serverside in order to stop bad clients | Justin Clark-Casey (justincc) | 2010-07-26 | 1 | -2/+19 |
| | | |||||
| * | Fire CHANGED_MEDIA event if a media texture is set or cleared | Justin Clark-Casey (justincc) | 2010-07-26 | 1 | -1/+2 |
| | |