Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | add a console/log warning about large physics meshs on ubOde that can have ↵ | UbitUmarov | 2015-11-05 | 1 | -0/+6 |
| | | | | negative impact on region load | ||||
* | fix get/set parameters on avatars | UbitUmarov | 2015-11-05 | 1 | -39/+38 |
| | |||||
* | apply OtakuMegane code changes to irc channel chat so some characters are ↵ | UbitUmarov | 2015-11-02 | 1 | -1/+4 |
| | | | | not lost | ||||
* | fix avatarAppearance wearables copy | UbitUmarov | 2015-11-02 | 1 | -3/+8 |
| | |||||
* | Add forgotten file | Melanie Thielker | 2015-11-02 | 1 | -0/+70 |
| | |||||
* | Merge branch 'master' into avinationmerge | Melanie Thielker | 2015-11-02 | 0 | -0/+0 |
|\ | |||||
| * | Don't crash the sim if the map image is null. | Diva Canto | 2015-11-01 | 1 | -1/+7 |
| | | |||||
* | | Set wearables count to max legacy wearables for version < 0.4 | Melanie Thielker | 2015-11-02 | 1 | -0/+5 |
| | | |||||
* | | Plumb the rest of the context stuff. Well, what I see so far anyway | Melanie Thielker | 2015-11-02 | 4 | -6/+20 |
| | | |||||
* | | Merge branch 'avinationmerge' of opensimulator.org:/var/git/opensim into ↵ | Melanie Thielker | 2015-11-01 | 1 | -1/+7 |
|\ \ | | | | | | | | | | avinationmerge | ||||
| * | | Don't crash the sim if the map image is null. | Diva Canto | 2015-11-01 | 1 | -1/+7 |
| | | | |||||
* | | | More EntityTransferContext plumbing | Melanie Thielker | 2015-11-01 | 10 | -50/+32 |
| | | | |||||
* | | | More plumbing of the EntityTransferContext (not yet complete) | Melanie Thielker | 2015-11-01 | 22 | -88/+135 |
|/ / | |||||
* | | Merge branch 'master' into avinationmerge | UbitUmarov | 2015-11-01 | 2 | -0/+4 |
|\ \ | |/ | |||||
| * | Plumb the special VeriableWearablesSuported field which we will | Melanie Thielker | 2015-11-01 | 2 | -0/+4 |
| | | | | | | | | temporarily use to determine extended wearableness | ||||
* | | fix more merge issues | UbitUmarov | 2015-11-01 | 1 | -5/+5 |
| | | |||||
* | | fix merge issues | UbitUmarov | 2015-11-01 | 2 | -9/+9 |
| | | |||||
* | | Merge branch 'master' into avinationmerge | UbitUmarov | 2015-11-01 | 21 | -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 Thielker | 2015-11-01 | 1 | -1/+1 |
| | | |||||
| * | Remove an unneeded code path, it could never be reached. Ubit caught it | Melanie Thielker | 2015-11-01 | 1 | -12/+0 |
| | | | | | | | | :) | ||||
| * | This is the replacement fix for large regions and string version. | Melanie Thielker | 2015-11-01 | 1 | -0/+6 |
| | | |||||
| * | Revert "fix transfer protocol version in string format. These are not | Melanie Thielker | 2015-11-01 | 1 | -17/+5 |
| | | | | | | | | | | | | fixes you are looking for..... (Jedi mind trick) This reverts commit 19e5667451dc763eb90a78533c4fe7f51c49f9a0. | ||||
| * | fix typo reported on mantis 7735 | UbitUmarov | 2015-10-31 | 1 | -1/+1 |
| | | |||||
| * | fix internal support for non square regions | UbitUmarov | 2015-10-31 | 1 | -2/+3 |
| | | |||||
| * | fix transfer protocol version in string format. Let that case have tests ↵ | UbitUmarov | 2015-10-31 | 1 | -5/+17 |
| | | | | | | | | identical to new format (this still isnt for your babies keep them safe...) | ||||
| * | Introduce an EntityTransferContext carrying the version numbers to pass | Melanie Thielker | 2015-10-31 | 10 | -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 no | Melanie Thielker | 2015-10-31 | 3 | -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 in | Melanie Thielker | 2015-10-31 | 2 | -28/+23 |
| | | | | | | | | transfers | ||||
| * | fix mantis 7734, Thanks Garmin for the report | UbitUmarov | 2015-10-31 | 1 | -2/+2 |
| | | |||||
| * | simplify new regions protocol version control. (May not work, and babies ↵ | UbitUmarov | 2015-10-31 | 2 | -29/+43 |
| | | | | | | | | safety warnings still valid | ||||
| * | let silly tests override version on local connections | UbitUmarov | 2015-10-31 | 3 | -5/+6 |
| | | |||||
| * | fix teleport to to string version regions | UbitUmarov | 2015-10-31 | 1 | -1/+1 |
| | | |||||
| * | Merge branch 'master' of opensimulator.org:/var/git/opensim | Melanie Thielker | 2015-10-31 | 2 | -9/+6 |
| |\ | |||||
| | * | fix mantis 7733, reverting setting of IsAttachment on first call to full ↵ | UbitUmarov | 2015-10-29 | 2 | -9/+6 |
| | | | | | | | | | | | | check. Replace instead same simple IsAttachment tests by full checks | ||||
| * | | Testing stage of the new versioning system. Use at own risk. May not | Melanie Thielker | 2015-10-31 | 12 | -79/+161 |
| |/ | | | | | | | work. Will eat your babies. Yada. Yada. | ||||
| * | fix services handling of visualparameters, avoiding possible crashs (mantis ↵ | UbitUmarov | 2015-10-27 | 1 | -5/+20 |
| | | | | | | | | 7732) partially appling code from avinationmerge | ||||
| * | set SOG.IsAttachment when doing a full check, so future gets see the right ↵ | UbitUmarov | 2015-10-25 | 1 | -1/+6 |
| | | | | | | | | value | ||||
| * | Removed invalid dependencies from prebuild (those dlls no longer exist) | Diva Canto | 2015-10-22 | 1 | -2/+0 |
| | | |||||
| * | Mark XAssetService obsolete and warn users. | Diva Canto | 2015-10-21 | 1 | -0/+2 |
| | | |||||
| * | Fix an issue introduced in 70a46fe0907c822a5244e36c338bf559ffbec965. I ↵ | Diva Canto | 2015-10-21 | 1 | -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 extra | Melanie Thielker | 2015-10-20 | 1 | -0/+1 |
| | | | | | | | | wearables | ||||
| * | On to 0.8.3! | Diva Canto | 2015-10-18 | 44 | -44/+44 |
| | | |||||
| * | Added warning in RegionCombinerModule about it being considered obsolete and ↵ | Diva Canto | 2015-10-18 | 1 | -0/+2 |
| | | | | | | | | encouraging people to switch to varregions. | ||||
| * | Clean up of simulation version, the number that rules the compatibility of ↵ | Diva Canto | 2015-10-18 | 9 | -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 Canto | 2015-10-18 | 1 | -1/+18 |
| | | | | | | | | bug. I think I fixed it. | ||||
| * | fix GetTerrainHeightAtXY also on master. Fix wrong active angularlock ↵ | UbitUmarov | 2015-10-17 | 2 | -281/+9 |
| | | | | | | | | detection (it was only burning cpu), stop trying to add a amotor to each child part and fix a typo. | ||||
| * | my first commit | UbitUmarov | 2015-09-14 | 1 | -0/+1 |
| | | |||||
| * | Change the actual versions allowed to connect, which is different from | Melanie Thielker | 2015-09-14 | 1 | -4/+4 |
| | | | | | | | | the interface major version | ||||
| * | Make regions tolerant to newer regions with more werables. | Melanie Thielker | 2015-09-14 | 2 | -3/+6 |
| | | | | | | | | Also, bump the interface version to 8 | ||||
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2015-09-11 | 1 | -12/+8 |
| |\ |