aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
* Still related to mantis #7917, parcel prims info. Now sending the correct ↵Diva Canto2016-06-194-14/+12
| | | | numbers for "Simulator primitive usage" related to the parcel owner, not the entire region.
* Mantis #7917: regression on prim limits module.Diva Canto2016-06-182-20/+7
|
* Guard against occurring null ref.Diva Canto2016-06-181-1/+1
|
* Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2016-06-172-37/+37
|\
| * Merge branch 'master' of opensimulator.org:/var/git/opensimMelanie Thielker2016-06-162-7/+2
| |\
| * | Also make the HGUserManagementModule more amenable to subclassing.Melanie Thielker2016-06-161-2/+2
| | |
| * | Make the UserManagementModule inheritableMelanie Thielker2016-06-151-35/+35
| | |
* | | Mantis #7848: something wrong with a data field in Groups V2Diva Canto2016-06-171-2/+1
| |/ |/|
* | "reverting" the keep alive changes brought in from avination, to check if ↵Diva Canto2016-06-142-7/+2
| | | | | | | | that's what's making osgrid fail. This is not really reverting, it's more manually resetting some places (not all) where keep alive is set.
* | Revert "Add a few more debug messages to diagnose problems in OSGrid's proxy ↵Diva Canto2016-06-131-5/+0
| | | | | | | | | | | | use" This reverts commit 2d2414adcfcf50ba1398f889c0ca301b3409e317.
* | Revert "More debug to diagnose osgrid"Diva Canto2016-06-132-2/+1
| | | | | | | | This reverts commit b5f29e93f6345987c0b9b8d6496b489e7336039b.
* | More debug to diagnose osgridDiva Canto2016-06-132-1/+2
| |
* | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2016-06-133-112/+111
|\ \ | |/
| * Fields should be protected unless private is requiredMelanie Thielker2016-06-141-1/+1
| |
| * Make the LLUDPServerShim inheritable. There is absolutely no reason forMelanie Thielker2016-06-141-75/+74
| | | | | | | | this to be sealed!
| * Make chat and instant message modules fully subclassableMelanie Thielker2016-06-142-36/+36
| |
* | Add a few more debug messages to diagnose problems in OSGrid's proxy useDiva Canto2016-06-131-0/+5
|/
* Mantis #7923. EDIT BEAMS ARE BACK!Diva Canto2016-06-121-2/+1
|
* Mantis #7861. llEdgeOfWorld not working. Two reasons: (1) edge was being ↵Diva Canto2016-06-121-5/+5
| | | | | | filled but not used; (2) region size was being ignored when computing the neighbors' coordinates. Not sure if this is the intended semantics of this function, but it made sense in my varregion test with neighbors all around except in the South.
* Still mantis #7858: send kill object / update to child agents tooDiva Canto2016-06-121-2/+2
|
* Detection of Cylinder and Prism for flexi primsMandarinka Tasty2016-06-121-2/+2
| | | | | Signed-off-by: Mandarinka Tasty <mandarinka.tasty@gmail.com> Signed-off-by: Diva Canto <diva@metaverseink.com>
* Mantis #7858: DeleteSceneObject done slightly differently. ProcessEntities ↵Diva Canto2016-06-123-9/+34
| | | | | | now checks whether the objects have been deleted and, if so, sends an extra kill object packet, in order to compensate for potential race conditions encountered by the first one. Note: I still cannot reproduce this problem, but I was able to emulate it by adding an artificial delay on ProcessEntities, which did, indeed, result in objects not being deleted. This fix fixed my emulated scenario.
* Restore SendAgentGroupDataUpdate() call in GroupsModule.cs.Robert Adams2016-06-111-7/+13
| | | | | | Restore linkage to OnAgentClosed since the merge solved the reference problem by looking up the agent. This should address Mantis 7915 and 7920.
* Mantis #7874: parcel properties not being updated upon avatar entering new ↵Diva Canto2016-06-111-1/+0
| | | | parcel. Root cause: update of the avatar's current property was being made too soon.
* Mantis #7858. This is s shot in the dark, because I cannot reproduce the ↵Diva Canto2016-06-111-2/+0
| | | | problem. Removed what seemed to be redundant kill object calls that weren't there in 0.8.2 -- kill object is already being called in DeleteGroupFromScene.
* Mantis #7919: fatal exception on LoadImageURLModuleDiva Canto2016-06-061-0/+4
|
* Fixed a merge issueDiva Canto2016-06-061-3/+3
|
* Don't copy assets to foreign asset servers when the objects are being deletedDiva Canto2016-06-062-2/+9
| | | | | Conflicts: OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs
* Correct spelling and grammar, thanks Mata HariMelanie Thielker2016-05-301-2/+2
|
* Enhancement of osRegionRestartMandarinka Tasty2016-05-303-11/+53
| | | | | Signed-off-by: Mandarinka Tasty <mandarinka.tasty@gmail.com> Signed-off-by: Melanie Thielker <melanie@t-data.com>
* Fix a line deletion that should not have been deletedMelanie Thielker2016-05-231-0/+1
|
* Merge branch 'master' of opensimulator.org:/var/git/opensimMelanie Thielker2016-05-234-4/+14
|\
| * Minor improvement over the previous commit -- make sure the code exists in ↵Diva Canto2016-05-161-1/+1
| | | | | | | | the FolderType enum
| * Mantis #7878 -- Landmarks were not being created in HGSuitcaseInventoryDiva Canto2016-05-162-0/+8
| |
| * Fix crash due to setting Thread.name after thread start.Roger Kirkman2016-05-122-4/+6
| | | | | | | | Signed-off-by: Diva Canto <diva@metaverseink.com>
* | Fixed discrepancy between code and ini symbols.Jeff Kelley2016-05-231-1/+1
| |
* | Addressing #7903. Fix legacy sit offsets to use legacy computation.Melanie Thielker2016-05-231-3/+5
|/ | | | New offsets of course still use the correct math.
* According to the SL wiki, estate managers can set parcels for sale. Make it sew.Melanie Thielker2016-05-021-1/+1
|
* Change requirements for the LL god functions from CanRunConsoleCommand to ↵Melanie Thielker2016-05-011-2/+2
| | | | IsAdministrator, a function that was not available when these were first coded and makes much more sense.
* Apply user specified default perms across the board, to items uploaded as ↵Melanie Thielker2016-04-298-35/+25
| | | | | | | | well as items created and to rezzed prims in world. This effectively removes the concept of "default permissions" from OpenSim because all known modern viewers set the permissions flags on login. Ancient abandoned viewers will now default to the SL defaults.
* Allow default permissions from the viewer to be applied to uploaded objects.Melanie Thielker2016-04-296-23/+74
| | | | Make inventory items reflect coorect permissions immediately unstead of after relog
* Prevent "Object->Take" from working on attachments.Melanie Thielker2016-04-291-2/+2
|
* Fix incorrect SQLite syntax in MigrationsMelanie Thielker2016-04-281-1/+1
|
* Replace the "land show" method with the better one from 0.8.Melanie Thielker2016-04-281-16/+25
|
* Make the SimulatorFeaturesModule nonshared as it ought to be from it's code ↵Melanie Thielker2016-04-271-5/+1
| | | | structure.
* From information given my Mandarinka Tasty, add firing the detach event even ↵Melanie Thielker2016-04-271-0/+3
| | | | for temp attachments
* Remove a remnant of the optionalmodules unit test that was removed earlierMelanie Thielker2016-04-261-1/+1
|
* Reverse a comparison, this is probably the cause of attach issuesMelanie Thielker2016-04-261-1/+1
|
* Fire detach events even in temp attachments. They don't really need it but ↵Melanie Thielker2016-04-251-1/+9
| | | | keeping the tests happy
* Stop serializing and storing assets for objects that were never rezzed from ↵Melanie Thielker2016-04-251-0/+12
| | | | inventory items.