aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
* 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 EntityTransferContext plumbingMelanie Thielker2015-11-011-1/+2
| |
* | More plumbing of the EntityTransferContext (not yet complete)Melanie Thielker2015-11-018-35/+47
|/
* fix more merge issuesUbitUmarov2015-11-011-5/+5
|
* fix merge issuesUbitUmarov2015-11-011-8/+9
|
* Merge branch 'master' into avinationmergeUbitUmarov2015-11-0112-87/+75
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-315-33/+37
| | | | | | | | | | 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.
| * fix mantis 7734, Thanks Garmin for the reportUbitUmarov2015-10-311-2/+2
| |
| * let silly tests override version on local connectionsUbitUmarov2015-10-313-5/+6
| |
| * 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-315-50/+28
| |/ | | | | | | work. Will eat your babies. Yada. Yada.
| * set SOG.IsAttachment when doing a full check, so future gets see the right ↵UbitUmarov2015-10-251-1/+6
| | | | | | | | value
| * On to 0.8.3!Diva Canto2015-10-1813-13/+13
| |
| * 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-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.
| * 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.
| * 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.
| * | Typos in commentsDiva Canto2015-09-062-2/+2
| |/
* | 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-263-5/+31
| | | | | | | | (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
| |
* | 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
* | recover scripts execution time stat i lost on previus changes. Behing ↵UbitUmarov2015-10-212-5/+10
| | | | | | | | async, this will not add with other time stats giving total frame time, as happens on other simulators. But its a good diag stat.
* | update ubOde hashspaces levelsUbitUmarov2015-10-211-3/+3
| |
* | we do not have prims with size 2^128, missing fileUbitUmarov2015-10-211-11/+6
| |
* | fix or remove some wrong ODE configuration settingsUbitUmarov2015-10-211-34/+7
| |
* | remove the use of Vector3 for axis locks on the rest of enginesUbitUmarov2015-10-217-26/+13
| |
* | the inertia matrix inversions and body inertia changes to implement axis ↵UbitUmarov2015-10-211-288/+59
| | | | | | | | locks need to be avoid, so use ubOde axis locks code. Hopefully this will not cause incompatibilities
* | stop using a vector3 to store axis locks 3bit flags also in odeUbitUmarov2015-10-202-56/+47
| |
* | stop using a vector3 to store axis locks 3bit flags in ubOdeUbitUmarov2015-10-202-38/+46
| |
* | move ugly convertion of axis locks 3 bit flags to a wasted vector3 down to ↵UbitUmarov2015-10-202-21/+16
| | | | | | | | PhysicsActor. Let engines use LockAngularMotion with either Vector3 argument or byte
* | add axis locks to sop serializer. Now they are also saved to inventoryUbitUmarov2015-10-201-0/+8
| |
* | also apply axis locks, when creating a prim physics actorUbitUmarov2015-10-201-0/+14
| |
* | stop using a Vector3 to store 3bitsUbitUmarov2015-10-202-22/+57
| |
* | STATUS_ROTATE are linkset flags and not primUbitUmarov2015-10-202-18/+20
| |
* | On to 0.8.3!Diva Canto2015-10-1813-13/+13
| | | | | | | | | | Conflicts: OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/Properties/AssemblyInfo.cs
* | Added warning in RegionCombinerModule about it being considered obsolete and ↵Diva Canto2015-10-181-0/+2
| | | | | | | | encouraging people to switch to varregions.