Commit Graph

13324 Commits (15e0b55e66b7906f4b45f4e0a8761d5c5315668c)

Author SHA1 Message Date
Justin Clark-Casey (justincc) 3c89527b22 Fix bug where llSetPrimMediaParams() reported success but never set the media texture.
We weren't setting the TextureEntryFace.MediaFlags = true when a media texture was set directly via a script.  This was being done when the viewer was setting them directly.
2011-03-05 00:06:51 +00:00
Melanie 0719ffa6fa Change protection from being teleported home to extend to incognito gods. 2011-03-01 23:34:02 +01:00
Diva Canto b82b0b1677 Normalizing comparison to lower case, just in case ppl set their config vars inconsistently. (maybe related to mantis #5386) 2011-03-01 09:20:50 -08:00
Melanie cea47491de Fix a few little things 2011-02-27 19:49:23 +00:00
Melanie 9b277b372b Merge branch 'master' into careminster-presence-refactor 2011-02-27 19:47:37 +00:00
Melanie 11105d38bd Fix a few little things 2011-02-27 18:55:17 +01:00
Justin Clark-Casey (justincc) 2b04cab1ee change some log messages from info to debug 2011-02-25 02:15:06 +00:00
Justin Clark-Casey (justincc) 0f545abfc1 Make the file expiration defaults the same whether the whole [FLOTSAM ASSET CACHE] section is missing or just the particular config values 2011-02-25 01:31:38 +00:00
Justin Clark-Casey (justincc) 939c47ac52 instead of using different default memory expiration depending on whether there is a [FLOTSAM ASSET CACHE] section present at all, use the same default all the time
this simplifies the code
2011-02-25 01:25:38 +00:00
Justin Clark-Casey (justincc) beff0ac32f log actual cache directory for FlotsamAssetCache instead of always logging the default 2011-02-25 01:18:43 +00:00
Justin Clark-Casey (justincc) 197cc3883f Fix bug where having no maximum memory cache timeout would cause the flotsam asset cache to try using Double.MaxValue, which would cause the underlying OpenMetaverse.ExpiringCache to choke.
There is probably an underlying bug to fix in ExpiringCache.
2011-02-25 01:16:47 +00:00
Justin Clark-Casey (justincc) 2f5394e70d Fix bug where avatars in other regions would not always show up on the mini-map 2011-02-24 22:33:54 +00:00
Melanie 9be1d2aef1 Merge branch 'master' into careminster-presence-refactor 2011-02-24 02:37:21 +00:00
Justin Clark-Casey (justincc) db7c758b7f On a Grid Handler exception, explicitly log the exception message and stack trace so that we get somewhat better diagnostics on windows 2011-02-24 00:55:50 +00:00
Mic Bowman 1bb0bae78a Forces the owner of a rezzed object to be the "rezzer" of the
object rather than the owner of the inventory item. In theory,
this shouldn't happen unless you are using grid-wide library
for inventory.
2011-02-22 13:30:38 -08:00
Mic Bowman 5a16fa882c Parameterizes the view distance used to compute and manage
child agents in neighbor regions. This means you can extend
the view on a simulator beyond the default 3x3 regions.

This uses a region default draw distance and should be
replaced at some point by the avatar specified draw distance.
That will require more careful, dynamic recomputation of child
agents every time the draw distance changes.

WARNING: this is experimental and has known instabilities. specifically
all regions "within site" should be running the same default draw distance
or agents will not be closed correctly.
2011-02-22 13:23:54 -08:00
Marck af22b7cb1a GetRegion(s)ByName with SQLite behaves like it does with other databases.
The in-memory storage of region data that is used by default with SQLite now handles wildcards in region names in the same way as SQL queries do with other databases.
2011-02-22 13:00:45 +01:00
Melanie 87e9acf714 Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor 2011-02-21 04:16:33 +01:00
Melanie 1a31f7b579 Allow modifying a no mod object through llGiveInventoryItem if the object
sets allowed drop. This makes breedables feasible.
2011-02-21 04:14:49 +01:00
Melanie efd8d03c59 Prevent giving copies of no copy scripts or transferring no trans scripts
through LSL
2011-02-21 04:02:47 +01:00
Melanie 04dc43f591 Prevent attaching things you don't own from inworld. Simple solution for a
complex issue
2011-02-21 04:02:16 +01:00
Mike Rieker 86decb2aa8 throttle group notices to max of 4 threads at a time
...otherwise it can create hundreds of threads and hang
2011-02-20 15:57:57 +00:00
Melanie 5a78161e74 Restore heartbeat thread 2011-02-19 01:32:20 +01:00
Melanie 4834b47679 Merge branch 'master' into careminster-presence-refactor 2011-02-19 01:59:49 +00:00
Justin Clark-Casey (justincc) 9e47018cfb Remove test T020_TestMakeRootAgent() which hasn't been active for ages anyway
This test was non-viable.  Keeping inactive T021_TestCrossToNewRegion() around for now since it's still useful for reference purposes in constructing a future working test.
2011-02-19 00:14:13 +00:00
Justin Clark-Casey (justincc) b3a1d8c7f7 Remove unused SceneSetupHelpers.DeleteObjectAsync().
Calling async code in automated tests is never a good idea - things become very fragile very quickly
2011-02-19 00:11:08 +00:00
Justin Clark-Casey (justincc) 9d668b09ca remove unused code to share services between scenes in SceneSetupHelpers - this is done differently elsewhere 2011-02-19 00:07:16 +00:00
Justin Clark-Casey (justincc) 60fe3d48ee Put some CapabilitiesModule null checks in Scene
Stop tests setting up a capabilities module by default
2011-02-18 23:50:54 +00:00
Justin Clark-Casey (justincc) 8249d77991 If GridService.GetNeighbours() could not find the region then log a warning rather than causing a null reference on the normal log line
This also extends the TestChildAgentEstablished() test to actually activate the EntityTransferModule, though the test is not yet viable
2011-02-18 23:25:59 +00:00
Justin Clark-Casey (justincc) 5c92f62941 minor: remove mono compiler warning 2011-02-18 23:10:46 +00:00
Justin Clark-Casey (justincc) dd9efc1838 extend TestChildAgentEstablished() test slightly to put in EntityTransferModule. Not yet enabled. 2011-02-18 23:05:56 +00:00
Justin Clark-Casey (justincc) eb699df5f6 On SceneSetupHelpers, go back to calling ScenePresence.CompleteMovement() for the last stage of AddRootAgent() instead of SP.MakeRootAgent()
Going this extra step doesn't appear to cause any test failures.
This is arguably better for test purposes, though at some stage another method may arise which does just call AddRootAgent().
2011-02-18 22:49:19 +00:00
Justin Clark-Casey (justincc) 023f953f39 remove another unused test teardown method 2011-02-18 22:25:45 +00:00
Justin Clark-Casey (justincc) c155f57dbe remove unused test teardown method 2011-02-18 22:22:51 +00:00
Justin Clark-Casey (justincc) c763edf56d separate attachment tests out into their own class 2011-02-18 22:20:08 +00:00
Justin Clark-Casey (justincc) 60d47836ce minor: remove mono compiler warning 2011-02-18 22:00:52 +00:00
Justin Clark-Casey (justincc) 88da253c94 Add very basic test which invokes the scene update loop once and checks the frame number.
This makes Scene.Update() match its original description of performing a single update, which also matches the semantics of SOG and ScenePresence.
2011-02-18 21:54:44 +00:00
Justin Clark-Casey (justincc) e774679f62 minor: add method doc to a few ScenePresence methods 2011-02-18 21:19:16 +00:00
Justin Clark-Casey (justincc) 4725221435 Stop the avatar sometimes pausing for more than a second on the border when region crossing.
This restores a RemoveFromPhysicalScene() call in ScenePresence.CheckForBorderCrossing() when the agent has been placed in transit.
If we don't remove the agent from the physical scene, then the method continues to be called via ScenePresence.Update()
until the handover of the client between regions is completed.  Since this handover can take more than 1000ms (due to the 1000ms
event queue polling response from the server), this results in the avatar pausing on the border for the entire handover period.
2011-02-18 20:54:00 +00:00
Melanie c79f79fc84 Add needed dummy to sample money 2011-02-17 18:51:43 +01:00
Marck 4f9c3c73ad Add support for new naming syntax of linked regions to osTeleportAgent and osTeleportOwner. 2011-02-17 13:47:13 +01:00
Marck 47a5d8d742 Make osTeleportOwner work in foreign regions by relaxing the restrictions on teleporting an agent. 2011-02-17 13:47:12 +01:00
Diva Canto dd4a503a22 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2011-02-16 09:57:43 -08:00
Diva Canto c6f2d66eae Fix bug introduced by Query Access. The response does not come in a packaged _Result field, it comes as simple OSDMap with 2 fields in it.
Also in this commit: comment out irrelevant debug message on AuthService.
2011-02-16 09:57:12 -08:00
Marck 25265c964f Changed console command "alert" and added new command "alert-user".
This addresses Mantis #4709.
Command "alert" always sends a message to everybody; the variant "alert general" has been removed. Sending messages to one user is done with the dedicated command "alert-user".
2011-02-16 18:36:57 +01:00
Marck 5c15c5e0ff Changed default directory for storing map tile images from remote regions. 2011-02-16 18:36:40 +01:00
Diva Canto fc84225038 XFF capitalization strikes again -- this time in the XMLRPC method. mantis #5386 2011-02-16 08:18:49 -08:00
Melanie 918c12c965 Change the QUERYACCESS method to eliminate spurious access denied messages 2011-02-16 08:06:11 +00:00
Melanie 3f93db8371 Streamline ban line processing. Remove remnants of old advisory messages.
Centralize ban checking and prepare for adding a "ban and eject" function.
2011-02-16 05:23:30 +01:00
Melanie cfce0aa448 Change the QUERYACCESS method to eliminate spurious access denied messages 2011-02-16 05:22:05 +01:00
Melanie ccd6e5d071 Merge branch 'master' into careminster-presence-refactor 2011-02-16 02:41:49 +00:00
BlueWall c75e916ccf Set filter to send proper rotations for root part
This allows the root prim, alone or in a set, to send it's
	rotation. This fixes unsitting the avatar on sit-offsest
	type teleports where the sit target is in the root prim of
	a linkset.
2011-02-13 07:42:53 -08:00
Marck 19d3792278 Fix and simplify QBasedComparer.
Make parsing of qvalues independent from a system's language setting and ensure that the comparison adheres to a descending order.
2011-02-13 11:11:49 +01:00
Diva Canto c169a62f55 Typo 2011-02-12 18:05:25 -08:00
Melanie ba03e2e262 Add the country functions in the careminster API 2011-02-12 20:59:09 +01:00
Diva Canto a8ced66e87 Improved error message on TP failure 2011-02-12 07:28:21 -08:00
Justin Clark-Casey (justincc) 9801bf03f8 minor: add comment explaining that GetRegionsByName needs to stay in TeleportAgent for its side effects. 2011-02-12 01:14:12 +00:00
Justin Clark-Casey (justincc) 03d82a5a85 Fix bug where "My estate" name was always used even if the user entered a different name on initial setup.
Turns out we had stopped saving estate settings immediately after the name change.  The scene constructor then reloade the settings and oblitereted the different name.
This code could be more efficient since there's no reason for scene to reload the settings when they are already known to be valid.
Thanks to Thoneve for the spot on this.
2011-02-12 01:08:56 +00:00
Justin Clark-Casey (justincc) 7e21c1eadf Hack in a crude temporary "estate show" command
This will show the estate for each region, along with that estate's id and the estate owner.
This is temporary because the command output might change.
This commit also converts the estate module from the old to the new region module format
2011-02-12 00:46:01 +00:00
Justin Clark-Casey (justincc) 26727ee044 refactor: split out estate management commands into separate class 2011-02-11 23:32:38 +00:00
Justin Clark-Casey (justincc) 754c244f46 In SQLiteSimulationData.RemoveLandObject(), don't manually remove the row from the data adaptor's Rows list in addition to calling Delete.
This matches the behaviour for other deletions and stops this operation failing on Windows .NET (though mono is fine with the duplication).
Probably a holdover from copying code from the older legacy adaptor.
Resolves http://opensimulator.org/mantis/view.php?id=5361
2011-02-11 23:06:14 +00:00
Melanie 413f0c6848 Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor 2011-02-11 23:53:52 +01:00
Melanie e2762a68b3 Merge branch 'master' into careminster-presence-refactor 2011-02-12 00:42:10 +00:00
Justin Clark-Casey (justincc) 8fd58aa00c add estate name to show regions console command 2011-02-11 22:10:02 +00:00
Diva Canto 45382e6f82 Reinstated a couple of null checks related to the previous revert. 2011-02-10 06:26:26 -08:00
Diva Canto 89bb5c0941 Revert "Hunting down mantis #5365"
This reverts commit ebeef02fef.
2011-02-10 06:09:04 -08:00
Diva Canto 21715396fa Put the Ack of UseCircuitCode back to where it used to be. Some ppl are reporting login issues. 2011-02-09 17:45:19 -08:00
Diva Canto f33e51e2ff Comment instrumentation out. Not needed anymore. Left in comments, in case it is needed again. Mantis #5365 2011-02-09 09:50:26 -08:00
Diva Canto 1cd951e5ae Fix the negative number problem in TokenBucket. mantis #5365 2011-02-09 09:39:53 -08:00
Diva Canto 830fee145d Revert "Brute-force debug -- mantis #5365"
This reverts commit 585473aade.
2011-02-09 08:35:36 -08:00
Diva Canto 1bba9c6300 Revert "Don't build strings unless we're in emergency debugging."
This reverts commit ba202ea9b0.
2011-02-09 08:35:21 -08:00
Diva Canto 477a869fb2 More detection of negatives. 2011-02-09 08:08:57 -08:00
Diva Canto 473fac4dc7 Detect negative dripAmounts in TokenBuckets. These negatives result from overflown integer operations. Also added Total to the scene throttles in show throttles. 2011-02-09 08:06:20 -08:00
Diva Canto ba202ea9b0 Don't build strings unless we're in emergency debugging. 2011-02-08 21:09:10 -08:00
Diva Canto 585473aade Brute-force debug -- mantis #5365 2011-02-08 20:12:33 -08:00
Diva Canto 117462cba1 Avoid potential race conditions on UseCircuitCode. I artificially made the race condition happen, and got very similar results to those described in mantis #5365 -- no prims/avie sent back. 2011-02-08 17:53:01 -08:00
Diva Canto f431bd20ec Minor addition to the previous commit 2011-02-08 14:49:50 -08:00
Diva Canto 82846afe4b Minor improvement to previous commit. 2011-02-08 12:37:37 -08:00
Melanie f62cb1fcbe Temp fix (or is it a fox?) for map weirdness 2011-02-08 21:13:31 +01:00
Diva Canto ac7bc78555 Added emergency monitoring of UDP Outgoing packets thread. Just type "emergency-monitoring on/off" 2011-02-08 12:06:14 -08:00
Diva Canto 34bd41d186 Comment previous debug 2011-02-08 11:16:38 -08:00
Diva Canto 305c755cfb XFF header again -- debug. 2011-02-08 07:50:01 -08:00
Diva Canto d627122cdc Mantis #5368 -- exception on WorldMap 2011-02-07 19:44:55 -08:00
Diva Canto d934add021 Thanks Tokeiito for noticing this bug. mantis #5366 2011-02-07 14:49:18 -08:00
Melanie 8c20f94939 Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor 2011-02-07 22:26:09 +01:00
Melanie 076f2ac8db Merge branch 'master' into careminster-presence-refactor 2011-02-07 23:07:36 +00:00
Melanie 6becaf65e1 Fix merge issues 2011-02-07 22:28:59 +00:00
Melanie 3889e68c54 Merge branch 'master' into careminster-presence-refactor
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
2011-02-07 22:08:53 +00:00
Melanie e8ba3d3a10 Prevent a nonexistent inventory item from throwing an exception 2011-02-07 22:25:43 +01:00
Diva Canto ebeef02fef Hunting down mantis #5365
Revert "refactor: remove redundant null checks"

This reverts commit 6e58996b4d.
2011-02-07 07:45:03 -08:00
Diva Canto 98ea78fc77 New command: show pending-objects 2011-02-06 19:39:29 -08:00
Diva Canto 2c7e87c45b Better output for show neighbours 2011-02-06 07:51:20 -08:00
Diva Canto 3411d4867d Honor check of m_Enabled in WorldViewModule. 2011-02-05 19:40:55 -08:00
Diva Canto cc81d924ca Fixed Caps handlers leak 2011-02-05 19:34:02 -08:00
Diva Canto 30fa5ad1e2 One more diagnosis command:
show caps
2011-02-05 19:21:12 -08:00
Diva Canto b20ab1063f Added a couple of console commands to help diagnose issues:
show circuits: shows the lists of agent circuit data
show http-handlers: shows the currently registered http handlers
2011-02-05 17:57:30 -08:00
Diva Canto 3a2a48a8ca Add sane packing of ServiceURLs -- OSDMap. The old way (OSDArray) is still supported for backwards compatibility, but will be removed in the future. 2011-02-05 08:20:13 -08:00
Diva Canto 67555994ad Amend to yesterday's deletions: forgot to delete the RemoteInventory module in th addin.xml file. 2011-02-05 07:55:54 -08:00
Melanie f78831ec98 Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim 2011-02-05 04:25:14 +00:00
Melanie 4e0b0f0f4c Fix a typo in the QUERYACCESS method name 2011-02-05 04:24:43 +00:00
Diva Canto 632babf8fb Added an additional debug message, and removed a bunch of files that weren't being used anymore -- the old RemotsInventory connectors stuff. 2011-02-04 19:19:38 -08:00
Diva Canto f5a3eb9fd5 Added a config var to HGInventoryAccessModule called OutboundPermission that 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... 2011-02-04 17:05:45 -08:00
Justin Clark-Casey (justincc) cdd64bb8f5 For now, reinstate the call to World.GridService.GetRegionsByName() 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()
2011-02-05 00:15:25 +00:00
Justin Clark-Casey (justincc) 1ffd70cef7 minor: remove some mono compiler warnings 2011-02-04 23:20:10 +00:00
Justin Clark-Casey (justincc) 5b7a5a5b8b Add position to IM sent from llInstantMessage(), to better fulfill client expectations 2011-02-04 23:14:21 +00:00
Justin Clark-Casey (justincc) a51005aacd Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2011-02-04 23:08:27 +00:00
Justin Clark-Casey (justincc) 722f0ba18c Put something in the ImprovedInstantMessage.BinaryBucket for 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
2011-02-04 23:07:47 +00:00
Mic Bowman bb69a40fbb Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2011-02-04 14:22:17 -08:00
Mic Bowman 7a6e1fa4cf Convert SimianMaptile refresh time from ms to seconds. Too many 0's
in the config file.
2011-02-04 14:21:18 -08:00
Justin Clark-Casey (justincc) bc2e254b55 minor: fix indentation, spacing on commit 3585130
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.
2011-02-04 21:55:22 +00:00
unknown 3585130ac8 SetTexture_fix 2011-02-04 21:52:06 +00:00
Justin Clark-Casey (justincc) 456cdee5ce minor: correct a log spelling mistake that was pointed out to me 2011-02-04 21:42:45 +00:00
Justin Clark-Casey (justincc) 2ddec29c61 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2011-02-04 21:15:41 +00:00
Diva Canto 144f367863 Bug fixed on map search for HG. Affected queries that had a region name at the end. 2011-02-04 12:57:22 -08:00
Kevin Cozens 034327b51f Send object date to viewer in microseconds (Fixes mantis bug #3990) 2011-02-04 20:55:41 +00:00
Justin Clark-Casey (justincc) 1613d89383 minor: Correct misspelling of neighbour in log messages.
Thanks Fly-Man-
2011-02-04 20:51:51 +00:00
Kitto Flora 511b12db6b Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor 2011-02-04 17:32:31 +00:00
Kitto Flora b6dda231f2 Corrections for Avatar Auto-pilot target; add llStopMoveToTarget() for Avatar-attached. 2011-02-04 17:31:52 +00:00
Justin Clark-Casey (justincc) ba8826d2b8 Fix "set log level" to once again display current log level if it's not given a parameter
This addresses http://opensimulator.org/mantis/view.php?id=5345
2011-02-04 17:11:35 +00:00
Tom 9a9c9644ac Repair x-query-string 2011-02-03 17:25:55 -08:00
Mic Bowman cf24069227 Change UpdateAgent (for changes in agent position) to be sent
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.
2011-02-03 12:43:46 -08:00
Diva Canto 8fdc810a23 Addresses mantis #5360: CreatorData was being written as long as it wasn't 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. 2011-02-03 04:07:36 -08:00
Melanie 595891409c Add another flag 2011-02-02 21:45:37 +01:00
Justin Clark-Casey (justincc) 4f7cf491e6 Comment out texture CAPS 'texture not found' message for now 2011-02-02 20:02:10 +00:00
Justin Clark-Casey (justincc) 2413e9eb3f Record number of resent packets in LindenUDP stack and display in stats report 2011-02-02 20:00:50 +00:00
Justin Clark-Casey (justincc) 2344150b6e Stop double counting dequeued packets for packets sent number
This is already being incremented in LLUDPServer.SendPacketFinal for every packet
2011-02-02 19:39:33 +00:00
Melanie 722ae4f031 Add a missing constand and fix ToDoubleList to not eat the last memeber 2011-02-02 20:22:03 +01:00
Melanie 4a56038d11 Change the timeout on WebUtil to 20s to help make more tps succeed 2011-02-02 03:28:47 +01:00
Melanie ba39d9f0e6 Squash a nullref 2011-02-02 03:10:39 +01:00
Tom e5ef993f2b Fix cm/15627 : Don't block the entire URL on duplicate requests, just that particular request! 2011-01-31 18:01:53 -08:00
Justin Clark-Casey (justincc) 0898be5750 Change SimianGroupsServicesConnectorModule.GetAgentGroupMembership() so that 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.
2011-01-31 22:54:36 +00:00
Tom 35d29ef3e3 If llHTTPRequest results in an error, still attempt to get the response text. If we can't (which implies the server is unreachable), return the StatusDescription as before. 2011-01-29 19:38:05 -08:00
Tom a2d51f0ff4 Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor 2011-01-29 12:46:47 -08:00
Tom 188bdfc878 Ignore duplicate llHTTPResponse calls to the same request. Prevents response corruption. Only the first llHTTPResponse call is obeyed, akin to SL. 2011-01-29 12:45:53 -08:00
Melanie c14acf8a06 Adapt to CM 2011-01-29 04:51:11 +00:00
Melanie 24a768a99b Merge branch 'master' into careminster-presence-refactor 2011-01-29 04:47:32 +00:00
Melanie 8f008f394d Flash out the prim count module 2011-01-29 04:27:20 +00:00
Melanie e7d5ff9bd2 Create the structure of classes and interfaces to replace the cruft that
is in the land management module today
2011-01-29 02:24:27 +00:00
Tom 87ed39c953 Significantly increase the total number of URL's available. In second life, the limit is 15,000 URL's (one per prim), so i'd hope we can manage 1k. 2011-01-28 16:51:35 -08:00
Melanie 0936455725 Adding the prim count module skeleton 2011-01-28 23:44:17 +00:00
Melanie 38bfdb0c9d Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim 2011-01-28 23:22:16 +00:00
Melanie 5942385d0e Add the prim count interfaces 2011-01-28 23:21:41 +00:00
Justin Clark-Casey (justincc) 933f47e89d Comment out unused call to GridService in TeleportAgent() 2011-01-28 22:59:07 +00:00
Justin Clark-Casey (justincc) a4acf485d7 minor: don't bother reparsing the sources for includes if ReadConfig() was unsuccessful 2011-01-28 22:50:49 +00:00
Justin Clark-Casey (justincc) 1fcb919798 If a non-globbed included file from config cannot be found then warn the user 2011-01-28 22:46:29 +00:00
Justin Clark-Casey (justincc) ab1ec3c3cc minor: remove a few mono compiler warnings 2011-01-28 21:51:25 +00:00
Tom 13d4fedf7a Fix a discrepancy vs. SL with parsing x-query-string 2011-01-28 13:45:27 -08:00
Kevin Cozens a0380af18f Display supported file extensions/formats in "terrain load help" (Mantis #5349) 2011-01-28 21:24:05 +00:00
Kevin Cozens 9798b044fe Added loading and saving of terrain files using Terragen format (Mantis #1564)
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.
2011-01-28 21:19:53 +00:00
Tom ffbfc14689 Make llRequestAgentData shout an error instead of crashing the script when an invalid UUID is passed to it. 2011-01-28 09:55:46 -08:00
Melanie ab48caad08 Make the new style stuff compatible with the older revision 2011-01-28 05:25:53 +00:00
Melanie 188d86998d Fix up QueryAccess to also check parcels 2011-01-28 04:09:04 +00:00
Melanie d91ee131b9 Make the new style stuff compatible with the older revision 2011-01-28 04:31:21 +01:00
Melanie 3bce53b6e6 Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor 2011-01-28 04:05:49 +01:00
Kitto Flora 9abaac4d60 Correct chat source location for Av seated on daughter prim. 2011-01-28 04:35:43 +00:00
Melanie 0ea8046545 Change the way ban lines are handled. Remove a lot of useless stuff designed
to physically move the avatar and instead just re-set the position. Ban lines
now work fully.
2011-01-28 04:04:30 +01:00
Melanie d90b0c53ec Fix bumping into sim borders and check estate bans for walking crossings 2011-01-28 02:38:14 +00:00
Melanie 3834000778 Change the way ban lines work 2011-01-28 03:35:59 +01:00
Melanie 80bf95b7b4 Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim 2011-01-28 02:34:45 +00:00
Melanie 5a0cb7d37e Thank you, Goetz, for a patch to fix prim count display in cut regions. 2011-01-28 02:34:07 +00:00
Melanie 657c14c5db Fix up QueryAccess to also check parcels 2011-01-28 03:07:25 +01:00
Melanie 566eff17de Comment a very spammy debug message that was being output directly to console.
My last fox that makes bumping into sim borders/bans work makes this spam
endlessly.
2011-01-28 01:46:30 +01:00
Melanie 57bf5d9b2a Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor 2011-01-28 02:37:59 +00:00
Melanie 3f200da878 Merge branch 'master' into careminster-presence-refactor 2011-01-28 02:36:20 +00:00
Melanie 7492131bb6 Fix bumping into sim borders and check estate bans for walking crossings 2011-01-28 01:37:37 +01:00
Justin Clark-Casey (justincc) f9ea5e69c5 Refactor: Break out LoadObjects() and LoadParcels() from a longer method 2011-01-27 21:07:21 +00:00
Justin Clark-Casey (justincc) 19e4473a97 Put confirmation on "land clear" command to avoid nasty accidents 2011-01-27 20:57:59 +00:00
Melanie 3435816541 Merge branch 'master' into careminster-presence-refactor 2011-01-27 20:54:02 +00:00
Justin Clark-Casey (justincc) be3685b1a2 When an oar is loaded, do not create a default parcel before loading the parcels from the OAR.
The region spanning parcel shouldn't exist in this situation.  If it does, when the land data is loaded it is repersisted with a local ID which comes after the ones loaded via the oar, which obliterates the oar loaded one.

Resaving the data we just loaded from the database is somewhat odd in itself (though this makes sense from the way that OAR loading was already using the same event).
2011-01-27 20:36:50 +00:00
Justin Clark-Casey (justincc) 42c0dbf49a Show local IDs in "land show" output.
Also properly insert region name in "land clear" command
2011-01-27 20:11:30 +00:00
Justin Clark-Casey (justincc) ab9a0f2f1d Add "land clear" command
This clears all parcels from the currently selected region and replaces them with the single region spanning default parcel owned by the estate owner
2011-01-27 19:37:20 +00:00
Justin Clark-Casey (justincc) 5a26dc2743 Fix OAR parcel loading so that old parcels are replaced by the new instead of merged.
The --merge switch will still merge the old and new land parcelling.
2011-01-27 18:48:48 +00:00
Justin Clark-Casey (justincc) e33cb3db93 remove unused CreateBaseLand() 2011-01-27 16:50:41 +00:00
Melanie b0f641fa15 Make it work 2011-01-27 06:41:07 +00:00
Melanie b13eac9996 Make the estate setting "Allow direct teleport" override the constraint
of local tepeports to landing points like it is meant to
2011-01-27 07:07:33 +01:00
Melanie 2a9e712cb4 Let gods TP in wherever they like while in god mode 2011-01-27 07:03:43 +01:00
Melanie 8568c6a7c0 Implement "Cannot teleport closer to destination" message 2011-01-27 06:57:54 +01:00
Melanie 1143e022b4 Make landing points work on local teleports. Constrain owners and gods to
landing points when coming from off sim (matches agni) to prevent landing
in floors or other prims.
2011-01-27 06:45:53 +01:00
Melanie 17801bd78b Add a TeleportFlags member to SP so we can tell how we got there. 2011-01-27 05:33:46 +00:00
Melanie adb341e32f Also set Godlike flag. Might be useful 2011-01-27 05:33:01 +00:00
Melanie 61b67b2ead Add TeleportFlags.ViaRegionID to the flags sent on login when the region
was entered by hand to determine whether or not to honor the landing
point
2011-01-27 05:32:54 +00:00
Melanie eca82d90c2 Change the way landing points are honored 2011-01-27 06:04:56 +01:00
Melanie d894007920 Make it work 2011-01-27 05:46:31 +01:00
Melanie 4cc8d84281 Fix build break 2011-01-27 05:30:39 +00:00
Melanie 42c22f41dd Merge branch 'master' into careminster-presence-refactor 2011-01-27 05:18:28 +00:00
Melanie c43b892f3a Add a TeleportFlags member to SP so we can tell how we got there. 2011-01-27 04:14:41 +01:00
Melanie 1f19bd5f90 Also set Godlike flag. Might be useful 2011-01-27 03:54:41 +01:00
Melanie 3b8b606eeb Add TeleportFlags.ViaRegionID to the flags sent on login when the region
was entered by hand to determine whether or not to honor the landing
point
2011-01-27 03:49:32 +01:00
Melanie 0e1d28a862 Clear user account cache before checking flags on login. This will make AV
and other bannable flags work in this case.
2011-01-27 03:05:33 +01:00
Melanie dd1980c24c Add an interface for a region's user account cache 2011-01-27 02:58:14 +01:00
Melanie 307a2c61ef Fix merge artifacts 2011-01-27 02:43:52 +01:00
Melanie 3321f9d745 Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor 2011-01-27 02:29:10 +01:00
Melanie 11c742a5a8 Make bans work for teleport. Now teleport will complete block if the user
is not allowed on the estate. If the user is allowed on no parcel, the
teleport will also be blocked. If the user is allowed on a parcel, but
not the desired one, the user will be shifted to the closest allowed
location.
2011-01-27 02:16:41 +01:00
Tom 31fb448cfc Mostly revert the last commit with the aim of searching for a better solution 2011-01-26 17:06:17 -08:00
Tom 6b27587bc7 Add a "useCached" parameter to GetUserAccount. Add a function to Scene to get the user flags. It has to be here due to access restrictions :/ 2011-01-26 16:25:08 -08:00
Tom 3ecf712e4d Add userFlags check to isBanned. This checks bans against DenyAnonymous and DenyMinors. Note that the ban doesn't actually work yet due to some stuff mel's working on . 2011-01-26 14:20:39 -08:00
Mic Bowman 2bab8e5538 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2011-01-26 13:35:21 -08:00
Mic Bowman 240c0eaf1d Remove the RestorePresences functions (which don't seem to be doing
anything) and clean up the code in AddNewClient (so Appearance only
gets assigned once, not three times).
2011-01-26 13:33:34 -08:00
Justin Clark-Casey (justincc) 8eb2789ae1 Add some comments on ILandObject.StartPoint and EndPoint 2011-01-26 21:19:22 +00:00
Justin Clark-Casey (justincc) a0469daf75 Implement command "land show". This shows all the parcels on the currently selected region/s
This is useful for diagnostics.  The command is "land show" rather than "show land" because it's implemented as a module specific subcommand.
2011-01-26 21:12:41 +00:00