| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' into careminster | Melanie | 2013-02-22 | 1 | -1/+1 |
| |\ | |||||
| | * | Deleted all AssemblyFileVersion directives | Diva Canto | 2013-02-19 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'master' into careminster | Melanie | 2013-02-10 | 1 | -1/+1 |
| |\ \ | |/ | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Data/MySQL/Resources/RegionStore.migrations | ||||
| | * | Fixed check for 0 results in GetUserAccounts() | Oren Hurvitz | 2013-02-09 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'master' into careminster | Melanie | 2013-02-05 | 1 | -1/+1 |
| |\ \ | |/ | | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Framework/Servers/VersionInfo.cs OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | ||||
| | * | Bump version and assembly version numbers from 0.7.5 to 0.7.6 | Justin Clark-Casey (justincc) | 2013-02-05 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | This is mostly Bluewall's work but I am also bumping the general version number OpenSimulator 0.7.5 remains in the release candidate stage. I'm doing this because master is significantly adding things that will not be in 0.7.5 This update should not cause issues with existing external binary DLLs because our DLLs do not have strong names and so the exact version match requirement is not in force. | ||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-12-09 | 1 | -1/+1 |
| |\ \ | |/ | |||||
| | * | Trying to prevent old route of sending attachments, simulator version ↵ | Diva Canto | 2012-12-06 | 1 | -1/+1 |
| | | | | | | | | | unknown maybe due to timeout. mantis #6450 | ||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-11-17 | 2 | -1/+33 |
| |\ \ | |/ | |||||
| | * | Remove unnecessary ability to directly set InventoryItemBase.CreatorIdAsUuid | Justin Clark-Casey (justincc) | 2012-11-17 | 1 | -1/+0 |
| | | | | | | | | | | | This was necessary historically but hasn't been for many years. Can still get CreatorIdAsUuid, which is really just a UUID cached version of the string CreatorId | ||||
| | * | The last few AssemblyInfos. Finished! | Diva Canto | 2012-11-14 | 1 | -0/+33 |
| | | | |||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-11-13 | 7 | -7/+7 |
| |\ \ | |/ | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs OpenSim/Region/ClientStack/Linden/Caps/NewFileAgentInventoryVariablePriceModule.cs | ||||
| | * | Cleanup on region modules: gave short node id's to all of them. | Diva Canto | 2012-11-12 | 7 | -7/+7 |
| | | | |||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-11-09 | 1 | -1/+1 |
| |\ \ | |/ | |||||
| | * | HG: Hopefully this fixes the issues with port 80 once and for all. | Diva Canto | 2012-11-07 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'avination' into careminster | Melanie | 2012-11-04 | 1 | -4/+4 |
| |\ \ | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs | ||||
| | * | | Squash reporting HelloNeighbor exception - it simply means the other sim | Melanie | 2012-11-02 | 1 | -4/+4 |
| | | | | | | | | | | | | | is down, no need for yellow ink. | ||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-10-20 | 1 | -2/+2 |
| |\ \ \ | | |/ | |/| | |||||
| | * | | Improve efficiency of friends notification by only make one PresenceService ↵ | Justin Clark-Casey (justincc) | 2012-10-20 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | call for all friends rather than one for each friend. However, large groups could still take a very long time since we still need to message each avatar on different simulators. | ||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-10-16 | 1 | -1/+1 |
| |\ \ \ | |/ / | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Services/Connectors/Friends/FriendsSimConnector.cs | ||||
| | * | | minor: Comment out log message on every FRIENDS SIM CONNECTOR request for now. | Justin Clark-Casey (justincc) | 2012-10-16 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-10-12 | 1 | -2/+2 |
| |\ \ \ | |/ / | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs OpenSim/Region/Framework/Scenes/Scene.cs | ||||
| | * | | Move OpenSim.Data.RegionFlags -> OpenSim.Framework.RegionFlags to make it ↵ | Justin Clark-Casey (justincc) | 2012-10-09 | 1 | -2/+2 |
| | | | | | | | | | | | | | easier for other code to use (e.g. LSL_Api) without having to reference OpenSim.Data just for this. | ||||
| * | | | Merge branch 'avination' into careminster | Melanie | 2012-10-07 | 1 | -16/+21 |
| |\ \ \ | | |/ | |/| | | | | | | | Conflicts: OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs | ||||
| | * | | Fix threading in remote asset connector | Melanie | 2012-10-05 | 1 | -16/+21 |
| | | | | |||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-10-07 | 2 | -4/+15 |
| |\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs | ||||
| | * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2012-10-04 | 1 | -3/+8 |
| | |\ \ | |||||
| | | * | | Make the asset retrieval concurrency a config switch. The current value | Mic Bowman | 2012-10-04 | 1 | -3/+8 |
| | | | | | | | | | | | | | | | | | | | | | of 30 is still hanging badly on some mono versions. The switch defaults to 30 to preserve current behavior. | ||||
| | * | | | One more abstraction for GridUser so that it can be overridden in a sub-class. | Diva Canto | 2012-10-04 | 1 | -2/+7 |
| | |/ / | |||||
| | * | | Allow setting max connections for an endpoint | Melanie | 2012-09-30 | 1 | -3/+3 |
| | | | | |||||
| | * | | Revert "Added request.Proxy=null everywhere, as discussed in ↵ | Diva Canto | 2012-09-30 | 5 | -9/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | http://stackoverflow.com/questions/2519655/httpwebrequest-is-extremely-slow." But the patch is here, in case anyone wants to try it. This reverts commit 531edd51d82ecd6a842a2611c99e9919634491ef. | ||||
| | * | | Added request.Proxy=null everywhere, as discussed in ↵ | Diva Canto | 2012-09-30 | 5 | -1/+9 |
| | | | | | | | | | | | | | | | | | | | http://stackoverflow.com/questions/2519655/httpwebrequest-is-extremely-slow. Thanks R.Gunther (rigun@rigutech.nl) https://lists.berlios.de/pipermail/opensim-users/2012-September/010986.html | ||||
| * | | | Merge branch 'avination' into careminster | Melanie | 2012-09-27 | 1 | -37/+67 |
| |\ \ \ | | |/ | |/| | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs OpenSim/Region/Framework/Scenes/Scene.cs | ||||
| | * | | Sequence/throttle asset retrievals. | Melanie | 2012-09-14 | 1 | -37/+67 |
| | | | | |||||
| * | | | Merge branch 'avination' into careminster | Melanie | 2012-09-16 | 1 | -2/+2 |
| |\ \ \ | |/ / | | | | | | | | | | Conflicts: OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs | ||||
| | * | | Allow setting max connections for an endpoint | Melanie | 2012-09-14 | 1 | -2/+2 |
| | | | | |||||
| * | | | Merge branch 'avination' into careminster | Melanie | 2012-09-10 | 3 | -43/+51 |
| |\ \ \ | |/ / | |||||
| | * | | Prevent double slashes, try #4 | UbitUmarov | 2012-09-06 | 1 | -1/+1 |
| | | | | |||||
| | * | | Prevent double slashes, try #3 | Melanie | 2012-09-06 | 1 | -0/+3 |
| | | | | |||||
| | * | | Revert "Change string concatenation to Path.Combine to eliminate extra slashes." | Melanie | 2012-09-06 | 1 | -8/+6 |
| | | | | | | | | | | | | | This reverts commit b9d026666dbabb210cc013d29eb79fe214594dd9. | ||||
| | * | | Merge branch 'ubitwork' into avination | Melanie | 2012-09-06 | 1 | -6/+8 |
| | |\ \ | |||||
| | | * | | Change string concatenation to Path.Combine to eliminate extra slashes. | Melanie | 2012-09-06 | 1 | -6/+8 |
| | | | | | | | | | | | | | | | | | Windoze barfs on them. | ||||
| | | * | | Revert " remove extra '/' in assets url" | Melanie | 2012-09-06 | 1 | -13/+6 |
| | | | | | | | | | | | | | | | | | This reverts commit 041fcd6a72e1822656d58f87a398e3a0f065a486. | ||||
| | | * | | remove extra '/' in assets url | UbitUmarov | 2012-09-06 | 1 | -6/+13 |
| | | | | | |||||
| | * | | | Make friend notifies and closing child agents async because both can | Melanie | 2012-09-04 | 2 | -42/+47 |
| | |/ / | | | | | | | | | | block the heartbeat thread if the sim being contacted is unresponsive | ||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-09-09 | 1 | -2/+2 |
| |\ \ \ | |/ / |/| / | |/ | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs | ||||
| | * | 4096 is used in various places as the maximum height of a region, ↵ | SignpostMarv | 2012-09-08 | 1 | -2/+2 |
| | | | | | | | | | refactoring to be a constant | ||||
| | * | Add a skeleton for a name value storage associated with regions | Melanie | 2012-08-15 | 1 | -0/+14 |
| | | | |||||
| * | | fix vs2010 build | UbitUmarov | 2012-08-16 | 1 | -0/+1 |
| | | | |||||
| * | | Add a real_id field to the login response if impersonation is used. The wrapper | Melanie | 2012-08-15 | 2 | -0/+12 |
| | | | | | | | | | script needs this for proper logging. | ||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |