aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-09-206-2/+1
| |\ \
| | * | Make ResendAppearanceUpdates = true by default in [Appearance] in ↵Justin Clark-Casey (justincc)2012-09-201-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | OpenSimDefaults.ini. This resends appearance uuids to avatars in the scene once a minute. I have seen this help in the past resolve grey appearance problems where viewers have for unknown reasons sometimes ignored the packet. The overhead is very small since only the UUIDs are sent - the viewer then requests the texture only if it does not have it cached. This setting will not help with cloudy avatars which are usually due to the viewer not uploading baked texture data or uploading something that isn't valid JPEG2000
| | * | Update libopenjpeg libraries used by libopenmetaverse back up to 1.5, this ↵Justin Clark-Casey (justincc)2012-09-205-0/+0
| | | | | | | | | | | | | | | | time using lkalif's linux libraries built against a much earlier libc (2.7)
| * | | More HG2.0: Added permission policies in HGAsset Service based on asset ↵Diva Canto2012-09-202-0/+21
| |/ / | | | | | | | | | types. The policies are given in the config. This is only half of the story. The other half, pertaining to exports/imports made by the sim, will be done next.
| * | Downgrade libopenjpeg back to 1.3 from 1.5.Justin Clark-Casey (justincc)2012-09-195-0/+0
| | | | | | | | | | | | | | | This is because libopenjpeg 1.5 appears to require a minimum of glibc 2.14, whereas at least one fairly recent distro (openSUSE 11.4 from 2011-03-10) only has glibc Further investigation pending.
| * | Add openmetaverse_data from libopenmetaverse to allow testing of texture ↵Justin Clark-Casey (justincc)2012-09-1860-0/+12308
| | | | | | | | | | | | baking via bot rather than just throwing out errors
| * | Update libopenmetaverse components to commit f5cecaajustincc2012-09-1815-5/+3
| | | | | | | | | | | | | | | | | | | | | Among other things this allows pCampbot to work under Windows since libopenmateverse now ships the same log4net.dll (publicly signed) as OpenSimulator This also updates the libopenmetaverse embedded libopenjpeg from 1.3 to 1.5. DLL naming and mapping for non-Windows libopenjpeg changes to remove version number to make future udpates easier and bring it into line with names of other shipped DLLs. libopenjpeg updates have been made for OSX, Windows (32 and 64 bit) and Linux (32 and 64 bit). Please report any issues.
| * | Cleanup from prev. commitBlueWall2012-09-181-2/+2
| | | | | | | | | | | | Make correct defaults to Phys/nonPhys prims to fix errors in prev. commit
| * | Fix some inconsistencies in configurartion: NonPhys primsBlueWall2012-09-182-6/+6
| | | | | | | | | | | | | | | | | | Fix inconsistencies between configuration parameter names and their description names. Changing the configuration parameters for non physical prim size min-max from Nonphys* to NonPhys*. Please update your OpenSim.ini and Regions.ini to reflect these changes.
* | | Merge branch 'master' into careminsterMelanie2012-09-168-14/+8
|\ \ \ | |/ / | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs OpenSim/Region/Framework/Scenes/EventManager.cs
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-09-155-7/+0
| |\ \
| | * | BulletSim: update DLLs and SOs and remove some debugging code.Robert Adams2012-09-154-0/+0
| | | |
| | * | For FlotsamAssetCache, always update access times of cached scene assets ↵Justin Clark-Casey (justincc)2012-09-151-7/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | before looking for files to expire. This is to resolve a problem where an asset marked as local but not temporary but still used in the scene would be removed. The timed expiry scan no longer tries to refetch assets from the scene that are not currently in the cache - this is not helpful since it just drags a lot of data into the cache that may never be referenced. This removes the DeepScanBeforePurge option since setting this to false will introduce the above problem. This previously had a default of true.
| * | | More on HG2.0: added the possibility of controlling the appearance that ↵Diva Canto2012-09-151-0/+1
| |/ / | | | | | | | | | avies use to visit other grids. Not as good as I wanted, but good enough. Unfortunately we can't switch the appearance from under the avie without getting into a lot of weirdnesses because appearance is viewer-controlled. So instead, when this control is on, I'm disallowing HG-TP unless the user is wearing an allowed HG appearance -- the user gets a warning and needs to switch appearance. WARNING: I'm still not committing the config vars because this is still not ready for ppl to test.
| * | Fix indentation and issues where tabs were used instead of spaces in commit ↵Justin Clark-Casey (justincc)2012-09-122-7/+7
| | | | | | | | | | | | 783ee949
* | | Merge branch 'master' into careminsterMelanie2012-09-096-0/+9
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * | implementing per-region configuration of limits on the number of prims one ↵SignpostMarv2012-09-092-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | can have in a linkset Applied with changes - patch was based on a repo different from core Signed-off-by: Melanie <melanie@t-data.com>
| * | BulletSim: update the DLLs and SOsRobert Adams2012-09-074-0/+0
| | |
* | | Merge branch 'master' into careminsterMelanie2012-09-073-2/+17
|\ \ \ | |/ / | | | | | | | | | | | | Conflicts: OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs OpenSim/Framework/Servers/VersionInfo.cs
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-09-071-0/+7
| |\ \
| | * | If reusing dynamic textures, do not reuse small data length textures that ↵Justin Clark-Casey (justincc)2012-09-061-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fall below current viewer discard level 2 thresholds. Viewer LL 3.3.4 and before sometimes fail to properly redisplay dynamic textures that have a small data length compared to pixel size when pulled from cache. This appears to happen when the data length is smaller than the estimate discard level 2 size the viewer uses when making this GetTexture request. This commit works around this by always regenerating dynamic textures that fall below this threshold rather than reusing them if ReuseDynamicTextures = true This can be controlled by the [Textures] ReuseDynamicLowDataTextures config setting which defaults to false.
| * | | Moved the new vars in Robust.HG.ini to the proper section.Diva Canto2012-09-071-5/+6
| |/ /
| * | Added missing configs, and deleted the [Profile] part on the Hypergrind config.Diva Canto2012-09-062-2/+9
| | |
* | | Merge branch 'master' into careminsterMelanie2012-09-027-5827/+0
|\ \ \ | |/ /
| * | BulletSim: update the SOs and DLLsRobert Adams2012-08-314-0/+0
| | |
| * | Remove the unused Newtonsoft.Json dllsMic Bowman2012-08-313-5827/+0
| | | | | | | | | | | | Also remove the license files
* | | Merge branch 'master' into careminsterMelanie2012-08-311-0/+11
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
| * | Make ReuseDynamicTextures an experimental config setting in [Textures]. ↵Justin Clark-Casey (justincc)2012-08-301-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Default is false, as before. If true, this setting reuses dynamically generated textures (i.e. created through osSetDynamicTextureData() and similar OSSL functions) where possible rather than always regenerating them. This results in much quicker updates viewer-side but may bloat the asset cache (though this is fixable). Also, sometimes issue have been seen where dynamic textures do not transfer to the viewer properly (permanently blurry). If this happens and that flag is set then they are not regenerated, the viewer has to clear cache or wait for 24 hours before all cached uuids are invalidated. CUrrently experimental. Default is false, as before.
* | | Merge branch 'master' into careminsterMelanie2012-08-241-0/+10
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
| * | Add an [HGAssetService] section to SQLiteStandalone.ini with the same ↵Justin Clark-Casey (justincc)2012-08-231-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | connection string as [AssetService]. This is necessary because commit 8131a24 (Tue Mar 27 10:08:13 2012) started passing the config section name rather than hardcoding "AssetService" This meant that the HG external-facing asset service tried to read ConnectionString from [HGAssetService] rather than [AssetService]. On SQLite, not finding this meant that it fell back to [DatabaseService], which is set for OpenSim.db rather than Asset.db. Therefore, all external asset requests returned null. Solution taken here is to create an [HGAssetService] section with the same ConnectionString as [AssetService]. This bug does not affect normal MySQL/MSSQL config since they use the [DatabaseService] connection string anyway. Addresses http://opensimulator.org/mantis/view.php?id=6200, many thanks to DanBanner for identifying the exact problem commit which was very helpful. This was a regression from OpenSimulator 0.7.3.1 which did not contain this bug.
* | | Merge branch 'master' into careminsterMelanie2012-08-234-0/+0
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/IClientAPI.cs OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * | BulletSim: update DLLs and SOs to eliminate terrain update crash which ↵Robert Adams2012-08-214-0/+0
| | | | | | | | | | | | manifested itself on Linux.
* | | Merge branch 'master' into careminsterMelanie2012-08-186-1/+14
|\ \ \ | |/ / | | / | |/ |/| | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
| * Add information to ThreadStackSize about possibly increasing if suffering ↵Justin Clark-Casey (justincc)2012-08-171-1/+3
| | | | | | | | StackOverflowExceptions during script conversion/compilation (e.g. on Windows 64-bit)
| * BulletSim: add parameters and functionality to specify the meshRobert Adams2012-08-171-0/+3
| | | | | | | | | | | | level of detail for large meshes. Remove parameter and code for DetailLog (conditional logging into regular log file).
| * BulletSim: update DLLs and SOs to fix the problem with avatars jumping ↵Robert Adams2012-08-154-0/+0
| | | | | | | | around at altitudes less than 25m.
| * enables configurable minimum sizes for physical & non-physical primsSignpostMarv2012-08-151-0/+8
| |
* | Merge branch 'master' into careminsterMelanie2012-08-165-12/+17
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * BulletSim: update DLLs and SOsRobert Adams2012-08-154-0/+0
| |
| * BulletSim: add physics logging parameters to OpenSimDefaults.ini. Remove ↵Robert Adams2012-08-151-12/+17
| | | | | | | | trailing semis from some the of the value definitions.
* | Merge branch 'careminster' into avinationMelanie2012-08-145-21/+23
|\ \ | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs
| * \ Merge branch 'master' into careminsterMelanie2012-08-115-1/+1
| |\ \ | | |/
| | * Merge branch 'bulletsim7'Robert Adams2012-08-101-1/+1
| | |\
| | | * BulletSim: add avatar code to keep avatars from ending up trapped under the ↵Robert Adams2012-08-081-1/+1
| | | | | | | | | | | | | | | | terrain
| | * | BulletSim: actually update the DLLs and SOsRobert Adams2012-08-104-0/+0
| | |/
| * | Merge branch 'master' into careminsterMelanie2012-08-094-0/+0
| |\ \ | | |/
| | * BulletSim: Added avatar capsule scaling for size of avatar.Robert Adams2012-08-074-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | This also fixes computation of avatar mass. Added parameter MaxPersistantManifoldPoolSize. Fixed a parameter setting bug which caused crashes of there were more than 400 or so physical objects. I tested up to 5000. Updated BulletSim DLLs and SOs.
| * | Merge branch 'master' into careminsterMelanie2012-08-074-0/+0
| |\ \ | | |/
| | * BulletSim: update SOs and DLLs to run on more Linux versions. Correct ↵Robert Adams2012-08-064-0/+0
| | | | | | | | | | | | multiple buoyancy settings when character flying. Remove chatty log message on prim destruction.
| * | Merge branch 'master' into careminsterMelanie2012-08-045-20/+22
| |\ \ | | |/ | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs