aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Still related to mantis #7917, parcel prims info. Now sending the correct ↵Diva Canto2016-06-191-1/+1
| | | | numbers for "Simulator primitive usage" related to the parcel owner, not the entire region.
* "reverting" the keep alive changes brought in from avination, to check if ↵Diva Canto2016-06-142-7/+2
| | | | that's what's making osgrid fail. This is not really reverting, it's more manually resetting some places (not all) where keep alive is set.
* Fix crash due to setting Thread.name after thread start.Roger Kirkman2016-05-121-2/+3
| | | | Signed-off-by: Diva Canto <diva@metaverseink.com>
* Apply user specified default perms across the board, to items uploaded as ↵Melanie Thielker2016-04-291-1/+1
| | | | | | | | well as items created and to rezzed prims in world. This effectively removes the concept of "default permissions" from OpenSim because all known modern viewers set the permissions flags on login. Ancient abandoned viewers will now default to the SL defaults.
* CR safari. Remove gratuitious CRs in some filesMelanie Thielker2016-04-071-173/+173
|
* Plumb RezRestoreToWorld from the client (part done)Melanie Thielker2016-03-091-0/+2
|
* Pushed AssemblyVersion up to VersionInfo, so that we don't need to do global ↵Diva Canto2016-02-217-6/+8
| | | | replace anymore.
* Add locking around stats record fetch to resolve Mantis 7793.Robert Adams2015-12-271-18/+21
|
* replace GetNearestPoint... funtionsUbitUmarov2015-12-151-0/+4
|
* calculate land startpoint, endpoint and center estimate when it is updated, ↵UbitUmarov2015-12-141-6/+9
| | | | it not every time they are needed
* change default landpoint type to anywhere (direct)UbitUmarov2015-12-131-1/+1
|
* minor cleanupUbitUmarov2015-12-091-17/+4
|
* coment out odd DoubleQueue class codeUbitUmarov2015-12-091-1/+2
|
* add default eyes to default wearables, and revert previus bad commitUbitUmarov2015-12-041-0/+6
|
* fix a 1m diference in regions view range estimationsUbitUmarov2015-12-031-1/+1
|
* minor: fix a log timing informationUbitUmarov2015-12-021-3/+0
|
* Change protocol version max to 0.6Melanie Thielker2015-12-011-2/+2
|
* Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2015-11-291-1/+3
|\
| * coment out warnings that do a messed around number of threadpool workitens ↵UbitUmarov2015-11-271-1/+3
| | | | | | | | and number of active threads ( at least when a pool is in use)
* | Trying to make http requests less slow, according to ↵Diva Canto2015-11-291-0/+2
|/ | | | http://stackoverflow.com/questions/2519655/httpwebrequest-is-extremely-slow
* revert last change to watchdog timeouts, that should not be neededUbitUmarov2015-11-271-26/+22
|
* change JobEngine stop code and add a extra check for thread removed on ↵UbitUmarov2015-11-272-83/+73
| | | | watchdog timeout checks
* suspend the use of DisableSimulator, that is causing teleport and crossing ↵UbitUmarov2015-11-251-1/+1
| | | | issues
* If no job engine is started at all, keep checking it's status fromMelanie Thielker2015-11-241-3/+2
| | | | bombing
* try not to use Process.HasExit that is broken in some mono versionsUbitUmarov2015-11-241-9/+12
|
* Flipped version to 0.9.0.0Diva Canto2015-11-231-1/+1
|
* Changes to LandObject/ILandObject to support importing OARs with different ↵Jak Daniels2015-11-221-2/+45
| | | | | | Region sizes to the destination region. Signed-off-by: UbitUmarov <ajlduarte@sapo.pt>
* work around some 'tests' error: normalization of <0,0,0> no longer causes ↵UbitUmarov2015-11-161-3/+4
| | | | argument exception, missed a few more
* work around some 'tests' error: normalization of <0,0,0> no longer causes ↵UbitUmarov2015-11-161-2/+2
| | | | argument exception
* Fix a merge conflictMelanie Thielker2015-11-161-7/+0
|
* 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
| |
| * fix cut points of UTF-8 stringsUbitUmarov2015-11-101-10/+28
| |
* | handle diferente number of wearables on getting assets form another appearanceUbitUmarov2015-11-151-2/+10
| |
* | add a StringToBytes variant that takes Maximum lenght as argument.UbitUmarov2015-11-101-0/+50
| |
* | fix avatarAppearance wearables copyUbitUmarov2015-11-021-3/+8
| |
* | Add forgotten fileMelanie Thielker2015-11-021-0/+70
| |
* | More EntityTransferContext plumbingMelanie Thielker2015-11-015-27/+21
| |
* | More plumbing of the EntityTransferContext (not yet complete)Melanie Thielker2015-11-015-34/+57
| |
* | Merge branch 'master' into avinationmergeUbitUmarov2015-11-012-4/+9
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Testing stage of the new versioning system. Use at own risk. May notMelanie Thielker2015-10-312-5/+10
| | | | | | | | work. Will eat your babies. Yada. Yada.
| * On to 0.8.3!Diva Canto2015-10-185-5/+5
| |
| * Clean up of simulation version, the number that rules the compatibility of ↵Diva Canto2015-10-182-11/+21
| | | | | | | | | | | | | | | | 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.
| * Make regions tolerant to newer regions with more werables.Melanie Thielker2015-09-142-3/+6
| | | | | | | | Also, bump the interface version to 8
* | fix cut points of UTF-8 stringsUbitUmarov2015-10-281-10/+28
| |
* | add basic SendFindAgent() to lludp. Future use may require a list of pairs ↵UbitUmarov2015-10-261-0/+2
| | | | | | | | (X,Y). For now one pair is good enough.
* | On to 0.8.3!Diva Canto2015-10-185-5/+5
| | | | | | | | | | Conflicts: OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/Properties/AssemblyInfo.cs
* | Fixed merge conflictsDiva Canto2015-10-182-11/+21
| | | | | | | | | | | | | | | | | | | | 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
* | change version stringUbitUmarov2015-09-281-2/+2
| |
* | add missing SendAgentGroupDataUpdate to llClientViewUbitUmarov2015-09-271-0/+1
| |