aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'avination-current' into careminsterMelanie2013-06-061-0/+7
|\ | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs OpenSim/Region/Framework/Interfaces/IDynamicMenuModule.cs OpenSim/Region/OptionalModules/ViewerSupport/DynamicMenuModule.cs OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
| * Update HTTP serverMelanie2013-06-041-0/+0
| |
| * Add the enter uuid dialogMelanie2013-04-221-0/+7
| |
* | Merge branch 'master' into careminsterMelanie2013-06-047-34/+83
|\ \ | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs
| * | New HttpServer_OpenSim.dll with increased limits on number of connections, ↵Diva Canto2013-06-041-0/+0
| | | | | | | | | | | | requests, etc.
| * | Adding back the BasicProfileModuleBlueWall2013-05-311-2/+2
| | |
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimRobert Adams2013-05-306-2/+58
| |\ \
| | * | UserProfilesBlueWall2013-05-306-2/+58
| | | | | | | | | | | | | | | | UserProfiles for Robust and Standalone. Includes service and connectors for Robust and standalone opensim plus matching region module.
| * | | BulletSim: remove unuseful BulletSim parameters from OpenSimDefaults.ini andRobert Adams2013-05-301-32/+25
| |/ / | | | | | | | | | replace with things someone might actually want to tune (avatar height, ...).
* | | Merge branch 'master' into careminsterMelanie2013-05-304-0/+0
|\ \ \ | |/ / | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs
| * | BulletSim: enable GImpact shape for prims with cuts. Include DLLs and SOsRobert Adams2013-05-264-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | which recompute GImpact shape bounding box after creation as Bullet doesn't do that itself (something it does for nearly every other shape). Now, physical prims without cuts become single mesh convex meshes. Physical prims with cuts become GImpact meshes. Meshes become a set of convex hulls approximated from the mesh unless the hulls are specified in the mesh asset data. The use of GImpact shapes should make some mechanical physics more stable.
* | | Merge branch 'master' into careminsterMelanie2013-05-244-0/+0
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * | BulletSim: update DLLs and SOs with version containing gImpact code.Robert Adams2013-05-214-0/+0
| | |
* | | Merge branch 'master' into careminsterMelanie2013-05-168-12012/+11955
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
| * | Updated libopenmetaverse to a5ad7f200e9bd2e91604ba921d1db3768108686bLatif Khalifa2013-05-167-11955/+11955
| | |
| * | Removed obsolete libopenmetaverse fileLatif Khalifa2013-05-161-57/+0
| | |
* | | Merge branch 'master' into careminsterMelanie2013-05-112-0/+12
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Services/LLLoginService/LLLoginResponse.cs OpenSim/Services/LLLoginService/LLLoginService.cs OpenSim/Tests/Common/Mock/TestClient.cs
| * | Application support:BlueWall2013-05-092-0/+12
| | | | | | | | | | | | Adding some viwer supported url settings for destination guide and avatar picker apps. URL for the destinations should be: "secondlife:///app/teleport/slurl"
* | | Merge branch 'master' into careminsterMelanie2013-05-081-0/+3
|\ \ \ | |/ / | | | | | | | | | | | | Conflicts: OpenSim/Framework/IClientAPI.cs OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
| * | Adds an event and a method so that handling of the CachedTextureMic Bowman2013-05-081-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | packet can be pulled out of LLClientView and moved to AvatarFactory. The first pass at reusing textures (turned off by default) is included. When reusing textures, if the baked textures from a previous login are still in the asset service (which generally means that they are in the simulator's cache) then the avatar will not need to rebake. This is both a performance improvement (specifically that an avatars baked textures do not need to be sent to other users who have the old textures cached) and a resource improvement (don't have to deal with duplicate bakes in the asset service cache).
* | | Merge branch 'master' into careminsterMelanie2013-05-082-2/+7
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
| * | Delete "" entry for AvatarPicker cap.Diva Canto2013-05-071-1/+0
| | |
| * | Added AvatarPickerSearch capability handler.Diva Canto2013-05-072-1/+7
| | |
* | | Merge branch 'master' into careminsterMelanie2013-05-042-2/+2
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Application/OpenSimBase.cs OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
| * | Make default config directory "."BlueWall2013-05-012-2/+2
| | |
* | | Merge branch 'master' into careminsterMelanie2013-05-012-25/+30
|\ \ \ | |/ / | | | | | | | | | Conflicts: ThirdParty/SmartThreadPool/SmartThreadPool.cs
| * | Add information about creating a PID file for robust to the Robust.ini and ↵Justin Clark-Casey (justincc)2013-05-012-25/+30
| | | | | | | | | | | | Robust.HG.ini example files
* | | Merge branch 'master' into careminsterMelanie2013-04-255-0/+0
|\ \ \ | |/ /
| * | BulletSim: version of libBulletSim.so for 32 bit systems that doesn'tRobert Adams2013-04-241-0/+0
| | | | | | | | | | | | crash on startup. Doesn't yet solve the new glibcxx dependencies.
| * | BulletSim: update DLLs and SOs to they have no dependencies on newerRobert Adams2013-04-244-0/+0
| | | | | | | | | | | | | | | glibc (2.14) since that is not yet in some Linux distributions. Add unmanaged API calls and code for creating single convex hull shapes.
| * | revert CSJ2K.dll to version in use prior to commit ↵dahlia2013-04-231-0/+0
| | | | | | | | | | | | d4fa2c69ed2895dcab76e0df1b26252246883c07
* | | Merge branch 'master' into careminsterMelanie2013-04-222-9/+10
|\ \ \ | |/ /
| * | Clean up unused config and config comments.Diva Canto2013-04-212-9/+10
| | |
* | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminsterMelanie2013-04-2219-18164/+17817
|\ \ \
| * \ \ Merge branch 'master' into careminsterMelanie2013-04-2112-18164/+17810
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs bin/OpenMetaverse.StructuredData.XML bin/OpenMetaverse.XML bin/OpenMetaverseTypes.XML
| | * | Fix spellingBlueWall2013-04-201-2/+2
| | | |
| | * | update libomv to git master which adds support for MaterialID in TextureEntrydahlia2013-04-1711-15459/+16598
| | | |
| * | | Merge branch 'master' into careminsterMelanie2013-04-107-0/+7
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLAssetData.cs OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
| | * | BulletSim: add Bullet HACD library invocation. Turned off by default as notRobert Adams2013-04-094-0/+0
| | | | | | | | | | | | | | | | totally debugged. Updated DLLs and SOs with more debugged HACD library code.
| | * | Add more notes to async_call_method relating to UnsafeQueueUserWorkItemJustin Clark-Casey (justincc)2013-04-091-0/+5
| | | | | | | | | | | | | | | | | | | | UnsafeQueueUserWorkItem is so called because it allows the calling code to escalate its security privileges. However, since we must already trust this code anyway in OpenSimulator this is not an issue.
| | * | BulletSim: Add dylib for BulletSim and add he who figured out building BulletSimRobert Adams2013-04-081-0/+0
| | | | | | | | | | | | | | | | on a Mac to the CONTRIBUTORS file.
| | * | fixed bullet config for osxJon Cundill2013-04-081-0/+2
| | | | | | | | | | | | | | | | Signed-off-by: Robert Adams <Robert.Adams@intel.com>
* | | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminsterMelanie2013-04-224-0/+0
|\ \ \ \ | |/ / / | | | / | |_|/ |/| |
| * | Merge branch 'master' into careminsterMelanie2013-04-024-0/+0
| |\ \ | | |/ | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
| | * BulletSim: update unmanaged API for HACD parameter passing. Bullet HACDRobert Adams2013-04-014-0/+0
| | | | | | | | | | | | | | | mesh to hull conversion calls in place but code not working. Update BulletSim DLLs and SOs for new API and HACD code.
* | | Add the set object owner floater templateMelanie2013-04-221-0/+8
|/ /
* | Merge commit '464201b41d5f5fdd7c88ab5e95dd7b6fbae6d766' into careminsterMelanie2013-03-193-0/+121
|\ \ | |/
| * *Yet another HTTPServer update code changes in OpenSim Libs. * This fixes a ↵teravus2013-03-163-0/+121
| | | | | | | | connection close issue by getting rid of the socket references * This adds a connection timeout checker to shutdown poor or evil connections and combats DOS attempts that just connect and make no complete requests and just wait. It also actually implements KeepAlive... instead of just understanding the connection header in the request... you can test by connecting and requesting a keepalive header and sending another request on the same connection. The new timeout checker closes expired keepalive sessions, just make sure you send the request within 70 seconds of connecting or the timeout checker will timeout the connection.
* | Merge branch 'master' into careminsterMelanie2013-03-142-0/+0
|\ \ | |/ | | | | | | | | | | 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' of ssh://opensim/var/git/opensimteravus2013-03-142-0/+12
| |\
generated by cgit v1.1 at 2024-08-21 16:27:01 +0000