Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into careminster | Melanie | 2012-11-23 | 2 | -9/+22 |
|\ | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs OpenSim/Region/Framework/Scenes/SceneManager.cs | ||||
| * | Remove the redundant BypassPermissions() checks in EstateManagmentModule. | Justin Clark-Casey (justincc) | 2012-11-23 | 1 | -8/+13 |
| | | | | | | | | This is repeated in the PermissionsModule and checking it earlier does not allow a force override of the bypass value | ||||
| * | minor: Add some console feedback on region restart and log who requested a ↵ | Justin Clark-Casey (justincc) | 2012-11-23 | 2 | -1/+9 |
| | | | | | | | | region restart if done from the viewer. | ||||
* | | Merge branch 'master' into careminster | Melanie | 2012-11-20 | 4 | -193/+149 |
|\ \ | |/ | |||||
| * | If GetAgents() is called with an empty userIDs array then don't bother with ↵ | Justin Clark-Casey (justincc) | 2012-11-20 | 1 | -0/+4 |
| | | | | | | | | | | | | | | a useless potentially network call on the scene presence service connector. This also eliminates the "[PRESENCE HANDLER]: GetAgents called without required uuids argument" which has started to pop up in the logs when a call is made with an empty uuid array as occasionally happens. | ||||
| * | refactor: Move common presence connector code into BasePresenceServiceConnector | Justin Clark-Casey (justincc) | 2012-11-20 | 4 | -193/+145 |
| | | |||||
* | | Merge branch 'avination' into careminster | Melanie | 2012-11-17 | 1 | -11/+20 |
|\ \ | |||||
| * | | Prevent a buffer overflow in asset receiving | Melanie | 2012-11-17 | 1 | -11/+20 |
| | | | |||||
| * | | Prevent IMs being sent to prims when avies decline inventory offers from them. | Diva Canto | 2012-11-04 | 1 | -9/+12 |
| | | | |||||
* | | | Merge branch 'master' into careminster | Melanie | 2012-11-17 | 2 | -5/+4 |
|\ \ \ | | |/ | |/| | |||||
| * | | Remove unnecessary ability to directly set InventoryItemBase.CreatorIdAsUuid | Justin Clark-Casey (justincc) | 2012-11-17 | 2 | -5/+4 |
| | | | | | | | | | | | | | | | 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 | ||||
* | | | Merge branch 'master' into careminster | Melanie | 2012-11-15 | 1 | -12/+8 |
|\ \ \ | |/ / | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs | ||||
| * | | Following on from 4f982596, launch map name requests on an async thread from ↵ | Justin Clark-Casey (justincc) | 2012-11-15 | 1 | -12/+8 |
| | | | | | | | | | | | | | | | | | | LLClientView directly. This releases the inbound packet handling thread marginally quicker and is more consistent with the other async packet handling | ||||
* | | | Merge branch 'master' into careminster | Melanie | 2012-11-15 | 2 | -5/+3 |
|\ \ \ | |/ / | |||||
| * | | Possibly fixes mantis #6429 (Flotsam cache having a null ref to the asset ↵ | Diva Canto | 2012-11-14 | 1 | -4/+2 |
| | | | | | | | | | | | | service) | ||||
| * | | Updated all existing AssemblyVersions's to 0.7.5.*. Many DLLs still don't ↵ | Diva Canto | 2012-11-13 | 1 | -1/+1 |
| | | | | | | | | | | | | have an AssemblyInfo file. | ||||
* | | | Merge branch 'master' into careminster | Melanie | 2012-11-13 | 59 | -84/+158 |
|\ \ \ | |/ / | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs | ||||
| * | | Deleted .addin.xml. Added AssemblyInfo.cs | Diva Canto | 2012-11-13 | 2 | -15/+38 |
| | | | |||||
| * | | Last 27 modules' directives (service connectors out). | Diva Canto | 2012-11-13 | 27 | -33/+54 |
| | | | |||||
| * | | Another 11 modules' directions moved out of .addin.xml | Diva Canto | 2012-11-13 | 12 | -14/+22 |
| | | | |||||
| * | | Another 21 modules' directives moved out of .addin.xml | Diva Canto | 2012-11-13 | 21 | -22/+41 |
| | | | |||||
* | | | Merge branch 'master' into careminster | Melanie | 2012-11-13 | 15 | -82/+95 |
|\ \ \ | |/ / | |||||
| * | | Moved the WindModule and its own plugins out of .addin.xml | Diva Canto | 2012-11-12 | 4 | -5/+5 |
| | | | |||||
| * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2012-11-12 | 1 | -67/+70 |
| |\ \ | |||||
| | * | | Disable code to get server-side to move given items to a destination folder ↵ | Justin Clark-Casey (justincc) | 2012-11-13 | 1 | -67/+70 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | on TaskInventoryAccepted. This is because the fixes to inventory versioning (so that they better match viewer expections) now appear to allow the viewer to execute #RLV moves, as happens on the LL grid. Doing it again server-side now wrongly creates another child #RLV folder underneath the root one. As per http://opensimulator.org/mantis/view.php?id=6311 | ||||
| * | | | Another 10 modules' directives moved from .addin.xml | Diva Canto | 2012-11-12 | 11 | -10/+20 |
| |/ / | |||||
* | | | Merge branch 'master' into careminster | Melanie | 2012-11-13 | 7 | -6/+12 |
|\ \ \ | |/ / | |||||
| * | | More module cleanup: removed the CoreModules.Framework modules directives ↵ | Diva Canto | 2012-11-12 | 7 | -6/+12 |
| | | | | | | | | | | | | out of .addin.xml. | ||||
* | | | Merge branch 'master' into careminster | Melanie | 2012-11-13 | 18 | -18/+18 |
|\ \ \ | |/ / | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs OpenSim/Region/ClientStack/Linden/Caps/NewFileAgentInventoryVariablePriceModule.cs | ||||
| * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2012-11-12 | 1 | -1/+1 |
| |\ \ | |||||
| * | | | Cleanup on region modules: gave short node id's to all of them. | Diva Canto | 2012-11-12 | 18 | -18/+18 |
| | | | | |||||
* | | | | Merge branch 'master' into careminster | Melanie | 2012-11-13 | 1 | -1/+1 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | Update ScriptModuleComms name space to CoreModules | Melanie | 2012-11-13 | 1 | -1/+1 |
| |/ / | |||||
* | | | Merge branch 'master' into careminster | Melanie | 2012-11-12 | 20 | -23/+23 |
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Application/OpenSimBase.cs OpenSim/Region/ClientStack/Linden/Caps/NewFileAgentInventoryVariablePriceModule.cs OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs OpenSim/Region/Framework/ModuleLoader.cs OpenSim/Region/Framework/Scenes/SceneManager.cs | ||||
| * | | Remove any mention of IRegionModule from region names and comments to aid | Melanie | 2012-11-12 | 20 | -24/+24 |
| | | | | | | | | | | | | grepping for remaining uses | ||||
* | | | Merge branch 'master' into careminster | Melanie | 2012-11-12 | 8 | -254/+416 |
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs OpenSim/Region/OptionalModules/Scripting/XmlRpcRouterModule/XmlRpcRouterModule.cs OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs | ||||
| * | | Fix mantis #6425 | Diva Canto | 2012-11-11 | 1 | -6/+0 |
| | | | |||||
| * | | Fix issues with the DynamicTextureModule and corresponding unit tests. | Diva Canto | 2012-11-11 | 3 | -32/+39 |
| | | | |||||
| * | | One more module converted: PermissionsModule. | Diva Canto | 2012-11-11 | 1 | -112/+155 |
| | | | |||||
| * | | One more module converted: XMLRPCModule. Removed it from the special loading ↵ | Diva Canto | 2012-11-11 | 1 | -31/+51 |
| | | | | | | | | | | | | at start. | ||||
| * | | One more module converted: VectorRenderModule. | Diva Canto | 2012-11-11 | 1 | -27/+41 |
| | | | |||||
| * | | One more module: DynamicTextureModule. Removed it from the special load in ↵ | Diva Canto | 2012-11-11 | 1 | -11/+27 |
| | | | | | | | | | | | | the beginning. | ||||
| * | | One more module converted: LoadImageURLModule. Also removed it from its ↵ | Diva Canto | 2012-11-11 | 1 | -19/+38 |
| | | | | | | | | | | | | hard-coded instantiation (I think I understood what the problem was, and that I've done it right). | ||||
| * | | One more module converted: ScriptsHttpRequests. | Diva Canto | 2012-11-11 | 1 | -9/+25 |
| | | | |||||
| * | | One more module converted: EmailModule. | Diva Canto | 2012-11-11 | 1 | -46/+64 |
| | | | |||||
| * | | J2KDecoderModule: move the code out of PostInitialise() | Diva Canto | 2012-11-11 | 1 | -8/+17 |
| | | | |||||
* | | | Merge branch 'master' into careminster | Melanie | 2012-11-11 | 2 | -64/+78 |
|\ \ \ | |/ / | |||||
| * | | moving windlight-sources to correct namespace-named folder (world); add ↵ | PixelTomsen | 2012-11-11 | 2 | -30/+27 |
| | | | | | | | | | | | | | | | | | | LightShare as Interface Signed-off-by: Diva Canto <diva@metaverseink.com> | ||||
| * | | One more module converted: LightShareModule. | Diva Canto | 2012-11-11 | 1 | -38/+55 |
| | | | |||||
* | | | Merge branch 'master' into careminster | Melanie | 2012-11-11 | 21 | -1878/+927 |
|\ \ \ | |/ / | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs |