aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/World/Land/LandObject.cs (follow)
Commit message (Collapse)AuthorAgeFilesLines
* seems to compile ( tests comented out)UbitUmarov2015-09-021-82/+2
|
* bad merge?UbitUmarov2015-09-011-16/+217
|\
| * varregion: update LandManagementModule and LandObject for variable sized ↵Robert Adams2015-03-291-77/+99
| | | | | | | | regions.
| * persist script changes to mediaURL and musicURL ( heavy thing )UbitUmarov2014-09-301-0/+2
| |
| * missing currentParcelUUID updateUbitUmarov2014-08-031-0/+1
| |
| * add some filters for NPCsUbitUmarov2014-08-021-0/+3
| |
| * changes to parcels code (still more to to)UbitUmarov2014-07-301-22/+52
| |
| * Try to plumb the other halfMelanie Thielker2014-07-291-0/+3
| |
| * change parcel overlay bytes adding LocalSound.. changed others also NEEDSUbitUmarov2014-07-291-3/+20
| | | | | | | | checking
| * Merge branch 'master' of ssh://3dhosting.de/var/git/careminsterMelanie Thielker2014-06-211-17/+10
| |\ | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
| | * Merge branch 'master' into careminsterMelanie2013-06-231-10/+10
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Monitoring/BaseStatsCollector.cs OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
| | * \ Merge branch 'master' into careminsterMelanie2013-05-121-7/+0
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * | | | Differentiate between requests only the owner should be able to do and thoseMelanie Thielker2014-04-261-11/+11
| | | | | | | | | | | | | | | | | | | | that managers can do when setting parcel data
| * | | | minor: Remove unused System.Linq reference and use ParcelFlags.None instead ↵Justin Clark-Casey (justincc)2014-04-231-2/+1
| | | | | | | | | | | | | | | | | | | | of 0 from previous commit cb1f28
| * | | | Prevent sending Land Properties for unprivileged usersDev Random2014-04-231-5/+8
| |/ / /
| * | | Merge branch 'avination' into careminsterMelanie2013-01-061-0/+13
| |\ \ \
| | * | | check land permitions on sit target for unscripted sitsUbitUmarov2013-01-031-0/+13
| | | | |
| * | | | Merge branch 'master' into careminsterMelanie2012-11-251-5/+8
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
| * | | | Merge branch 'master' into careminsterMelanie2012-10-121-0/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * \ \ \ \ Merge branch 'avination' into careminsterMelanie2012-07-061-1/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| | * | | | | Remove spammy debugMelanie2012-06-291-1/+1
| | | | | | |
| * | | | | | Merge branch 'master' into careminsterMelanie2012-06-081-1/+1
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
| * \ \ \ \ \ \ Merge branch 'avination' into careminsterMelanie2012-06-071-0/+29
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | * | | | | | Make timed bans / timed passes work as expected. Prevent transmission of mediaMelanie2012-06-071-0/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | URLs to banned clients.
| * | | | | | | Merge branch 'master' into careminsterMelanie2012-04-171-2/+2
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * | | | | | | Merge branch 'master' into careminsterMelanie2012-04-111-0/+3
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Interfaces/IEstateModule.cs
| * | | | | | | Merge branch 'master' into careminsterMelanie2012-04-071-5/+2
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/CoreModules/World/Land/LandObject.cs OpenSim/Region/Framework/Scenes/Scene.Inventory.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * | | | | | | | Remove some unneeded parensMelanie2012-04-041-1/+1
| | | | | | | | |
| * | | | | | | | Adjust Snoopy's contribution for AVNMelanie2012-04-051-56/+14
| | | | | | | | |
| * | | | | | | | Merge branch 'master' into careminsterMelanie2012-04-041-1/+57
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2012-03-221-17/+21
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/Land/LandObject.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2012-02-191-1/+2
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2012-02-051-1/+2
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * | | | | | | | | | | | Make ban, eject, freeze and the scripted versions of those work.Melanie2012-02-021-24/+54
| | | | | | | | | | | | |
| * | | | | | | | | | | | Fix calculating land prim count type width issueMelanie2012-01-281-8/+8
| | | | | | | | | | | | |
| * | | | | | | | | | | | Merge branch 'master' into careminsterMelanie2012-01-261-1/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.Inventory.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * | | | | | | | | | | | | Fix prim calculations so that > 32767 prims are supportedMelanie2012-01-171-2/+4
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Merge branch 'master' into bigmergeMelanie2011-10-271-4/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * | | | | | | | | | | | | | Fix parcel prim count and max reporting. Viewer already multiplies.Melanie2011-07-061-5/+21
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Revert "If a user has the rights to edit a parcel's properties, then also ↵root2011-07-051-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | allow them always to enter that parcel." This reverts commit b8e7258051abab3e1310dd8b08cb1d2e09fa21e3. Letting this go in would prevent land owners from banning someone who would have incidental editing rights through a group. The land owner should be the only unbannable person.
| * | | | | | | | | | | | | | Merge branch 'master' into careminster-presence-refactorroot2011-07-051-4/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Add some flags to control content in search betterMelanie2011-06-201-1/+1
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge branch 'master' into careminster-presence-refactorMelanie2011-05-141-7/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Fix bans so the region owner and estate managers can't be banned by rentersMelanie2011-05-091-0/+6
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Merge branch 'master' into careminster-presence-refactorMelanie2011-04-081-13/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminster-presence-refactorMelanie2011-04-061-68/+21
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminster-presence-refactorMelanie2011-04-011-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminster-presence-refactorMelanie2011-03-271-1/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminster-presence-refactorMelanie2011-01-281-5/+19
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminster-presence-refactorMelanie2011-01-271-2/+38
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
generated by cgit v1.1 at 2024-08-23 12:28:47 +0000