Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-08-23 | 1 | -3/+9 |
|\ | |||||
| * | 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 |
| | | |||||
* | | Add printing the default script engine name. Report real exceptions when | Melanie Thielker | 2010-08-22 | 1 | -2/+3 |
| | | | | | | | | | | there is an issue with the config file, as a typo could cause configuration to silently fail. | ||||
* | | Suppress error messages about scripts not foind if they're in fact disabled | Melanie Thielker | 2010-08-22 | 1 | -0/+3 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-08-21 | 3 | -54/+58 |
|\ \ | |/ | |||||
| * | 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. | ||||
* | | Add some maptile options, change maptile generation from OpenSimBase to Scene | Melanie Thielker | 2010-08-20 | 1 | -8/+53 |
| | | | | | | | | to make it more configurable. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-08-19 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | minor: Correct string format in "Can't find linkset root prim" message | Justin Clark-Casey (justincc) | 2010-08-19 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'careminster-presence-refactor' of ↵ | meta7 | 2010-08-18 | 6 | -392/+30 |
|\ \ | | | | | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor | ||||
| * \ | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-08-18 | 5 | -390/+28 |
| |\ \ | | |/ | |||||
| | * | 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 |
| | | | |||||
| * | | Merge branch 'careminster-presence-refactor' of ↵ | Melanie Thielker | 2010-08-14 | 2 | -3/+10 |
| |\ \ | | | | | | | | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor | ||||
| * | | | Fix a possible nullref in BestAvatarResponsiveness policy | Melanie Thielker | 2010-08-14 | 1 | -2/+2 |
| | | | | |||||
* | | | | Fix a nullref exception in the prioritizer | meta7 | 2010-08-12 | 1 | -1/+12 |
| |/ / |/| | | |||||
* | | | Add some console debug to help fix a threadlock issue. | meta7 | 2010-08-11 | 1 | -2/+9 |
| | | | |||||
* | | | Merge branch 'careminster-presence-refactor' of ↵ | meta7 | 2010-08-11 | 1 | -0/+2 |
|\ \ \ | |/ / | | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor | ||||
| * | | Log the state of the prejump flag | Melanie Thielker | 2010-08-11 | 1 | -0/+2 |
| | | | |||||
* | | | Fix Omega getting overwritten on startup. | meta7 | 2010-08-11 | 1 | -1/+1 |
|/ / | |||||
* | | Fix a nullref issue in the AgentSetAppearance packet handler when removing ↵ | meta7 | 2010-08-10 | 1 | -6/+11 |
| | | | | | | | | the physactor from the scene | ||||
* | | Note to self: don't break the build | meta7 | 2010-08-10 | 1 | -1/+1 |
| | | |||||
* | | Resolve merge failure | meta7 | 2010-08-10 | 6 | -4384/+4440 |
|\ \ | |||||
| * | | Resolve merge issues | Melanie | 2010-08-10 | 1 | -22/+46 |
| | | | |||||
| * | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-08-10 | 6 | -68/+100 |
| |\ \ | | |/ | |||||
| | * | 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> | ||||
| * | | Remove 4000+ DOS line endings. Grrr! | Melanie | 2010-08-10 | 1 | -4332/+4332 |
| | | | |||||
| * | | Remove windows line endinge | Melanie | 2010-08-10 | 2 | -118/+118 |
| | | | |||||
* | | | Add a stack trace to the error output on the recursive read lock warning on ↵ | meta7 | 2010-08-10 | 1 | -104/+114 |
|/ / | | | | | | | my RWlocks. Whilst recursive locks are safe, coupled with other issues we're experiencing with the TaskInventoryDictionary it implies that somewhere the lock is not being freed possibly due to a merge error somewhere, and thus it needs to be looked into. | ||||
* | | Change prejump from hardcoded true to default true so it can be disabled. | Melanie Thielker | 2010-08-10 | 1 | -2/+1 |
| | | | | | | | | It completely destroys roleplay jumping | ||||
* | | Whitespace conflict | Melanie Thielker | 2010-08-09 | 1 | -1/+1 |
| | |