aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules (follow)
Commit message (Collapse)AuthorAgeFilesLines
* fix silly bugUbitUmarov2015-11-101-3/+3
|
* start TerrainCheckUpdates on heartbeat thread, but do it async; fix a bug ↵UbitUmarov2015-11-101-18/+33
| | | | on slow terrain send limits check
* change OfflineMessageModule from new avination code to original master, for ↵UbitUmarov2015-11-061-4/+20
| | | | compatibility with current web servers php scripts. This may change after current test phase
* Merge branch 'avinationmerge' of opensimulator.org:/var/git/opensim into ↵Melanie Thielker2015-11-011-1/+7
|\ | | | | | | avinationmerge
| * Don't crash the sim if the map image is null.Diva Canto2015-11-011-1/+7
| |
* | More plumbing of the EntityTransferContext (not yet complete)Melanie Thielker2015-11-015-28/+38
|/
* fix more merge issuesUbitUmarov2015-11-011-5/+5
|
* fix merge issuesUbitUmarov2015-11-011-8/+9
|
* Merge branch 'master' into avinationmergeUbitUmarov2015-11-016-72/+51
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/AvatarAppearance.cs OpenSim/Framework/Servers/ServerBase.cs OpenSim/Framework/VersionInfo.cs OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/Properties/AssemblyInfo.cs OpenSim/Region/PhysicsModules/Ode/ODEPrim.cs OpenSim/Region/PhysicsModules/Ode/OdeScene.cs OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs OpenSim/Services/HypergridService/GatekeeperService.cs OpenSim/Services/Interfaces/IAvatarService.cs OpenSim/Services/LLLoginService/LLLoginService.cs
| * fix typo reported on mantis 7735UbitUmarov2015-10-311-1/+1
| |
| * fix internal support for non square regionsUbitUmarov2015-10-311-2/+3
| |
| * Introduce an EntityTransferContext carrying the version numbers to passMelanie Thielker2015-10-313-26/+29
| | | | | | | | | | to all interested functions. Should fix the varregion conditional. Still a testing version, do NOT use in production!
| * Remove testing cruft that is blocking the new protocols. Unit tests noMelanie Thielker2015-10-312-7/+3
| | | | | | | | | | longer test TP v1 now. TP v1 will be removed within 6 months anyway.
| * fix mantis 7734, Thanks Garmin for the reportUbitUmarov2015-10-311-2/+2
| |
| * let silly tests override version on local connectionsUbitUmarov2015-10-312-3/+4
| |
| * Testing stage of the new versioning system. Use at own risk. May notMelanie Thielker2015-10-313-46/+24
| | | | | | | | work. Will eat your babies. Yada. Yada.
| * On to 0.8.3!Diva Canto2015-10-181-1/+1
| |
| * Clean up of simulation version, the number that rules the compatibility of ↵Diva Canto2015-10-182-61/+10
| | | | | | | | | | | | | | | | teleports: - It's not configurable anymore, it's fixed in code. Each number means an increase in features of the teleport procedure - Its definition moved to the global VersionInfo class As of now it's still 0.3.
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2015-09-111-12/+8
| |\
| | * Make sure the chat module doesn't deactivate just because the sectionMelanie Thielker2015-09-091-12/+8
| | | | | | | | | | | | heading is missing
| * | Mantis #7720: AssetXferUploader was setting AssetID to UUID.Zero. Before ↵Diva Canto2015-09-111-5/+7
| |/ | | | | | | that wouldn't matter (item would be a terminal object) but with the introduction of the item cache, it matters, because the object in the cache was being modified to have AssetID=UUID.Zero. Also keeping the item cache consistent when item properties change.
* | dont tell clients that we can edit a friend's attachments when we do forbid itUbitUmarov2015-10-271-1/+1
| |
* | Make changes to a friend rights reach him on another sim; find on map does ↵UbitUmarov2015-10-262-17/+78
| | | | | | | | show the region. Issues: precise location on region still not avaiable and object edit permitions on viewers edit are not being updated (but are enforced by region). friends information is updated, and warnings are displayed. Only did minor testing...
* | merge issue: fix missing '/'UbitUmarov2015-10-241-2/+3
| |
* | On to 0.8.3!Diva Canto2015-10-181-1/+1
| | | | | | | | | | Conflicts: OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/Properties/AssemblyInfo.cs
* | Fixed merge conflictsDiva Canto2015-10-182-60/+9
| | | | | | | | | | | | | | | | | | | | Clean up of simulation version, the number that rules the compatibility of teleports: - It's not configurable anymore, it's fixed in code. Each number means an increase in features of the teleport procedure - Its definition moved to the global VersionInfo class As of now it's still 0.3. Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
* | remove unused method parameter master also removedUbitUmarov2015-10-021-3/+1
| |
* | do not send DisableSimulator on teleport if agent is already returningUbitUmarov2015-10-021-2/+2
| |
* | send DisableSimulator messages on closing childagents. Possible still not ↵UbitUmarov2015-10-011-3/+9
| | | | | | | | on at best timming, or on the right source files
* | make bakes reception handle empty BakedTexture elements. But at same time ↵UbitUmarov2015-10-011-36/+36
| | | | | | | | stop sending them, only sending to Xbakes server items that do have a texture, like master does
* | some fixes/changes on land sendUbitUmarov2015-09-301-7/+14
| |
* | add missing handlers for preferencesUbitUmarov2015-09-281-0/+2
| |
* | add missing handlers for preferencesUbitUmarov2015-09-281-0/+4
| |
* | add the Default Groups module lost in the mergeUbitUmarov2015-09-261-0/+260
| |
* | coment out some debug, clean a bitUbitUmarov2015-09-262-24/+3
| |
* | fix object crossings to other scene on same instanceUbitUmarov2015-09-261-0/+2
| |
* | revert previus wrong commitUbitUmarov2015-09-251-8/+1
| |
* | patch objects crossings for var regions, until region location is fully fixedUbitUmarov2015-09-251-1/+7
| |
* | slow down terrain sending so other users of LAND queue do have a chance to ↵UbitUmarov2015-09-241-3/+3
| | | | | | | | send things
* | revert my change to the range of greyscale image maps, setting it back to 0 ↵UbitUmarov2015-09-211-3/+8
| | | | | | | | - 127.5 so not to break loading of old files. There isnt a range that fits all needs anyway
* | fix terrain save greyscale mapping to 1:1 suporting standard 0-255m range ↵UbitUmarov2015-09-201-54/+16
| | | | | | | | and not only 0-127m. Jpeg format still using a non standard color encoded heightmap
* | put back the hack to make viewers display map tags (now and then at least) ↵UbitUmarov2015-09-191-127/+236
| | | | | | | | that i had removed and do it also on the local region. Make parcel overlay a bit less transparent than i did before.
* | a few more changes to worldMap. Use ExpireCaches, cache remote mapItems ↵UbitUmarov2015-09-192-269/+196
| | | | | | | | requests, etc
* | MapBlockFromGridRegion and Map2BlockFromGridRegion are the same thingUbitUmarov2015-09-182-62/+16
| |
* | sync remote responses for mapItens with the local ones, but sending all ↵UbitUmarov2015-09-171-18/+11
| | | | | | | | valid information, so later we can cache/throotle
* | dont block a region just bc it doesnt have the requested map itemUbitUmarov2015-09-171-10/+0
| |
* | dont create terrain map asset for V1 viewers on large regions again, but do ↵UbitUmarov2015-09-171-165/+186
| | | | | | | | create parcel overlay since current viewers seem to use it (or we are missing something elsewhere)
* | remove messages on agents cross fails that got mergedUbitUmarov2015-09-171-64/+40
| |
* | generate maptile assets again, v2 do use at least the parcels overlayUbitUmarov2015-09-171-2/+2
| |
* | merge issues and a few more changesUbitUmarov2015-09-171-152/+116
| |
generated by cgit v1.1 at 2024-08-23 23:10:57 +0000