aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | Merge branch 'master' into careminsterMelanie2012-11-1359-84/+158
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
| * | | | Deleted .addin.xml. Added AssemblyInfo.csDiva Canto2012-11-132-15/+38
| | | | |
| * | | | Last 27 modules' directives (service connectors out).Diva Canto2012-11-1327-33/+54
| | | | |
| * | | | Another 11 modules' directions moved out of .addin.xmlDiva Canto2012-11-1312-14/+22
| | | | |
| * | | | Another 21 modules' directives moved out of .addin.xmlDiva Canto2012-11-1321-22/+41
| | | | |
* | | | | Merge branch 'master' into careminsterMelanie2012-11-1316-82/+99
|\ \ \ \ \ | |/ / / /
| * | | | Moved the WindModule and its own plugins out of .addin.xmlDiva Canto2012-11-124-5/+5
| | | | |
| * | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-11-122-67/+74
| |\ \ \ \ | | |/ / /
| | * | | minor: Add some explanative method doc to SceneHelpers.SetupSceneModules()Justin Clark-Casey (justincc)2012-11-131-0/+4
| | | | |
| | * | | Disable code to get server-side to move given items to a destination folder ↵Justin Clark-Casey (justincc)2012-11-131-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.xmlDiva Canto2012-11-1211-10/+20
| |/ / /
* | | | Merge branch 'master' into careminsterMelanie2012-11-137-6/+12
|\ \ \ \ | |/ / /
| * | | More module cleanup: removed the CoreModules.Framework modules directives ↵Diva Canto2012-11-127-6/+12
| | | | | | | | | | | | | | | | out of .addin.xml.
* | | | Merge branch 'master' into careminsterMelanie2012-11-1343-45/+42
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs OpenSim/Region/ClientStack/Linden/Caps/NewFileAgentInventoryVariablePriceModule.cs
| * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-11-121-1/+1
| |\ \ \
| * | | | Cleanup on region modules: gave short node id's to all of them.Diva Canto2012-11-1244-44/+44
| | | | |
* | | | | Merge branch 'master' into careminsterMelanie2012-11-131-1/+1
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Update ScriptModuleComms name space to CoreModulesMelanie2012-11-131-1/+1
| |/ / /
* | | | Merge branch 'master' into careminsterMelanie2012-11-1242-572/+85
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | Completely remove the IRegionModule interfaceMelanie2012-11-121-55/+0
| | | |
| * | | Stop closing old style modulesMelanie2012-11-121-9/+0
| | | |
| * | | Remove the old style module loader and all references to itMelanie2012-11-129-425/+21
| | | |
| * | | Remove IRegionModule support from the test setup helperMelanie2012-11-121-23/+5
| | | |
| * | | Remove any mention of IRegionModule from region names and comments to aidMelanie2012-11-1233-40/+39
| | | | | | | | | | | | | | | | grepping for remaining uses
* | | | Merge branch 'master' into careminsterMelanie2012-11-1217-501/+828
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | 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 #6425Diva Canto2012-11-111-6/+0
| | | |
| * | | Fix issues with the DynamicTextureModule and corresponding unit tests.Diva Canto2012-11-114-37/+44
| | | |
| * | | One more module converted: WebStatsModule.Diva Canto2012-11-111-76/+93
| | | |
| * | | Two more modules converted: XmlRpcGridRouterModule and XmlRpcRouterModule.Diva Canto2012-11-112-18/+60
| | | |
| * | | One more module converted: MRMModule.Diva Canto2012-11-111-35/+56
| | | |
| * | | One more module converted: IRCStackModule.Diva Canto2012-11-111-19/+35
| | | |
| * | | One more module converted: PermissionsModule.Diva Canto2012-11-111-112/+155
| | | |
| * | | One more module converted: XMLRPCModule. Removed it from the special loading ↵Diva Canto2012-11-112-33/+53
| | | | | | | | | | | | | | | | at start.
| * | | One more module converted: VectorRenderModule.Diva Canto2012-11-111-27/+41
| | | |
| * | | One more module: DynamicTextureModule. Removed it from the special load in ↵Diva Canto2012-11-112-13/+29
| | | | | | | | | | | | | | | | the beginning.
| * | | One more module converted: LoadImageURLModule. Also removed it from its ↵Diva Canto2012-11-112-21/+40
| | | | | | | | | | | | | | | | hard-coded instantiation (I think I understood what the problem was, and that I've done it right).
| * | | One more module converted: ScriptsHttpRequests.Diva Canto2012-11-111-9/+25
| | | |
| * | | One more module converted: EmailModule.Diva Canto2012-11-111-46/+64
| | | |
| * | | document & 80-character width terminal formattingSignpostMarv2012-11-112-85/+158
| | | | | | | | | | | | | | | | Signed-off-by: Diva Canto <diva@metaverseink.com>
| * | | converting NPC module to ISharedRegionModuleSignpostMarv2012-11-111-9/+22
| | | | | | | | | | | | | | | | Signed-off-by: Diva Canto <diva@metaverseink.com>
| * | | J2KDecoderModule: move the code out of PostInitialise()Diva Canto2012-11-111-8/+17
| | | |
* | | | Merge branch 'master' into careminsterMelanie2012-11-114-74/+111
|\ \ \ \ | |/ / /
| * | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2012-11-114-74/+111
| |\ \ \
| | * | | moving windlight-sources to correct namespace-named folder (world); add ↵PixelTomsen2012-11-113-30/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | LightShare as Interface Signed-off-by: Diva Canto <diva@metaverseink.com>
| | * | | remove entry OpenGridProtocol in OpenSimDefaults.ini - module was deletedPixelTomsen2012-11-111-10/+0
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Diva Canto <diva@metaverseink.com>
| | * | | One more module converted: LightShareModule.Diva Canto2012-11-111-38/+55
| | | | |
| * | | | Prevent datasnapshot from crashing the simulatorMelanie2012-11-111-10/+18
| |/ / /
* | | | Prevent datasnapshot from crashing the simulatorMelanie2012-11-111-10/+18
| | | |
* | | | Merge branch 'master' into careminsterMelanie2012-11-1135-2169/+1319
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs
| * | | Deleted 2 obsolete modules: OGSRadmin and OpenGridProtocol. They were still ↵Diva Canto2012-11-112-1447/+0
| | | | | | | | | | | | | | | | IRegionModule's and they have been dead for a very long time, so no need to drag them along in this revamping of region modules.