aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Util.cs (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Remove the last instance of the legacy slam but being setMelanie Thielker2017-01-161-0/+8
| | | | New objects now get only the real slam bit.
* use of PermissionMask Bit3 for slam was a recent mistake, so make it only ↵UbitUmarov2017-01-151-3/+3
| | | | bit4 and move folded export to its more natural place as bit3
* oops fix FolderMask acordingUbitUmarov2017-01-141-1/+1
|
* make the Slam bit actually be the two previus used ones, to try to minimize ↵UbitUmarov2017-01-141-2/+2
| | | | compatibilty issues
* fix incoerent definition of Slam bit (bits 3 and 4 used in diferentUbitUmarov2017-01-141-2/+3
| | | | | places.) this may still be wrong on other places; Do not loose folded permitions, WARNING MASTER IS NOW UNSTABLE. permissions are still broken"
* Harmonize case in Permissions enumMelanie Thielker2017-01-131-4/+5
|
* Massive tab and trailing space cleanupMelanie Thielker2017-01-051-43/+43
|
* check if a parcelID is a encoded position data or a true UUID. This may ↵UbitUmarov2016-12-231-1/+5
| | | | fail, just reducing the odds.
* and yes HG uri againUbitUmarov2016-12-161-0/+20
|
* ok.. another try on the HG uriUbitUmarov2016-12-161-0/+114
|
* Fix OpenSim bombing when a MySQL connection string doesn't contain a password.Melanie Thielker2016-12-101-0/+2
| | | | | Passwordless connection is perfectly legal and makes sense within a container.
* try to make mono happyUbitUmarov2016-08-221-3/+3
|
* workaround potencial memory leakUbitUmarov2016-08-221-1/+3
|
* add a missing cast to ulong in RegionGridLocToHandle (mantis: 7994)UbitUmarov2016-08-131-1/+2
|
* rearrange handlers convertion math, harcoding the grid unit size of 256m, ↵UbitUmarov2016-07-311-17/+17
| | | | also inviting jit to use cpu barrel shifters.
* rename a few things to reduce confusion between regions wold location and ↵UbitUmarov2016-07-311-3/+5
| | | | grid location (a lot more elsewhere)
* Fixed the order of two file names used in a warning.Kevin Cozens2016-07-081-1/+1
|
* coment out odd DoubleQueue class codeUbitUmarov2015-12-091-1/+2
|
* fix a 1m diference in regions view range estimationsUbitUmarov2015-12-031-1/+1
|
* 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)
* suspend the use of DisableSimulator, that is causing teleport and crossing ↵UbitUmarov2015-11-251-1/+1
| | | | issues
* add a StringToBytes variant that takes Maximum lenght as argument.UbitUmarov2015-11-101-0/+50
|
* fix cut points of UTF-8 stringsUbitUmarov2015-10-281-10/+28
|
* add a GetTimeStampMS method, this returns a time stamp in miliSeconds with ↵UbitUmarov2015-09-041-0/+11
| | | | the resolution avaiable for StopWatchs. Value in double since it can be large (as machine uptime in high resolution ticks)
* seems to compile ( tests comented out)UbitUmarov2015-09-021-68/+0
|
* bad merge?UbitUmarov2015-09-011-31/+222
|\
| * more on tps and crossingsUbitUmarov2015-08-301-7/+16
| |
| * on util thread pool reduce the min number of threads, increase theUbitUmarov2014-10-131-1/+1
| | | | | | | | maximum and increase the idle time before release to OS
| * fix the damm thingUbitUmarov2014-08-121-6/+13
| |
| * Merge branch 'master' into careminsterMelanie2014-01-281-1/+1
| |\ | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/RegionSettings.cs OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs OpenSim/Region/Framework/Interfaces/IInterregionComms.cs OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs
| | * Fix casting error for float type INI file parameter parsing.Robert Adams2014-01-191-1/+1
| | |
| * | Merge branch 'master' into careminsterMelanie2014-01-281-1/+3
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * | Intermediate commit. Sill errors.Melanie2014-01-051-0/+43
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' into careminster Conflicts: OpenSim/Data/SQLite/SQLiteUserProfilesData.cs OpenSim/Framework/RegionInfo.cs OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueHelper.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs OpenSim/Services/UserProfilesService/UserProfilesService.cs
| * \ \ Merge branch 'master' into careminsterMelanie2013-09-071-7/+5
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * \ \ \ Merge branch 'master' into careminsterMelanie2013-08-111-2/+2
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Application/OpenSimBase.cs OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * \ \ \ \ Merge branch 'master' into careminsterMelanie2013-07-241-5/+7
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
| * \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-07-181-1/+6
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs OpenSim/Server/Handlers/Simulation/AgentHandlers.cs OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs OpenSim/Services/HypergridService/UserAgentService.cs
| * \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-06-231-63/+41
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Monitoring/BaseStatsCollector.cs OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
| * \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-05-241-1/+1
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-05-011-10/+10
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ThirdParty/SmartThreadPool/SmartThreadPool.cs
| * | | | | | | | | | Phase 1 of implementing a transfer permission. Overwrite libOMV's PermissionMaskMelanie2013-03-241-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | with our own and add export permissions as well as a new definition for "All" as meaning "all conventional permissions" rather than "all possible permissions"
| * | | | | | | | | | Merge branch 'master' into careminsterMelanie2013-03-141-1/+1
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-02-261-6/+21
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-02-231-0/+38
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-02-221-1/+21
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'avination' into careminsterMelanie2013-02-071-0/+108
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | Move SoubleQueu to Util. Change HTTP inv to prioritize COF. Determine COF for SPMelanie2013-02-061-0/+108
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge branch 'master' into careminsterMelanie2013-02-071-1/+15
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-01-231-2/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/Physics/BulletSNPlugin/BSShapeCollection.cs
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-01-181-0/+12
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
generated by cgit v1.1 at 2024-11-20 05:42:25 +0000