aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into avinationmerge0.9.0Melanie Thielker2015-11-161-0/+7
|\ | | | | | | | | Conflicts: OpenSim/Framework/AvatarAppearance.cs
| * fix the protection for more Wearables than region suportsUbitUmarov2015-11-151-6/+9
| |
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2015-11-123-19/+70
| |\
| | * Add some values to the SimulatorFeatures cap's OpenSimExtras section ↵UbitUmarov2015-11-132-1/+42
| | | | | | | | | | | | relative to FPS statistics. This is transition code ported from avinationmerge.
| | * add the option Normalized55FPS. This is transition code ported from ↵UbitUmarov2015-11-132-18/+28
| | | | | | | | | | | | avinationmerge branch. (configration file changes will be commited later)
| * | fix cut points of UTF-8 stringsUbitUmarov2015-11-101-10/+28
| |/
| * Don't crash the sim if the map image is null.Diva Canto2015-11-011-1/+7
| |
* | handle diferente number of wearables on getting assets form another appearanceUbitUmarov2015-11-151-2/+10
| |
* | That didn't actually do anything for Simian, and it broke the locahostDiva Canto2015-11-141-5/+6
| | | | | | | | | | | | | | case Revert "Also restoring proper function for Simian external GetTexture functionality." This reverts commit 366e81b977e7fcad4b19aeedc6f3674612b7587b.
* | minor: reset character collision flags, even if without a BodyUbitUmarov2015-11-121-2/+6
| |
* | add some safeguard checksUbitUmarov2015-11-121-3/+4
| |
* | Add some values to the SimulatorFeatures cap's OpenSimExtras section:Melanie Thielker2015-11-121-0/+29
| | | | | | | | | | | | | | | | SimulatorFPS: The actual optimal FPS of the simulator, un-fudged SimulatorFPSFactor: The fudge factor that is applied to the stats sent to the viewer SimulatorFPSWarnPercent: The percentage below which a lag meter should go to amber SimulatorFPSCritPercent: The percentage below which a lag meter should go to red To display the real values, a viewer would divide the reported FPS by the SimulatorFPSFactor and use that to calculate the percentage of SimulatorFPS. E.g. reported is 55fps, SimulatorFPSFactor is 5.0 and SimulatorFPS is 11.
* | Move a call to RequestModuleInterface to a new scene callback functionMelanie Thielker2015-11-122-1/+11
| | | | | | | | because the current implementation would have always returned null
* | dont abort llDialog if buttons labels are longer than 24bytes, let udp ↵UbitUmarov2015-11-111-0/+2
| | | | | | | | truncate. This is not as spec but allows old scripts or with minor bugs to still work
* | limit llDialog buttons text to 24 bytes (at lludp level)UbitUmarov2015-11-111-1/+1
| |
* | reduce the small MTU violation sending terrain compressed patchsUbitUmarov2015-11-101-1/+1
| |
* | increase the number of packets in Land queue that force terrain to delay ↵UbitUmarov2015-11-101-1/+1
| | | | | | | | patchs sending.
* | check if a packet can be sent imediatly without accounting it as sent on ↵UbitUmarov2015-11-101-1/+3
| | | | | | | | throttles when it is enqueued for later send.
* | make m_minimumDripRate a bit larger than mtu. Add a bucket space check that ↵UbitUmarov2015-11-101-1/+6
| | | | | | | | does not consume avaiable space, so reducing bandwidth
* | 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
* | fix/add lldialog and llTextBox message size error checks, aborting if error ↵UbitUmarov2015-11-101-2/+11
| | | | | | | | as spec. (we can change this to silent truncate and execute the larger ones since llUdp now does it. But doing as spec now)
* | change lldialog and llTextBox maximum message lenght to 512 bytes as ↵UbitUmarov2015-11-101-3/+3
| | | | | | | | specification.
* | add a StringToBytes variant that takes Maximum lenght as argument.UbitUmarov2015-11-101-0/+50
| |
* | replace StatisticsFPSfactor that needed to be changed with FrameTime to a ↵UbitUmarov2015-11-092-166/+179
| | | | | | | | simpler true or false Normalized55FPS that is now TRUE by default. Incorrectly this commit also contains changes that should had their own commits: changes to heartbeat time control ant to gathering and calculation of related statistics.
* | rename MinFrameTime as FrameTime, since it is not a minimum but a target ↵UbitUmarov2015-11-083-22/+29
| | | | | | | | value; retune its value a bit so reported FPS is closer to integer value; change ode step size acording to reduce jitter in phys FPS; Make Statistics Scaling factor (fludge factor) configurable. (legacy default of 5.0 in code)
* | change maximum angular velocity to a value derived from heartbeat rate and ↵UbitUmarov2015-11-082-7/+11
| | | | | | | | Nyquist.
* | fix wrong condition to set low angular velocity as Zero.UbitUmarov2015-11-081-4/+4
| |
* | send the estimation of time dilation at packet build time, not the one at ↵UbitUmarov2015-11-061-10/+15
| | | | | | | | unknown past.
* | 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
* | add a console/log warning about large physics meshs on ubOde that can have ↵UbitUmarov2015-11-051-0/+6
| | | | | | | | negative impact on region load
* | fix get/set parameters on avatarsUbitUmarov2015-11-051-39/+38
| |
* | apply OtakuMegane code changes to irc channel chat so some characters are ↵UbitUmarov2015-11-021-1/+4
| | | | | | | | not lost
* | fix avatarAppearance wearables copyUbitUmarov2015-11-021-3/+8
| |
* | Add forgotten fileMelanie Thielker2015-11-021-0/+70
| |
* | Set wearables count to max legacy wearables for version < 0.4Melanie Thielker2015-11-021-0/+5
| |
* | Plumb the rest of the context stuff. Well, what I see so far anywayMelanie Thielker2015-11-024-6/+20
| |
* | 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-0110-50/+32
| | |
* | | More plumbing of the EntityTransferContext (not yet complete)Melanie Thielker2015-11-0122-88/+135
|/ /
* | Merge branch 'master' into avinationmergeUbitUmarov2015-11-012-0/+4
|\ \ | |/
| * Plumb the special VeriableWearablesSuported field which we willMelanie Thielker2015-11-012-0/+4
| | | | | | | | temporarily use to determine extended wearableness
* | fix more merge issuesUbitUmarov2015-11-011-5/+5
| |
* | fix merge issuesUbitUmarov2015-11-012-9/+9
| |
* | 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.