aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into avinationmergeUbitUmarov2015-11-0121-122/+235
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Minor: Add an initializer to show what the default value would be.Melanie Thielker2015-11-011-1/+1
| |
| * Remove an unneeded code path, it could never be reached. Ubit caught itMelanie Thielker2015-11-011-12/+0
| | | | | | | | :)
| * This is the replacement fix for large regions and string version.Melanie Thielker2015-11-011-0/+6
| |
| * Revert "fix transfer protocol version in string format. These are notMelanie Thielker2015-11-011-17/+5
| | | | | | | | | | | | fixes you are looking for..... (Jedi mind trick) This reverts commit 19e5667451dc763eb90a78533c4fe7f51c49f9a0.
| * fix typo reported on mantis 7735UbitUmarov2015-10-311-1/+1
| |
| * fix internal support for non square regionsUbitUmarov2015-10-311-2/+3
| |
| * fix transfer protocol version in string format. Let that case have tests ↵UbitUmarov2015-10-311-5/+17
| | | | | | | | identical to new format (this still isnt for your babies keep them safe...)
| * Introduce an EntityTransferContext carrying the version numbers to passMelanie Thielker2015-10-3110-59/+81
| | | | | | | | | | 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-313-8/+8
| | | | | | | | | | longer test TP v1 now. TP v1 will be removed within 6 months anyway.
| * Put back the option of having asymmetrical protocol versions inMelanie Thielker2015-10-312-28/+23
| | | | | | | | transfers
| * fix mantis 7734, Thanks Garmin for the reportUbitUmarov2015-10-311-2/+2
| |
| * simplify new regions protocol version control. (May not work, and babies ↵UbitUmarov2015-10-312-29/+43
| | | | | | | | safety warnings still valid
| * let silly tests override version on local connectionsUbitUmarov2015-10-313-5/+6
| |
| * fix teleport to to string version regionsUbitUmarov2015-10-311-1/+1
| |
| * Merge branch 'master' of opensimulator.org:/var/git/opensimMelanie Thielker2015-10-312-9/+6
| |\
| | * fix mantis 7733, reverting setting of IsAttachment on first call to full ↵UbitUmarov2015-10-292-9/+6
| | | | | | | | | | | | check. Replace instead same simple IsAttachment tests by full checks
| * | Testing stage of the new versioning system. Use at own risk. May notMelanie Thielker2015-10-3112-79/+161
| |/ | | | | | | work. Will eat your babies. Yada. Yada.
| * fix services handling of visualparameters, avoiding possible crashs (mantis ↵UbitUmarov2015-10-271-5/+20
| | | | | | | | 7732) partially appling code from avinationmerge
| * set SOG.IsAttachment when doing a full check, so future gets see the right ↵UbitUmarov2015-10-251-1/+6
| | | | | | | | value
| * Removed invalid dependencies from prebuild (those dlls no longer exist)Diva Canto2015-10-221-2/+0
| |
| * Mark XAssetService obsolete and warn users.Diva Canto2015-10-211-0/+2
| |
| * Fix an issue introduced in 70a46fe0907c822a5244e36c338bf559ffbec965. I ↵Diva Canto2015-10-211-0/+1
| | | | | | | | accidentally deleted the entire [EntityTransfer] section instead of just a few variables in it.
| * Let the initiator of a teleport or crossing know that we handle extraMelanie Thielker2015-10-201-0/+1
| | | | | | | | wearables
| * On to 0.8.3!Diva Canto2015-10-1844-44/+44
| |
| * Added warning in RegionCombinerModule about it being considered obsolete and ↵Diva Canto2015-10-181-0/+2
| | | | | | | | encouraging people to switch to varregions.
| * Clean up of simulation version, the number that rules the compatibility of ↵Diva Canto2015-10-189-121/+36
| | | | | | | | | | | | | | | | 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.
| * The protocol version checking on the grid server connector seemed to have a ↵Diva Canto2015-10-181-1/+18
| | | | | | | | bug. I think I fixed it.
| * fix GetTerrainHeightAtXY also on master. Fix wrong active angularlock ↵UbitUmarov2015-10-172-281/+9
| | | | | | | | detection (it was only burning cpu), stop trying to add a amotor to each child part and fix a typo.
| * my first commitUbitUmarov2015-09-141-0/+1
| |
| * Change the actual versions allowed to connect, which is different fromMelanie Thielker2015-09-141-4/+4
| | | | | | | | the interface major version
| * Make regions tolerant to newer regions with more werables.Melanie Thielker2015-09-142-3/+6
| | | | | | | | Also, bump the interface version to 8
| * 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-112-6/+16
| | | | | | | | | | | | 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.
| * | Typos in commentsDiva Canto2015-09-062-2/+2
| |/
* | fix cut points of UTF-8 stringsUbitUmarov2015-10-281-10/+28
| |
* | dont tell clients that we can edit a friend's attachments when we do forbid itUbitUmarov2015-10-271-1/+1
| |
* | friends rights to edit objects display on viewers fixed. This needs to be ↵UbitUmarov2015-10-271-5/+9
| | | | | | | | optimized in future
* | 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...
* | add basic SendFindAgent() to lludp. Future use may require a list of pairs ↵UbitUmarov2015-10-265-7/+40
| | | | | | | | (X,Y). For now one pair is good enough.
* | try fix IRC connector issue on mantis 7731 but with code a bit diferent ↵UbitUmarov2015-10-261-12/+14
| | | | | | | | from proposed patch. Also append '@irc' to nick on region messages, so message origin is clear
* | merge issue: fix missing '/'UbitUmarov2015-10-241-2/+3
| |
* | Removed invalid dependencies from prebuild (those dlls no longer exist)Diva Canto2015-10-221-2/+0
| |
* | replace objects scale clamp by a more readable clamp. Simplify GroupResize ↵UbitUmarov2015-10-232-139/+83
| | | | | | | | and let rescale factors < 1 also be checked for size limits, Set new scales directly not checking them again.
* | let ode also finish internal representation of prim actors, before simulationUbitUmarov2015-10-221-0/+40
| |
* | Make physics engines finish internal representation of loaded prims before ↵UbitUmarov2015-10-224-6/+13
| | | | | | | | starting simulation so it does start for all at same time. Currently only in use by ubOde
* | rename terrain for opensim and respective configuration flag that a future ↵UbitUmarov2015-10-223-34/+37
| | | | | | | | costumized ODE library may have
* | Mark XAssetService obsolete and warn users.Diva Canto2015-10-211-0/+2
| |
* | Fix an issue introduced in 70a46fe0907c822a5244e36c338bf559ffbec965. I ↵Diva Canto2015-10-211-0/+1
| | | | | | | | accidentally deleted the entire [EntityTransfer] section instead of just a few variables in it.
generated by cgit v1.1 at 2024-11-16 22:22:52 +0000