aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminster-presence-refactorMelanie2010-08-231-3/+9
|\
| * minor: some doc for the MoveTaskInventoryItem method in Scene.Inventory.csJustin Clark-Casey (justincc)2010-08-231-1/+5
| |
| * Remove various warnings and improve logging messages. No functional changes.Justin Clark-Casey (justincc)2010-08-231-2/+4
| |
* | Add printing the default script engine name. Report real exceptions whenMelanie Thielker2010-08-221-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 disabledMelanie Thielker2010-08-221-0/+3
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-08-213-54/+58
|\ \ | |/
| * Unit test breakage fix.Diva Canto2010-08-202-6/+11
| |
| * Cleaned up a few more things related to incoming agents.Diva Canto2010-08-201-45/+42
| |
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-08-201-25/+27
| |\
| | * Finished implementing ViaLogin vs ViaHGLogin. Removed lookup on ↵Diva Canto2010-08-191-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 SceneMelanie2010-08-201-9/+54
| |/ | | | | | | to make it more configurable.
* | Add some maptile options, change maptile generation from OpenSimBase to SceneMelanie Thielker2010-08-201-8/+53
| | | | | | | | to make it more configurable.
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-08-191-1/+1
|\ \ | |/
| * minor: Correct string format in "Can't find linkset root prim" messageJustin Clark-Casey (justincc)2010-08-191-1/+1
| |
* | Merge branch 'careminster-presence-refactor' of ↵meta72010-08-1810-397/+83
|\ \ | | | | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
| * \ Merge branch 'master' into careminster-presence-refactorMelanie2010-08-189-395/+81
| |\ \ | | |/
| | * Updated the create_region command in the RemoteAdmin plugin to properly ↵randomhuman2010-08-131-39/+0
| | | | | | | | | | | | support estates without seeking further input on the console.
| | * refactor: move binary statistics logging from scene into separate region moduleJustin Clark-Casey (justincc)2010-08-132-110/+12
| | |
| | * refactor: move Scene.PerformObjectBuy into BuySellModuleJustin Clark-Casey (justincc)2010-08-134-162/+49
| | |
| | * Establish new Objects/BuySellModuleJustin Clark-Casey (justincc)2010-08-131-22/+1
| | | | | | | | | | | | Move Scene.ObjectSaleInfo() to this
| | * refactor: move Scene.TerrainUnAcked() handling into TerrainModuleJustin Clark-Casey (justincc)2010-08-131-8/+0
| | |
| | * refactor: remove Scene.SetRootAgentScene() in favour of existing event with ↵Justin Clark-Casey (justincc)2010-08-133-14/+2
| | | | | | | | | | | | same name
| | * refactor: move more map tile generation code from scene to IWorldMapModuleJustin Clark-Casey (justincc)2010-08-132-28/+4
| | |
| | * refactor: Use SOP.Flags rather than SOP.ObjectFlagsJustin Clark-Casey (justincc)2010-08-133-12/+12
| | |
| | * File wants to be committedDiva Canto2010-08-111-2/+2
| | |
| * | Merge branch 'careminster-presence-refactor' of ↵Melanie Thielker2010-08-142-3/+10
| |\ \ | | | | | | | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
| * | | Fix a possible nullref in BestAvatarResponsiveness policyMelanie Thielker2010-08-141-2/+2
| | | |
* | | | Fix a nullref exception in the prioritizermeta72010-08-121-1/+12
| |/ / |/| |
* | | Add some console debug to help fix a threadlock issue.meta72010-08-111-2/+9
| | |
* | | Merge branch 'careminster-presence-refactor' of ↵meta72010-08-111-0/+2
|\ \ \ | |/ / | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
| * | Log the state of the prejump flagMelanie Thielker2010-08-111-0/+2
| | |
* | | Fix Omega getting overwritten on startup.meta72010-08-111-1/+1
|/ /
* | Fix a nullref issue in the AgentSetAppearance packet handler when removing ↵meta72010-08-101-6/+11
| | | | | | | | the physactor from the scene
* | Note to self: don't break the buildmeta72010-08-101-1/+1
| |
* | Resolve merge failuremeta72010-08-106-4384/+4440
|\ \
| * | Resolve merge issuesMelanie2010-08-101-22/+46
| | |
| * | Merge branch 'master' into careminster-presence-refactorMelanie2010-08-106-68/+100
| |\ \ | | |/
| | * Changing prim color generates event CHANGED_COLOR.Marck2010-08-101-0/+2
| | | | | | | | | | | | Signed-off-by: Melanie <melanie@t-data.com>
| | * Removed abstract SetText method from EntityBase to make cleaner API.Mikko Pallari2010-08-103-8/+1
| | | | | | | | | | | | Signed-off-by: Melanie <melanie@t-data.com>
| | * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-08-103-50/+92
| | |\
| | | * On shift-copy of an object, set up a new physics actor (as appropriate) for ↵Justin Clark-Casey (justincc)2010-08-103-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-101-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 objectJustin Clark-Casey (justincc)2010-08-101-7/+9
| | | |
| | | * extend TestDuplicateObject() to a two prim objectJustin Clark-Casey (justincc)2010-08-101-10/+19
| | | |
| | * | Avoid truncation of error message during region creation.Marck2010-08-101-1/+1
| | |/ | | | | | | | | | Signed-off-by: Melanie <melanie@t-data.com>
| * | Remove 4000+ DOS line endings. Grrr!Melanie2010-08-101-4332/+4332
| | |
| * | Remove windows line endingeMelanie2010-08-102-118/+118
| | |
* | | Add a stack trace to the error output on the recursive read lock warning on ↵meta72010-08-101-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 Thielker2010-08-101-2/+1
| | | | | | | | It completely destroys roleplay jumping
* | Whitespace conflictMelanie Thielker2010-08-091-1/+1
| |