aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/prebuild.xml (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Intermediate commit. Sill errors.Melanie2014-01-051-1/+4
|\ | | | | | | | | | | | | | | | | | | | | 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
| * Create regression test TestSendAgentGroupDataUpdate() for groups agent data ↵Justin Clark-Casey (justincc)2013-12-181-1/+4
| | | | | | | | sending
* | Merge branch 'master' into careminsterMelanie2013-12-071-1/+0
|\ \ | |/
| * use System.IO.Compression.DeflateStream for mesh decompression in an attempt ↵dahlia2013-12-061-1/+0
| | | | | | | | to reduce mesh asset decoding failures
* | Merge branch 'master' into careminsterMelanie2013-11-231-104/+104
|\ \ | |/ | | | | | | | | | | | | | | Conflicts: .gitignore OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs prebuild.xml runprebuild.bat
| * Update OpenSimulator to use .NET 4.0Justin Clark-Casey (justincc)2013-11-081-100/+100
| | | | | | | | | | | | | | | | 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.
* | Merge branch 'master' into careminsterMelanie2013-11-031-0/+36
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * Fernando Oliveira's Postgress SQL Server Data Connector as a single commit.Fernando Oliveira2013-10-121-0/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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.
* | Merge branch 'master' into careminsterMelanie2013-10-041-0/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * BulletSim: add physChangeLinkParams to set individual parameters on link ↵Robert Adams2013-09-111-0/+1
| | | | | | | | constraints. Not fully functional. Remove double definition of ExtendedPhysics parameters by having BulletSim reference the optional module (addition to prebuild.xml and usings).
* | Merge branch 'master' into careminsterMelanie2013-08-011-0/+2
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
| * Include missing reference that probably stops windows build from commit ↵Justin Clark-Casey (justincc)2013-08-011-0/+1
| | | | | | | | 12995924052a1804f01dceb80803447fccc1d9fe
| * Experimental comment to eneralize the handling of Linden caps when theMic Bowman2013-07-311-0/+1
| | | | | | | | | | | | | | 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.
* | Merge branch 'master' into careminsterMelanie2013-07-181-0/+29
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-07-111-0/+27
| |\
| | * Added a test for the asset serviceDiva Canto2013-07-111-0/+27
| | |
| * | Fix regression where llHTTPRequests which did not get an OK response ↵Justin Clark-Casey (justincc)2013-07-111-0/+1
| |/ | | | | | | | | | | | | | | 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
| * Fix windows build break fromrecent dd1f95 for real this time - put new dll ↵justincc2013-07-061-1/+1
| | | | | | | | reference in the wrong place
| * Fix build break from recent commit dd15f95 on windowsJustin Clark-Casey (justincc)2013-07-061-0/+1
| |
* | Merge branch 'master' into careminsterMelanie2013-07-041-0/+1
|\ \ | |/
| * Add --default option to "debug lludp packet" command to allow packet logging ↵Justin Clark-Casey (justincc)2013-07-041-0/+1
| | | | | | | | to be performed immediately from client start
* | Merge branch 'master' into careminsterMelanie2013-06-231-0/+2
|\ \ | |/ | | | | | | | | | | | | 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
| * Make number of inbound http requests handled available as a ↵Justin Clark-Casey (justincc)2013-06-181-0/+1
| | | | | | | | httpserver.<port>.IncomingHTTPRequestsProcessed stat
| * Make general server stats available on the robust console as well as the ↵Justin Clark-Casey (justincc)2013-06-171-0/+1
| | | | | | | | | | | | simulator console This means the "show stats" command is now active on the robust console.
| * Adding Avination's PollService to round out the HTTP inventory changesMelanie2013-06-071-0/+1
| |
| * Port Avination's inventory send throttlingMelanie2013-06-051-0/+1
| |
* | Merge branch 'avination-current' into careminsterMelanie2013-06-061-0/+3
|\ \ | | | | | | | | | | | | | | | | | | | | | 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
| * \ Merge branch 'avination-current' of ssh://3dhosting.de/var/git/careminster ↵Melanie2013-04-281-124/+210
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | into avination-current Conflicts: bin/Regions/Regions.ini.example
| * \ \ Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2013-01-261-0/+1
| |\ \ \
| * \ \ \ Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-12-031-136/+273
| |\ \ \ \
| * \ \ \ \ Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-09-241-1/+0
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-09-241-0/+1
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-09-241-0/+1
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-09-171-2/+2
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-09-171-0/+1
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-09-111-1/+1
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-09-111-0/+1
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | dummy commitubit2012-09-111-1/+2
| | | | | | | | | | | | |
| * | | | | | | | | | | | try fixing building..ubit2012-08-161-0/+2
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'master' into careminsterMelanie2013-06-041-0/+38
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs
| * | | | | | | | | | | | UserProfilesBlueWall2013-05-301-0/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | UserProfiles for Robust and Standalone. Includes service and connectors for Robust and standalone opensim plus matching region module.
* | | | | | | | | | | | | Merge branch 'master' into careminsterMelanie2013-05-301-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs
| * | | | | | | | | | | | Add HG regression TestCachedUserNameForNewAgent()Justin Clark-Casey (justincc)2013-05-291-0/+1
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'master' into careminsterMelanie2013-05-241-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * | | | | | | | | | | | BulletSim: specify directory for OpenSim.Region.Physics.MeshingRobert Adams2013-05-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DLL file in prebuild.xml since that file ends up in bin/Physics directory.
| * | | | | | | | | | | | BulletSim: add code to experimentally use asset hull data.Robert Adams2013-05-221-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Default to 'off' as it needs debugging.
| * | | | | | | | | | | | Revert "BulletSim: add code to experimentally use asset hull data."Robert Adams2013-05-211-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 2fd8819a043269f9308cb46c71893e6eb35a426e. 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.
| * | | | | | | | | | | | BulletSim: add code to experimentally use asset hull data.Robert Adams2013-05-211-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Default to 'off' as it needs debugging.
* | | | | | | | | | | | | Merge branch 'master' into careminsterMelanie2013-04-301-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * | | | | | | | | | | | Add regression test for offer, accept and subsequent receiver delete of an ↵Justin Clark-Casey (justincc)2013-04-291-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | item offered via instant message.
generated by cgit v1.1 at 2024-11-05 16:51:16 +0000