Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | bad merge? | UbitUmarov | 2015-09-01 | 1 | -1/+6 |
|\ | |||||
| * | Merge branch 'avination-current' into careminster | Melanie | 2013-06-23 | 1 | -1/+2 |
| |\ | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs | ||||
| | * | Add a result param to te money module interface | Melanie | 2013-06-13 | 1 | -1/+2 |
| | | | |||||
| | * | Update the money framework to allow sending the new style linden "serverside ↵ | Melanie | 2013-05-25 | 1 | -4/+9 |
| | | | | | | | | | | | | | | | | | | is now viewerside" messages regarding currency This will require all money modules to be refactored! | ||||
| | * | Change EconomyDataRequest signature to use an IClientAPI rather than UUID. ↵ | Melanie | 2013-04-25 | 1 | -11/+6 |
| | | | | | | | | | | | | | | | | | | This is needed because recent LL viewer codebases call this earlier in login when the client is not yet established in the sim and can't be found by UUID. Sending the reply requires having the IClientAPI. | ||||
| * | | Merge branch 'master' into careminster | Melanie | 2013-05-30 | 1 | -4/+9 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs | ||||
| * \ \ | Merge branch 'master' into careminster | Melanie | 2013-04-29 | 1 | -1/+1 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'master' into careminster | Melanie | 2013-04-25 | 1 | -11/+6 |
| |\ \ \ \ | | |_|_|/ | |/| | | | |||||
| * | | | | Merge branch 'master' into careminster | Melanie | 2013-01-04 | 1 | -6/+8 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | ||||
| * | | | | | Add a transaction ID to the money module path for llTransferLindenDollars | Melanie | 2012-12-03 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Merge branch 'master' into careminster | Melanie | 2012-11-13 | 1 | -1/+1 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs OpenSim/Region/ClientStack/Linden/Caps/NewFileAgentInventoryVariablePriceModule.cs | ||||
| * \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-01-28 | 1 | -2/+2 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'master' into bigmerge | Melanie | 2011-10-26 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Watchdog.cs | ||||
| * | | | | | | | | Add needed dummy to sample money | Melanie | 2011-02-17 | 1 | -0/+4 |
| | | | | | | | | | |||||
| * | | | | | | | | Remove a bit of dead code relating to ObjectCapacity | Melanie | 2010-10-21 | 1 | -2/+0 |
| | | | | | | | | | |||||
* | | | | | | | | | Eliminated many warnings | Oren Hurvitz | 2014-04-23 | 1 | -0/+2 |
| |_|_|_|_|_|_|/ |/| | | | | | | | |||||
* | | | | | | | | Update the money framework to allow sending the new style linden "serverside ↵ | Melanie | 2013-05-25 | 1 | -4/+9 |
| |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | is now viewerside" messages regarding currency This will require all money modules to be refactored! | ||||
* | | | | | | | Unbreak the sample money module | Melanie | 2013-04-27 | 1 | -0/+2 |
| | | | | | | | |||||
* | | | | | | | Small oversight in EconomyDataRequest - this would have affected everyone ↵ | Melanie | 2013-04-27 | 1 | -2/+0 |
| |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | NOT using a money module. | ||||
* | | | | | | Change EconomyDataRequest signature to use an IClientAPI rather than UUID. ↵ | Melanie | 2013-04-25 | 1 | -11/+6 |
| |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | This is needed because recent LL viewer codebases call this earlier in login when the client is not yet established in the sim and can't be found by UUID. Sending the reply requires having the IClientAPI. | ||||
* | | | | | updating documentation in SampleMoneyModule based on doxygen error log ↵ | SignpostMarv | 2013-01-03 | 1 | -6/+8 |
| |_|_|/ |/| | | | | | | | | | | | output; changing an xml-style hint to a uri-style hint in the class summary, improving documentation of Initialise method and removing a superfluous parameter, improving documentating of ClientClosed method and documenting an omitted parameter | ||||
* | | | | Cleanup on region modules: gave short node id's to all of them. | Diva Canto | 2012-11-12 | 1 | -1/+1 |
| |_|/ |/| | | |||||
* | | | Remove IClientAPI from the money module. It was only used to pass in the | Melanie | 2012-01-28 | 1 | -2/+2 |
| |/ |/| | | | | | agent id anyway | ||||
* | | Make OpenSim.Framework.Servers.HttpServer rely on OpenSim.Framework instead ↵ | Justin Clark-Casey (justincc) | 2011-10-25 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | of the other way around. This is necessary so that code in HttpServer can use framework facilities such as the thread watchdog for monitoring purposes. Doing this shuffle meant that MainServer was moved into OpenSim/Framework/Servers Also had to make OpenSim.Framework.Console rely on OpenSim.Framework rather than the other way around since it in turn relies on HttpServer MainConsole and some new interfaces had to be moved into OpenSim/Framework to allow this. This can be reverted if parts of OpenSim.Framework stop relying on console presence (cheifly RegionInfo) | ||||
* | | Remove a bit of dead code relating to ObjectCapacity | Melanie | 2010-10-22 | 1 | -2/+0 |
|/ | |||||
* | Formatting cleanup. | Jeff Ames | 2010-10-04 | 1 | -1/+1 |
| | |||||
* | So, the client can have an old idea of the object properties for the object ↵ | Melanie | 2010-10-02 | 1 | -0/+24 |
| | | | | when it goes to buy. This can cause a problem in the buy process. Additionally Hazim mentioned that the buy packets are spoofable. The core modules are the crowing glory example of best practice :P, so therefore, setting the example here, Validate Client sent Buy Data. WebAppSecurity 101, Never trust a client. Validate Validate Validate! Or you'll have problems whether intentional or not. | ||||
* | Reapplying the parts of the prior revert that were not derived from the | Melanie | 2010-10-02 | 1 | -2/+2 |
| | | | | original patch | ||||
* | Revert "Forward-port 0.6 fix" | Melanie | 2010-10-02 | 1 | -2/+2 |
| | | | | This reverts commit 90b51dc7d67507e27c4baa529e979de19dce8de1. | ||||
* | Forward-port 0.6 fix | Melanie | 2010-09-30 | 1 | -2/+2 |
| | |||||
* | Formatting cleanup. | Jeff Ames | 2010-09-12 | 1 | -1/+1 |
| | |||||
* | refactor: move Scene.PerformObjectBuy into BuySellModule | Justin Clark-Casey (justincc) | 2010-08-13 | 1 | -9/+6 |
| | |||||
* | minor: remove mono compiler warning | Justin Clark-Casey (justincc) | 2010-08-13 | 1 | -1/+1 |
| | |||||
* | Remove getting the object capacity from the money module. It is now set | Melanie Thielker | 2010-07-14 | 1 | -4/+3 |
| | | | | directly from the Region Info (and the region ini file) | ||||
* | Clean up IMoneyModule and adjust the other modules to the changes | Melanie Thielker | 2010-07-02 | 1 | -16/+15 |
| | |||||
* | Remove GetEconomyData and the economy data structure (unused) | Melanie Thielker | 2010-07-02 | 1 | -21/+0 |
| | |||||
* | Cleaned up configuration. 'gridmode' and 'hypergrid' are gone, as well as ↵ | Diva Canto | 2010-01-31 | 1 | -14/+1 |
| | | | | lots of other obsolete configs. | ||||
* | OpenSim/Framework/Communications/Cache deleted. LibraryRootFolder deleted. | Diva Canto | 2010-01-11 | 1 | -1/+1 |
| | |||||
* | * OMG! All but one references to UserProfileCacheService have been rerouted! | Diva Canto | 2010-01-10 | 1 | -3/+4 |
| | | | | | * HG is seriously broken here * Compiles. Untested. | ||||
* | Replace the Replaceable modules name | Melanie | 2009-08-10 | 1 | -1/+1 |
| | |||||
* | Remove bad assembly identification tag | Melanie | 2009-08-05 | 1 | -3/+0 |
| | |||||
* | Some module reshuffling, no user functionality yet | Melanie Thielker | 2009-07-10 | 2 | -0/+877 |