aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
* Fix merge issuesMelanie2011-02-074-68/+7
|
* Merge branch 'master' into careminster-presence-refactorMelanie2011-02-0734-1733/+554
|\ | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Server/Handlers/Simulation/AgentHandlers.cs OpenSim/Services/Connectors/SimianGrid/SimianGridMaptileModule.cs OpenSim/Services/GridService/HypergridLinker.cs
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2011-02-0527-1694/+197
| |\
| | * Added an additional debug message, and removed a bunch of files that weren't ↵Diva Canto2011-02-046-1615/+5
| | | | | | | | | | | | being used anymore -- the old RemotsInventory connectors stuff.
| | * Added a config var to HGInventoryAccessModule called OutboundPermission that ↵Diva Canto2011-02-044-2/+25
| | | | | | | | | | | | controls whether the sim lets asset POSTs happen to foreign grids or not. It's True by default. If ppl want to allow foreign visitors but don't want to allow any assets out of their grid, they should set this to False. This is the beginning of policies for these things...
| | * For now, reinstate the call to World.GridService.GetRegionsByName() ↵Justin Clark-Casey (justincc)2011-02-051-1/+3
| | | | | | | | | | | | | | | | | | commented out in 933f47e Even though we don't use the results, just getting the regions may have side effects in making hypergrid links available for the later World.RequestTeleportLocation()
| | * minor: remove some mono compiler warningsJustin Clark-Casey (justincc)2011-02-042-5/+5
| | |
| | * Add position to IM sent from llInstantMessage(), to better fulfill client ↵Justin Clark-Casey (justincc)2011-02-041-1/+1
| | | | | | | | | | | | expectations
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2011-02-041-11/+12
| | |\
| | | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimMic Bowman2011-02-047-27/+45
| | | |\
| | | * | Convert SimianMaptile refresh time from ms to seconds. Too many 0'sMic Bowman2011-02-041-11/+12
| | | | | | | | | | | | | | | | | | | | in the config file.
| | * | | Put something in the ImprovedInstantMessage.BinaryBucket for ↵Justin Clark-Casey (justincc)2011-02-042-1/+18
| | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | llInstantMessage() to stop this crashing viewer 2.4.0 (1.23.5 was fine with this). We're putting in a string of format "<region name><x pos floor int><y pos floor int><z pos floor int> which appears to be the expected value. This resolves http://opensimulator.org/mantis/view.php?id=5356
| | * | minor: fix indentation, spacing on commit 3585130Justin Clark-Casey (justincc)2011-02-041-8/+8
| | | | | | | | | | | | | | | | | | | | this previous commit tries to look up the texture by name first before just using the uuid. this allows correct resolution of inventory textures which have uuids as names.
| | * | SetTexture_fixunknown2011-02-041-7/+6
| | | |
| | * | minor: correct a log spelling mistake that was pointed out to meJustin Clark-Casey (justincc)2011-02-041-1/+1
| | | |
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2011-02-041-4/+10
| | |\ \
| | | * | Bug fixed on map search for HG. Affected queries that had a region name at ↵Diva Canto2011-02-041-4/+10
| | | | | | | | | | | | | | | | | | | | the end.
| | * | | Send object date to viewer in microseconds (Fixes mantis bug #3990)Kevin Cozens2011-02-041-1/+2
| | |/ /
| | * | minor: Correct misspelling of neighbour in log messages.Justin Clark-Casey (justincc)2011-02-042-2/+2
| | | | | | | | | | | | | | | | Thanks Fly-Man-
| | * | Fix "set log level" to once again display current log level if it's not ↵Justin Clark-Casey (justincc)2011-02-041-12/+15
| | | | | | | | | | | | | | | | | | | | | | | | given a parameter This addresses http://opensimulator.org/mantis/view.php?id=5345
| | * | Make UUID 3a367d1c-bef1-6d43-7595-e88c1e3aadb3 reference a full alpha texture.Justin Clark-Casey (justincc)2011-02-031-0/+9
| | |/ | | | | | | | | | | | | | | | | | | | | | SL's viewer and some downstream projects assume that this UUID points to a full alpha texture, as per http://opensimulator.org/mantis/bug_view_advanced_page.php?bug_id=4751 and http://forums.kokuaviewer.org/viewtopic.php?f=8&t=1323 If the request isn't satified, some viewers will continuously make the request.
| | * Change UpdateAgent (for changes in agent position) to be sentMic Bowman2011-02-033-31/+81
| | | | | | | | | | | | | | | | | | once to each simulator rather than once to each region. This should help with some of the delays caused by multiple outstanding requests to a single service point.
| | * Addresses mantis #5360: CreatorData was being written as long as it wasn't ↵Diva Canto2011-02-032-1/+3
| | | | | | | | | | | | null. This made iars backwards incompatible when some items had non-null foreign creators. This patch adds an explicit option (-c) to preserve foreign creator information.
| * | Fix a typo in the QUERYACCESS method nameMelanie2011-02-051-1/+1
| |/
| * Comment out texture CAPS 'texture not found' message for nowJustin Clark-Casey (justincc)2011-02-021-3/+1
| |
| * Record number of resent packets in LindenUDP stack and display in stats reportJustin Clark-Casey (justincc)2011-02-023-14/+22
| |
| * Stop double counting dequeued packets for packets sent numberJustin Clark-Casey (justincc)2011-02-021-4/+5
| | | | | | | | This is already being incremented in LLUDPServer.SendPacketFinal for every packet
| * Change SimianGroupsServicesConnectorModule.GetAgentGroupMembership() so that ↵Justin Clark-Casey (justincc)2011-01-312-33/+52
| | | | | | | | | | | | | | it returns null if the user isn't a member of the group. This matches the behaviour of the same method for Flotsam Groups. This is the behaviour assumed by existing code. Method doc also added to IGroupsServicesConnector to the make the contract clear.
* | Repair x-query-stringTom2011-02-031-1/+1
| |
* | Add another flagMelanie2011-02-021-0/+1
| |
* | Add a missing constand and fix ToDoubleList to not eat the last memeberMelanie2011-02-022-1/+2
| |
* | Change the timeout on WebUtil to 20s to help make more tps succeedMelanie2011-02-021-4/+4
| |
* | Squash a nullrefMelanie2011-02-021-0/+2
| |
* | Fix cm/15627 : Don't block the entire URL on duplicate requests, just that ↵Tom2011-01-311-3/+3
| | | | | | | | particular request!
* | If llHTTPRequest results in an error, still attempt to get the response ↵Tom2011-01-291-1/+11
| | | | | | | | text. If we can't (which implies the server is unreachable), return the StatusDescription as before.
* | Merge branch 'careminster-presence-refactor' of ↵Tom2011-01-2912-64/+723
|\ \ | | | | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
| * | Adapt to CMMelanie2011-01-291-1/+1
| | |
| * | Merge branch 'master' into careminster-presence-refactorMelanie2011-01-2912-64/+723
| |\ \ | | |/
| | * Flash out the prim count moduleMelanie2011-01-291-0/+174
| | |
| | * Create the structure of classes and interfaces to replace the cruft thatMelanie2011-01-292-0/+122
| | | | | | | | | | | | is in the land management module today
| | * Adding the prim count module skeletonMelanie2011-01-282-0/+113
| | |
| | * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2011-01-289-64/+261
| | |\
| | | * Comment out unused call to GridService in TeleportAgent()Justin Clark-Casey (justincc)2011-01-281-1/+1
| | | |
| | | * minor: don't bother reparsing the sources for includes if ReadConfig() was ↵Justin Clark-Casey (justincc)2011-01-281-2/+3
| | | | | | | | | | | | | | | | unsuccessful
| | | * If a non-globbed included file from config cannot be found then warn the userJustin Clark-Casey (justincc)2011-01-281-3/+13
| | | |
| | | * Add groups cache timeout setting for Flotsam Groups back to OpenSimDefaults.iniJustin Clark-Casey (justincc)2011-01-281-0/+5
| | | |
| | | * minor: remove a few mono compiler warningsJustin Clark-Casey (justincc)2011-01-283-7/+8
| | | |
| | | * Display supported file extensions/formats in "terrain load help" (Mantis #5349)Kevin Cozens2011-01-281-2/+8
| | | |
| | | * Added loading and saving of terrain files using Terragen format (Mantis #1564)Kevin Cozens2011-01-282-50/+224
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Terrain files can now be loaded and saved using the Terragen (.ter) format. Selection of the terrain file loader to use is now based on the extension of the filename being loaded and the data is loaded using a memory stream instead of writing it to a file and then loading it from the file.
| | * | Add the prim count interfacesMelanie2011-01-281-0/+53
| | |/