aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/World (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
| * update MapSearchModuleUbitUmarov2015-08-222-17/+39
| |
| * fix worldMapModuleUbitUmarov2015-08-222-49/+124
| |
| * delay terrain sending if land queue is 2 busyUbitUmarov2015-08-221-1/+7
| |
| * "uglyfy" GetModifiedPatchesInViewDistance. Also make it use camera orUbitUmarov2015-08-211-28/+71
| | | | | | | | avatar position
| * dont use SendTerrainUpdatesByViewDistance option, code executes as true.UbitUmarov2015-08-211-45/+19
| | | | | | | | the option will have other use
| * send regions size on map blocksUbitUmarov2015-08-201-0/+2
| |
| * fixes on warp3DUbitUmarov2015-08-192-32/+73
| |
| * Merge branch 'mbworkvar2' into ubitvarUbitUmarov2015-08-1914-285/+614
| |\
| | * varregion: update MapImageModule and ShadedMapTimeRenderer for variable ↵Robert Adams2015-03-292-29/+43
| | | | | | | | | | | | sized regions.
| | * varregion: update LandManagementModule and LandObject for variable sized ↵Robert Adams2015-03-292-106/+133
| | | | | | | | | | | | regions.
| | * varregion: any conversions of use of Constants.RegionSize converted intoRobert Adams2015-03-298-51/+47
| | | | | | | | | | | | Util.cs routines to convert region coords to and from world coords or handles.
| | * varregion: refactor use of 'double heightmap[,]' into references to new ↵Robert Adams2015-03-272-99/+391
| | | | | | | | | | | | | | | | | | class TerrainData and push the implementation from Scene into the database readers and writers.
| * | Allow re-setting the region restart timer. Also move restart notifications toMelanie Thielker2015-03-231-2/+6
| |/ | | | | | | upper right corner again.
| * fix parcel proprieties update sendingUbitUmarov2014-10-261-4/+7
| |
| * persist script changes to mediaURL and musicURL ( heavy thing )UbitUmarov2014-09-301-0/+2
| |
| * fix musicURL change being sent back with wrong snap_selection, and notUbitUmarov2014-09-301-22/+20
| | | | | | | | sent to other avatars.
| * missing currentParcelUUID updateUbitUmarov2014-08-031-0/+1
| |
| * mess update ( hide avatars )UbitUmarov2014-08-031-8/+12
| |
| * add some filters for NPCsUbitUmarov2014-08-022-0/+7
| |
| * handle change of hide avatars flag. Parcel limits edition still need workUbitUmarov2014-08-011-10/+17
| |
| * remove unnecessary sendparceloverlayUbitUmarov2014-08-011-1/+1
| |
| * MESS: changes in MakeRootAgent and CompleteMovement reordering things.UbitUmarov2014-07-312-5/+29
| | | | | | | | | | | | Added sending of land overlay and parcel information. This in order to only send avatar related information after having its position well defined and on the right parcel. THIS MAY STILL BE BAD :)
| * restrict other avatar sounds to parcel flags ( untested )UbitUmarov2014-07-301-17/+34
| |
| * changes to parcels code (still more to to)UbitUmarov2014-07-302-77/+134
| |
| * Correct nomenclature for LLSD messages. LL sure suckMelanie Thielker2014-07-291-4/+4
| |
| * Try to plumb the other halfMelanie Thielker2014-07-292-0/+16
| |
| * Change some ORs to assignments as they should beMelanie Thielker2014-07-291-5/+5
| |
| * fix the mess about exclusive fields and flags on land overlayUbitUmarov2014-07-292-31/+34
| |
| * change parcel overlay bytes adding LocalSound.. changed others also NEEDSUbitUmarov2014-07-293-30/+66
| | | | | | | | checking
| * dont mess with sound gain on stopUbitUmarov2014-07-271-1/+1
| |
| * change how sounds work. May be bad.. needs testingUbitUmarov2014-07-271-94/+55
| |
| * Merge branch 'master' of ssh://3dhosting.de/var/git/careminsterMelanie Thielker2014-06-2122-494/+1532
| |\ | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
| | * Merge branch 'master' into careminsterMelanie2014-01-288-359/+376
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/RegionSettings.cs OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs OpenSim/Region/Framework/Interfaces/IInterregionComms.cs OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs
| | * \ Merge branch 'master' into careminsterMelanie2014-01-281-7/+1
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| | * \ \ Intermediate commit. Sill errors.Melanie2014-01-051-16/+22
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' into careminster Conflicts: OpenSim/Data/SQLite/SQLiteUserProfilesData.cs OpenSim/Framework/RegionInfo.cs OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueHelper.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs OpenSim/Services/UserProfilesService/UserProfilesService.cs
| | * \ \ \ Merge branch 'master' into careminsterMelanie2013-11-232-49/+131
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .gitignore OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs prebuild.xml runprebuild.bat
| | * \ \ \ \ Merge branch 'master' into careminsterMelanie2013-11-081-1/+16
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
| | * \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-11-033-23/+51
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| | * \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-10-041-3/+3
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Data/MySQL/Resources/RegionStore.migrations OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs OpenSim/Region/CoreModules/World/LightShare/LightShareModule.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs OpenSim/Region/Framework/Scenes/Tests/ScenePresenceCapabilityTests.cs OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| | * \ \ \ \ \ \ \ Merge branch 'avination-current' into careminsterMelanie2013-09-161-3/+3
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs
| | * \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-09-011-8/+22
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/Region/RestartModule.cs OpenSim/Region/Framework/Scenes/SceneGraph.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
| | * \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-08-112-4/+33
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Application/OpenSimBase.cs OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
| | * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-07-181-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs OpenSim/Server/Handlers/Simulation/AgentHandlers.cs OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs OpenSim/Services/HypergridService/UserAgentService.cs
| | * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-07-041-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-06-301-8/+36
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Region/Framework/Scenes/EventManager.cs 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 'avination-current' into careminsterMelanie2013-06-062-2/+4
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs OpenSim/Region/Framework/Interfaces/IDynamicMenuModule.cs OpenSim/Region/OptionalModules/ViewerSupport/DynamicMenuModule.cs OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-05-241-0/+9
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-05-122-8/+50
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs OpenSim/Region/Framework/Scenes/Scene.cs
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-05-082-9/+14
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/IClientAPI.cs OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
generated by cgit v1.1 at 2024-08-22 19:10:32 +0000