| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' into careminster | Melanie | 2013-06-18 | 2 | -38/+74 |
| |\ | | | | | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Services/LLLoginService/LLLoginResponse.cs OpenSim/Services/LLLoginService/LLLoginService.cs | ||||
| | * | Lock m_classifiedCache and m_classifiedInterest dictionary reads in ↵ | Justin Clark-Casey (justincc) | 2013-06-15 | 1 | -14/+13 |
| | | | | | | | | | | | | | UserProfileModule since in the presence of writes these are not thread-safe operations. Simplified locking to m_classifiedCache only since r/w of both dictionaries always occurs together | ||||
| | * | Correct build break in previous commit 9c530d7 | Justin Clark-Casey (justincc) | 2013-06-15 | 1 | -10/+7 |
| | | | |||||
| | * | refactor: In UserProfileModule, change classifiedCache and ↵ | Justin Clark-Casey (justincc) | 2013-06-15 | 1 | -19/+23 |
| | | | | | | | | | | | | | classifiedInterest to m_classifiedCache and m_classifiedInterest This is the coding standard name style for private fields. | ||||
| | * | Add the standard OpenSimulator copyright notice to the top of InventoryCache.cs | Justin Clark-Casey (justincc) | 2013-06-15 | 1 | -1/+28 |
| | | | |||||
| | * | Adjust the locking on InventoryCache. Locking for r/w of the ExpiringCache ↵ | Justin Clark-Casey (justincc) | 2013-06-15 | 1 | -14/+23 |
| | | | | | | | | | isn't needed since it's thread safe but r/w of contained dictionaries isn't thread-safe | ||||
| * | | Merge branch 'master' into careminster | Melanie | 2013-06-13 | 2 | -74/+92 |
| |\ \ | |/ | |||||
| | * | Uncomment Mic's code and split to create new regression ↵ | Justin Clark-Casey (justincc) | 2013-06-11 | 1 | -23/+41 |
| | | | | | | | | | TestAddTemporaryAsset() and TestAddTemporaryLocalAsset() | ||||
| | * | Removed the lock entirely | Diva Canto | 2013-06-11 | 1 | -56/+52 |
| | | | |||||
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2013-06-11 | 2 | -2/+22 |
| | |\ | |||||
| | | * | Put the "script saved" and "notecard saved" messages back into the bottom | Melanie | 2013-06-11 | 1 | -2/+2 |
| | | | | | | | | | | | | | right corner. | ||||
| | * | | Really bad idea to lock m_UserCache for so long in UserManagementModule. ↵ | Diva Canto | 2013-06-11 | 1 | -13/+17 |
| | | | | | | | | | | | | | Added a special lock object instead, if we really want to avoid concurrent executions of that code. | ||||
| * | | | Merge branch 'avination-current' into careminster | Melanie | 2013-06-11 | 2 | -3/+3 |
| |\ \ \ | |||||
| | * | | | Put the "script saved" and "notecard saved" messages back into the bottom | Melanie | 2013-06-11 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | right corner. | ||||
| | * | | | Make objects attached from the ground appear in inventory again. Fixes a number | Melanie | 2013-06-08 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | of interaction issues causing client crashes. | ||||
| * | | | | Merge branch 'master' into careminster | Melanie | 2013-06-11 | 5 | -3/+36 |
| |\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs | ||||
| | * | | | Fix test for adding temporary assets. Code for non-local temporary assets | Mic Bowman | 2013-06-10 | 1 | -0/+20 |
| | | |/ | |/| | | | | | | | is there but commented out. | ||||
| | * | | Remove Temporary from use to shortcut asset stores. The Local property | Mic Bowman | 2013-06-10 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | differentiates between local & grid storage. The Temporary property just says that which service handles the it, the asset can be safely removed in the future. | ||||
| | * | | Catch exception triggered by incoming avatars using legacy profiles | BlueWall | 2013-06-08 | 1 | -1/+10 |
| | | | | |||||
| | * | | Merge branch 'profiles' | BlueWall | 2013-06-07 | 2 | -0/+4 |
| | |\ \ | | | | | | | | | | | | | message to explain why this merge is necessary, | ||||
| | | * | | SQLite support for UserProfiles | BlueWall | 2013-06-07 | 1 | -0/+1 |
| | | | | | |||||
| | | * | | Ensure selected module is the only active one | BlueWall | 2013-06-07 | 1 | -0/+3 |
| | | | | | |||||
| | * | | | Supply proper type information for the various types of requests | Melanie | 2013-06-07 | 1 | -6/+6 |
| | | | | | |||||
| | * | | | Adding Avination's PollService to round out the HTTP inventory changes | Melanie | 2013-06-07 | 1 | -4/+4 |
| | |/ / | |||||
| * | | | Merge branch 'master' into careminster | Melanie | 2013-06-07 | 2 | -4/+4 |
| |\ \ \ | |/ / | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs | ||||
| | * | | In LocalFriendshipTerminated, send the original client's agentId to the ↵ | Donnie Roberts | 2013-06-07 | 2 | -4/+4 |
| | | | | | | | | | | | | | friend being removed instead of the friend's own id. | ||||
| * | | | Merge branch 'master' into careminster | Melanie | 2013-06-06 | 1 | -0/+5 |
| |\ \ \ | |/ / | |||||
| | * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2013-06-05 | 2 | -0/+6 |
| | |\ \ | |||||
| | | * | | Hook up Keyframe motion to almost everything. Failing to cross a sim border | Melanie | 2013-06-06 | 2 | -0/+6 |
| | | | | | | | | | | | | | | | | | may yield unexpected results in some cases. No database persistence yet, | ||||
| | * | | | Strengthen some assumptions. | Diva Canto | 2013-06-05 | 1 | -0/+5 |
| | |/ / | |||||
| * | | | Merge branch 'avination-current' into careminster | Melanie | 2013-06-06 | 6 | -18/+68 |
| |\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | 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 | ||||
| | * | | Allow Linden trees to preserve their type when taken into inventory and ↵ | Melanie | 2013-05-26 | 1 | -3/+12 |
| | | | | | | | | | | | | | rezzed again. Allow Linden trees to be sensed by LLSensor as PASSIVE objects. | ||||
| | * | | Reset "Show in search" on parcels cut off other parcels that are in search | Melanie | 2013-05-24 | 1 | -0/+2 |
| | | | | |||||
| | * | | Refactor to get closer to core | Melanie | 2013-05-11 | 1 | -2/+2 |
| | | | | |||||
| | * | | Remove dumb "Region found!" message from map search | Melanie | 2013-05-06 | 1 | -2/+2 |
| | | | | |||||
| | * | | Implement llSetContentType using the new OpenID auth support for authentication | Melanie | 2013-05-05 | 1 | -1/+50 |
| | | | | |||||
| | * | | Fix the long standing bug of items being delivered to lost and found or ↵ | Melanie | 2013-05-01 | 1 | -2/+3 |
| | | | | | | | | | | | | | | | | | | | | | | trash when takig copy. This bug was recently aggravated through the perms changes required for the export permission. | ||||
| | * | | Merge branch 'avination-current' of ssh://3dhosting.de/var/git/careminster ↵ | Melanie | 2013-04-30 | 1 | -2/+8 |
| | |\ \ | | | | | | | | | | | | | into avination-current | ||||
| | | * | | Fix bug where an agent that declined an inventory offer and subsequently ↵ | Justin Clark-Casey (justincc) | 2013-04-30 | 1 | -2/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | emptied their trash would make the item invalid in the giver's inventory This was because the original item/folder ID was sent in the session slot of the offer IM rather than the copy. | ||||
| | * | | | Fix CAPS to work like they should - do not send caps to the viewer if ↵ | Melanie | 2013-04-30 | 1 | -1/+1 |
| | |/ / | | | | | | | | | | | | | | | | | | | | | | they're not in the requested caps list. The previous wrong behavior caused the debug setting "UseHTTPInventory" to fail on all viewers when turned off. UDB inventory would not be correctly used in that case. | ||||
| | * | | Make the kicked user's avie truly disappear when it's god-kicked. | Diva Canto | 2013-04-25 | 1 | -2/+1 |
| | | | | |||||
| | * | | Gods module cleanup | Melanie | 2013-04-25 | 1 | -10/+0 |
| | | | | |||||
| * | | | Merge commit 'e449950030decf7e65e7d9b334ddaed25c1bd629' into careminster | Melanie | 2013-06-06 | 1 | -14/+18 |
| |\ \ \ | | |/ | |/| | |||||
| | * | | Prevent processing for Npc | BlueWall | 2013-06-05 | 1 | -1/+3 |
| | | | | |||||
| | * | | Remove a couple of orphaned lines | BlueWall | 2013-06-05 | 1 | -3/+0 |
| | | | | |||||
| | * | | Make locking more uniform | BlueWall | 2013-06-05 | 1 | -14/+19 |
| | | | | |||||
| * | | | Merge branch 'master' into careminster | Melanie | 2013-06-04 | 4 | -9/+1562 |
| |\ \ \ | |/ / | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs | ||||
| | * | | Adding back the BasicProfileModule | BlueWall | 2013-05-31 | 2 | -73/+191 |
| | | | | |||||
| | * | | UserProfiles | BlueWall | 2013-05-30 | 4 | -176/+1613 |
| | | | | | | | | | | | | | UserProfiles for Robust and Standalone. Includes service and connectors for Robust and standalone opensim plus matching region module. | ||||
| | * | | minor: fix warnings in GodsModule that were due to duplicate using statements | Justin Clark-Casey (justincc) | 2013-05-30 | 1 | -11/+7 |
| | | | | |||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |