Diva Canto
6f469ec0a5
Added tests that verify the absence of the bug fixed in the previous commits (cache issues).
2015-06-04 08:52:57 -07:00
Diva Canto
9366165b34
Again, forgot to update Prebuild.xml regarding the deleted test client project. Done now.
2015-05-11 20:04:01 -07:00
Diva Canto
d0292b0731
Forgot to delete an unused project from Prebuild. Done now.
2015-05-11 09:12:55 -07:00
Diva Canto
811b026ed5
Deleted OpenSim.Tests.Client.GridClient and PresenceClient, as they have been subsumed by the new testing framework.
2015-05-10 21:15:22 -07:00
Diva Canto
c2cf22ea4f
Added the beginning of a new test framework for robust connectors and services. For now, just Grid and Presence. This framework starts a robust server (as a thread) listening on a port in localhost, then the tests are client code.
2015-05-10 21:04:46 -07:00
Diva Canto
321601482b
Changed prebuild to find the new unit tests for FetchInventory
2015-05-10 08:47:38 -07:00
Diva Canto
1192ca36e9
Forgot this file in the last commit
2015-05-05 21:07:04 -07:00
Magnuz Binder
263db44129
Implement llGetBoundingBox fully.
...
Signed-off-by: Michael Cerquoni <nebadon2025@gmail.com>
2015-04-20 16:23:34 -04:00
Justin Clark-Casey (justincc)
80936fb4c5
Make SmartThreadPool build pick up Properties/AssemblyInfo.cs by setting build to recurse in this directory.
...
Patch from http://opensimulator.org/mantis/view.php?id=7443
Thanks Fly-Man-
2015-03-11 23:41:49 +00:00
Justin Clark-Casey (justincc)
7d3bafd5ab
Add outbound URL filter to llHttpRequest() and osSetDynamicTextureURL*() script functions.
...
This is to address an issue where HTTP script functions could make calls to localhost and other endpoints inside the simulator's LAN.
By default, calls to all private addresses are now blocked as per http://en.wikipedia.org/wiki/Reserved_IP_addresses
If you require exceptions to this, configure [Network] OutboundDisallowForUserScriptsExcept in OpenSim.ini
2015-03-04 18:27:50 +00:00
Diva Canto
8e562f04d1
Donation of robust network connectors for estate service, as promised. This allows to have one central database for estates without having to open the MySql port. This is off by default, so not to disturb everyone's existing installations. To use it, see GridCommon.ini.example [EstateDataStore] section and Robust*.ini.example's new additions.
...
Note that I also made things consistent by removing both the EstateDataService and the SimulationService into their own dlls, just like all other services. They really didn't belong in Services.Connectors, since everything in that component is about network connectors to robust backends. We may have too many dlls, and at some point it might not be a bad idea to merge all services into one single dll, since they all have more or less the same dependencies.
2015-01-06 21:24:44 -08:00
Diva Canto
7466ef0525
This cleans up versioning. Specifically:
...
- It establishes 4 digits for opensim versions
- It uses the same number between opensim releases and mono addins versions
It also eliminates the last addin.xml files that were still there, for consistency.
2014-12-30 12:53:31 -08:00
Robert Adams
289cf2e3e2
Remove reference to MSSQL in prebuild.xml since feature has been removed
2014-12-09 19:47:31 -08:00
Justin Clark-Casey (justincc)
d9f7aa41c1
Remove unmaintained MSSQL support.
...
This has not been maintained for more than 2 years, is unimplemented for newer features (e.g. built-in groups) and has no core developers using it.
If somebody fixes these issues then it could be reinstated.
2014-11-28 00:27:13 +00:00
Justin Clark-Casey (justincc)
72cb1cc7d6
Add "show threadpool calls" command to show count of all labelled smartthreadpool calls
2014-11-25 23:23:10 +00:00
Justin Clark-Casey (justincc)
52370ac94d
refactor: Move test clientstack setup code out of BasicCircuitTests into OpenSim.Tests.Common.ClientStackHelpers
2014-11-25 23:18:40 +00:00
BlueWall
b463870914
Add hypergrid teleporting support to user profiles picks
2014-10-27 17:27:42 -04:00
Justin Clark-Casey (justincc)
41f2f3132b
For monitoring purposes, start non-timeout tasks (which do not currently use a threadpool) via Watchdog.RunInThread() rather than Util.RunThreadNoTimeout()
...
The functionality is the same but this allow us to monitor such tasks via "show threads" and abort them for test purposes, etc.
Also extends thread names to provide more info (e.g. SendInitialDataToClient says what client the task is for).
2014-09-05 23:20:59 +01:00
Justin Clark-Casey (justincc)
b08ab1e375
If BulletSim is running on its own threads, start this thread via the thread watchdog.
...
This allows us to see the presence of the permanent thread via the "show threads" console comand.
Also adds the region name to the thread name.
2014-09-03 23:35:18 +01:00
Justin Clark-Casey (justincc)
f1f935ed95
Add 'server' stats information to pCampbot, as used elsewhere in OpenSimulator
...
This adds the "show stats", "stats record", etc. commands and information on available Threadpool threads, etc.
It also adds the Watchdog which logs warnings if time between executions is unexpectedly large.
2014-08-13 19:53:42 +01:00
Justin Clark-Casey (justincc)
327632dc66
Add inventory.<url>.RequestsMade stat.
...
This gives a count of all requests made to the remote inventory service.
This is finer grained than inventory.httpfetch.ProcessedFetchInventoryRequests since such a request can be comprised of many individual inv service calls.
In addition, this will count requests that don't go through the HTTP inventory fetch (e.g. HG, archiving, etc.)
2014-07-26 02:17:04 +01:00
Oren Hurvitz
3cb31e9685
Removed warning about YieldProlog
2014-07-21 09:12:30 +01:00
Justin Clark-Casey (justincc)
889194db63
Actually call Close() for shared region modules when the simulator is being shutdown.
...
Adds regression test for this case.
2014-07-02 23:49:25 +01:00
Diva Canto
2ff9ea3f80
Fixed a few things pertaining to interfacing with the estate service. Specifically, StoreEstateSettings was not being used anywhere; instead EstatSetting.Save was being called, but that method is a trigger to the DB-layer code directly, which, besides being wrong, was making it impossible to replace the service with a remote connector.
...
Also added more packing/unpacking code.
2014-06-01 10:06:26 -07:00
Diva Canto
02a53665c9
Added missing reference
2014-05-31 08:22:36 -07:00
Diva Canto
227685bea4
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2014-05-23 16:20:04 -07:00
Diva Canto
20f20895cf
Adds optional HTTP Basic Authentication to Robust service connectors.
2014-05-23 16:19:43 -07:00
Justin Clark-Casey (justincc)
1b156b7fe8
Add regression test for in-range chat between neighbouring regions from east to west.
2014-05-22 19:18:24 +01:00
Oren Hurvitz
bc06db3df4
- Created a standard function to send XML-RPC requests, which logs them like we do for other types of HTTP activity.
...
- Changed OpenProfileClient to use the new XML-RPC sending function
- Improved logging in WebUtil
2014-04-24 15:58:43 +01:00
Oren Hurvitz
d62f0bc35d
Refactored: moved OpenProfileClient to a location where it can be used by both the Simulators and Robust
2014-04-24 15:58:42 +01:00
Oren Hurvitz
2506b3d89e
Removed references to Community.CsharpSqlite*.dll. This eliminates some warnings, and SQLite still works.
2014-04-23 14:38:41 +01:00
Melanie
5d964a6424
Remove the old XML format parsing. Now additional region params can just be
...
added as they are already exposed through an API when using Nini. That will
remove the need to always edit RegioInfo just to add a region based setting.
2014-04-12 16:58:07 +01:00
Oren Hurvitz
559c66afe6
Added System.Core reference to MSSQL
2014-04-02 09:20:28 +03:00
Justin Clark-Casey (justincc)
d3387d591a
Remove unmaintained and unused YieldProlog scripting language
...
This hasn't been mainntained since 2008 and has not been kept up with the rest of the language infrastructure.
Hence, it almost certainly doesn't work and has never been used, afaik
If this is wrong, please say on the opensim-users/dev mailing list.
Removing to reduce maintenance burden (since it still needs to be made to compile).
2014-03-26 00:59:57 +00:00
Oren Hurvitz
f5ae36d7e2
Updated Prebuild to support .NET 4.5
...
Resolves http://opensimulator.org/mantis/view.php?id=6951
2014-03-24 12:26:54 +01:00
Justin Clark-Casey (justincc)
f3e177814a
Add regression test for http inventory fetch.
...
Involved some restructuring to allow regression tests to dequeue inventory requests and perform poll responses synchronously rather than async
2014-03-17 20:51:35 +00:00
Justin Clark-Casey (justincc)
71918eeab4
Add regression test for sending group notices via xmlrpc groups connector.
2014-03-07 01:04:54 +00:00
Justin Clark-Casey (justincc)
e10012a7a6
If a caller tries to queue a CAPs message to a scene presence that has no event queue (e.g. an NPC), only warn if event queue debugging is greater than zero.
...
Removes the spurious log warnings if groups are active when NPCs are used.
Adds more regression tests associated with adding messages to the event queue
2014-02-12 23:18:10 +00:00
Melanie
e79fab91db
Intermediate commit. Sill errors.
...
Merge branch 'master' into careminster
Conflicts:
OpenSim/Data/SQLite/SQLiteUserProfilesData.cs
OpenSim/Framework/RegionInfo.cs
OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueHelper.cs
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
OpenSim/Services/UserProfilesService/UserProfilesService.cs
2014-01-05 20:12:32 +00:00
Justin Clark-Casey (justincc)
a5ca15c428
Create regression test TestSendAgentGroupDataUpdate() for groups agent data sending
2013-12-18 23:35:38 +00:00
Melanie
ba48816fb6
Merge branch 'master' into careminster
2013-12-07 01:19:20 +00:00
dahlia
1496de7ce9
use System.IO.Compression.DeflateStream for mesh decompression in an attempt to reduce mesh asset decoding failures
2013-12-06 15:58:19 -08:00
Melanie
3589acdab1
Merge branch 'master' into careminster
...
Conflicts:
.gitignore
OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
prebuild.xml
runprebuild.bat
2013-11-23 19:13:22 +00:00
Justin Clark-Casey (justincc)
ea9e96dd50
Update OpenSimulator to use .NET 4.0
...
This allows region modules to register script functions that have more than a couple of arguments.
It also allows OpenSimulator code to use the feature and syntax additions that came with .NET 4.0
Windows users will need to install Microsoft .NET 4 framework if they have not done so already.
Windows C# Express 2010 also becomes the minimum IDE for build, so runprebuild.bat now generates a 2010 solution and runprebuild2010.bat goes away
Official minimum mono version becomes 2.10.8.1. OpenSimulator will probably work with 2.8 later but this is not guaranteed.
2013-11-08 21:13:05 +00:00
Melanie
ba203ed94f
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2013-11-03 21:34:36 +00:00
Fernando Oliveira
ff8a768258
Fernando Oliveira's Postgress SQL Server Data Connector as a single commit.
...
* Added PostGreSQL support
* Added MySQL/MySQLXGroupData.cs
* PostgreSQL data access implementation
* PostgreSQL dll binarie and RegionStore.migrations
* Migrations Scripts from MSSQL to POSTGRES
* Postgres SQL Type fixes
* Postgres SQL Connection string
* Data type issues
* more fixes
* tests and +tests
* UUID x string - FIGHT!
* Fixed PG types to internal csharp types
* More data type fix (PostgreSQL fields are case sensitive) :(
* more field case sensitive fixes
* changed the migration files to be case sensitive for fields.
* fixed fields case
* finished converting, now search for hidden bugs.
* some more fixes
* bool type fixed
* more case fixes;
* creatorID case fixed
* case fields fixed
* fixed default now() for TMStamp fields with don't allow nulls.
* fix case sensitve for Region name and Estate name
* fixed case for names for search
* fix class name Error
* Bug fixed on select and migrations
* Un-Reverting my change due to Postgres issue with the ILIKE function
* Fixed some issued for Diva Distro
* Fixes for integration with Diva Distro
* Added System.Core to prebuild.xml for PG project
* Configured to make DIff for Push to OpenSim Project
* Diffs only to PostgreSQL mods.
2013-10-12 16:33:45 -05:00
Melanie
75c68fa29e
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Data/MySQL/MySQLSimulationData.cs
OpenSim/Data/MySQL/Resources/RegionStore.migrations
OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
OpenSim/Region/CoreModules/World/LightShare/LightShareModule.cs
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
OpenSim/Region/Framework/Scenes/Tests/ScenePresenceCapabilityTests.cs
OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2013-10-04 20:03:12 +01:00
Robert Adams
455d36c4c7
BulletSim: add physChangeLinkParams to set individual parameters on link constraints. Not fully functional. Remove double definition of ExtendedPhysics parameters by having BulletSim reference the optional module (addition to prebuild.xml and usings).
2013-09-11 09:11:52 -07:00
Melanie
21f5e67030
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
2013-08-01 01:23:24 +01:00
Justin Clark-Casey (justincc)
9f05a7ac7b
Include missing reference that probably stops windows build from commit 1299592405
2013-08-01 00:25:59 +01:00
Mic Bowman
1299592405
Experimental comment to eneralize the handling of Linden caps when the
...
cap is something other than "localhost". A new interface for handling
external caps is supported with an example implemented for Simian. The
only linden cap supporting this interface right now is the GetTexture
cap.
2013-07-31 15:37:15 -07:00
Melanie
7830cc9954
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs
OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs
OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
OpenSim/Services/HypergridService/UserAgentService.cs
2013-07-18 10:08:10 +01:00
Justin Clark-Casey (justincc)
f57f49eede
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-07-11 23:05:10 +01:00
Justin Clark-Casey (justincc)
44e9849ed1
Fix regression where llHTTPRequests which did not get an OK response returned 499 and the exception message in the http_response event rather than the actual response code and body.
...
This was a regression since commit 831e4c3
(Thu Apr 4 00:36:15 2013)
This commit also adds a regression test for this case, though this currently only works with Mono
This aims to address http://opensimulator.org/mantis/view.php?id=6704
2013-07-11 23:02:30 +01:00
Diva Canto
51d106cff8
Added a test for the asset service
2013-07-11 14:21:57 -07:00
justincc
ccceb6d6d2
Fix windows build break fromrecent dd1f95 for real this time - put new dll reference in the wrong place
2013-07-06 00:52:54 +01:00
Justin Clark-Casey (justincc)
a44ad01492
Fix build break from recent commit dd15f95
on windows
2013-07-06 00:32:11 +01:00
Melanie
5ddcc25ee9
Merge branch 'master' into careminster
2013-07-04 22:32:58 +01:00
Justin Clark-Casey (justincc)
16f40c1a15
Add --default option to "debug lludp packet" command to allow packet logging to be performed immediately from client start
2013-07-04 17:29:53 +01:00
Melanie
f70357eaa3
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Framework/Monitoring/BaseStatsCollector.cs
OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs
OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
2013-06-23 01:59:57 +01:00
Justin Clark-Casey (justincc)
9501a583cb
Make number of inbound http requests handled available as a httpserver.<port>.IncomingHTTPRequestsProcessed stat
2013-06-18 23:07:18 +01:00
Justin Clark-Casey (justincc)
0d2fd0d914
Make general server stats available on the robust console as well as the simulator console
...
This means the "show stats" command is now active on the robust console.
2013-06-17 22:39:00 +01:00
Melanie
7c0bfca7a0
Adding Avination's PollService to round out the HTTP inventory changes
2013-06-07 23:43:45 +01:00
Melanie
fe4a67efb6
Merge branch 'avination-current' into careminster
...
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
2013-06-06 03:20:15 +01:00
Melanie
a7dbafb0e3
Port Avination's inventory send throttling
2013-06-05 23:42:50 +01:00
Melanie
648e258b8e
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs
2013-06-04 21:09:25 +01:00
BlueWall
328883700a
UserProfiles
...
UserProfiles for Robust and Standalone. Includes service and connectors for Robust and standalone opensim plus matching region module.
2013-05-30 17:59:18 -04:00
Melanie
669fa3ff9a
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs
2013-05-30 21:48:09 +01:00
Justin Clark-Casey (justincc)
4898f18f89
Add HG regression TestCachedUserNameForNewAgent()
2013-05-29 21:28:38 +01:00
Melanie
09c2cd0d76
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2013-05-24 00:45:08 +01:00
Robert Adams
f490522082
BulletSim: specify directory for OpenSim.Region.Physics.Meshing
...
DLL file in prebuild.xml since that file ends up in bin/Physics
directory.
2013-05-22 21:09:37 -07:00
Robert Adams
ffc9b3dda7
BulletSim: add code to experimentally use asset hull data.
...
Default to 'off' as it needs debugging.
2013-05-22 21:01:00 -07:00
Robert Adams
6596a1de80
Revert "BulletSim: add code to experimentally use asset hull data."
...
This reverts commit 2fd8819a04
.
Remove this code until I can figure out why the references that are
clearly in prebuild.xml doesn't work for the
'using OpenSim.Region.Physics.Meshing' in BSShape.cs.
2013-05-21 22:16:18 -07:00
Robert Adams
2fd8819a04
BulletSim: add code to experimentally use asset hull data.
...
Default to 'off' as it needs debugging.
2013-05-21 21:32:30 -07:00
Melanie
b89d18e6f4
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
2013-04-30 23:45:38 +01:00
Justin Clark-Casey (justincc)
a7cbb9edc9
Add regression test for offer, accept and subsequent receiver delete of an item offered via instant message.
2013-04-29 20:50:49 +01:00
Melanie
4275d7a839
Merge branch 'avination-current' of ssh://3dhosting.de/var/git/careminster into avination-current
...
Conflicts:
bin/Regions/Regions.ini.example
2013-04-28 19:03:39 +02:00
Melanie
231c298ca5
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
bin/OpenMetaverse.StructuredData.XML
bin/OpenMetaverse.XML
bin/OpenMetaverseTypes.XML
2013-04-21 14:11:39 +01:00
BlueWall
f40abc493a
Small fix to prebuild xml for building with mono tools
2013-04-20 11:54:05 -04:00
dahlia
d5419f0a46
Initial experimental support for materials-capable viewers. This is in a very early stage and this module is disabled by default and should only be used by developers for testing as this module could cause data corruption and/or viewer crashes. No materials are persisted yet.
2013-04-18 01:03:19 -07:00
Kevin Cozens
cbc9ae898c
Added missing functionality (mainly custom headers) to llHTTPRequest.
2013-03-29 23:32:11 +00:00
Melanie
5b950ca36a
Merge commit '464201b41d5f5fdd7c88ab5e95dd7b6fbae6d766' into careminster
2013-03-19 00:54:23 +00:00
Justin Clark-Casey (justincc)
03075359b5
Finally remove the 'REST' ApplicationPlugins code which has been non-functional and largely commented out for many years.
2013-03-15 23:48:40 +00:00
Melanie
b9146a7922
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Framework/Servers/BaseOpenSimServer.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2013-03-15 23:45:32 +00:00
Justin Clark-Casey (justincc)
924d6e892a
Make it possible to chain another asset service underneath the de-duplicating XAssetService.
...
This makes it possible to use the dedupliicating service without needing to migrate all the existing asset data beforehand.
Currently controlled by a ChainedServiceModule setting in [AssetService] (e.g. ChainedServiceModule = "OpenSim.Services.AssetService.dll:AssetService")
Not yet ready for use.
2013-03-15 21:53:39 +00:00
Melanie
70f0587558
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
2013-03-08 01:07:05 +00:00
Justin Clark-Casey (justincc)
5751ecde52
Add code for testing event queue messages recevied on region cross.
...
This is currently disabled pending an improvement in the test code to properly add avatars when an event queue module is present.
2013-03-06 23:06:00 +00:00
Melanie
a675f7d4c3
Merge branch 'master' into careminster
2013-03-01 23:54:00 +00:00
Robert Adams
b2087add96
Add missing prebuild.xml dependency for System.Action2<t1,t2> in recent additions
...
to ScriptEngine tests. Compiles some places but not others.
2013-02-28 15:17:07 -08:00
Melanie
578174d21c
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs
OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
2013-02-27 18:05:04 +00:00
Justin Clark-Casey (justincc)
2bfbfc5725
minor: Remove unnecessary very old System.Net reference in OpenSim.Region.ScriptEngine.Shared
2013-02-26 23:43:06 +00:00
Justin Clark-Casey (justincc)
b8a7c8b26f
Add regression test for llRequestUrl()
2013-02-26 23:36:36 +00:00
Melanie
9534d5f929
Merge branch 'master' into careminster
2013-02-22 01:28:54 +00:00
Diva Canto
036d73c52a
This should fix the build fail. Fingers crossed.
2013-02-19 07:55:20 -08:00
Diva Canto
9380d01976
First commit of Diva Groups. The Data bits went to OpenSim.Data core, the rest to Addons.Groups.dll.
2013-02-19 07:26:40 -08:00
Diva Canto
5e709b087c
Donating Diva OfflineIM as an addon in a single dll, OpenSim.Addons.OpenSim.dll
2013-02-18 15:44:00 -08:00
Melanie
8b78b9429d
Merge branch 'avination' into careminster
2013-02-07 21:26:55 +00:00
Melanie
45f5a6a6db
Merge branch 'master' into careminster
...
Conflicts:
bin/HttpServer_OpenSim.dll
2013-02-07 20:51:51 +00:00
teravus
94a5232d3a
* Adds Websocket support to baseHttpServer and IHttpServer.cs . This allows modules to set up a websocket server that websocket clients can connect to. An example module is in OptionalModules/Example/WebSocketEchoTest/WebSocketEchoModule.cs
2013-02-07 10:50:17 -05:00
Melanie
598f891d70
Move SoubleQueu to Util. Change HTTP inv to prioritize COF. Determine COF for SP
2013-02-06 04:03:32 +01:00