Tom
66dec3b874
Resolve merge commits, stage 1
2011-09-04 07:06:36 -07:00
Justin Clark-Casey (justincc)
ca9a054bba
Don't set a GridUser entry for NPCs.
...
Resolves http://opensimulator.org/mantis/view.php?id=5665
2011-08-31 18:03:07 +01:00
Justin Clark-Casey (justincc)
be357f8fee
Fix bug in persisting saved appearances for npcs
...
Assets have to be marked non-local as well as non-temporary to persist. This is now done.
Hopefully addresses http://opensimulator.org/mantis/view.php?id=5660
2011-08-30 01:58:32 +01:00
Justin Clark-Casey (justincc)
014cd4f8bb
remove mono compiler warnings
2011-08-23 21:41:16 +01:00
Justin Clark-Casey (justincc)
4a9b8184f7
For now, supress 'OH NOES' warnings given by HGInventoryBroker.CacheInventoryServiceURL when it tries to cache it for an NPC
...
This concept is meaningless for NPCs. However, it might be better to make NPCism an actual property on ScenePresence and check.
Addresses http://opensimulator.org/mantis/view.php?id=5643
2011-08-17 01:51:58 +01:00
Justin Clark-Casey (justincc)
cace6eaa8a
comment out some of the currently less useful debug log messages
2011-08-11 02:06:32 +01:00
Justin Clark-Casey (justincc)
17e9d61f43
Change GridService.GetRegionByName() to only return info if there is an exact region name match, unlike GetRegionsByName()
...
This should fix the first part of http://opensimulator.org/mantis/view.php?id=5606 , and maybe 5605.
Thanks to Melanie for helping with this.
2011-08-02 00:52:48 +01:00
Justin Clark-Casey (justincc)
504de8bc47
Pass the first name and last name from the agent circuit data to the authorization service rather than from the account.
...
This is to accomodate situations where the authorization service is being used by the hypergrid, where visitors have no user account.
See http://opensimulator.org/mantis/view.php?id=5517 , this code is somewhat adapted/cleaned up from Michelle's patch
I'm a little ambivalent about this since visitors could put anything in firstname/lastname so it's not much of an auth measure.
It's up to the auth service to decide which data it actually uses.
Possibly we should be passing through other info such as agent circuit ip
2011-07-23 03:48:53 +01:00
root
c920ff9d1d
Merge branch 'master' into careminster-presence-refactor
2011-07-09 01:06:46 +01:00
Justin Clark-Casey (justincc)
a048ec3f95
stop the local inventory services connector from logging an error when an item id isn't found.
...
making this query is legitimate and so the log line can cause false positivies. It is up to callers to log an error if appropriate.
2011-07-08 22:34:03 +01:00
Melanie
6ae73aea49
Merge branch 'master' into careminster-presence-refactor
2011-06-20 03:11:34 +01:00
Diva Canto
7819b4a794
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-06-16 17:15:12 -07:00
Diva Canto
409738726d
Added a couple of guards and warnings to the MapImage/MapImageServiceModule.
2011-06-16 17:14:41 -07:00
Mic Bowman
7a4fbdac7c
Added an expiring cache for region information to the
...
RemoteGridService connector. Timeout is currently set at five
minutes. Negative results are not cached.
The result is that operations like send an instant message do
not have to go through the grid service every time.
2011-06-15 11:22:51 -07:00
Melanie
9b1d3f0c38
Merge branch 'master' into careminster-presence-refactor
2011-06-13 12:38:17 +01:00
Diva Canto
fd57c91b4a
First pass at making the V2 map work. Standalones only for now. There are some issues with the zoom level -- TBD.
2011-06-12 15:37:42 -07:00
Melanie
326c46ba70
Merge branch 'master' into careminster-presence-refactor
2011-06-09 02:05:04 +01:00
Diva Canto
d60f525baa
HG inventory transfers over the profile working.
2011-05-27 08:19:40 -07:00
Diva Canto
e19031849e
Added necessary code to drop inventory on hg friends using the profile window, but can't test because this mechanism doesn't seem to work without a profile service.
2011-05-24 09:38:03 -07:00
Melanie
be1996f121
Merge branch 'master' into careminster-presence-refactor
2011-05-22 20:23:25 +01:00
Justin Clark-Casey (justincc)
bb9b317f15
Get rid of OpenSim.Tests.Common.Setup subpackage in favour of just OpenSim.Tests.Common instead
2011-05-21 01:05:20 +01:00
Melanie
af55eda16b
Merge branch 'master' into careminster-presence-refactor
2011-05-03 14:26:18 +01:00
Diva Canto
00e94b0ba8
Check for RegionID instead of RegionHandle. Other minor tweaks
2011-04-30 16:53:11 -07:00
Melanie
d1cf1fe3d7
Merge branch 'master' into careminster-presence-refactor
2011-04-30 14:37:37 +01:00
Diva Canto
9892e115cc
Fatpack message on agent transfers: 1 message only (UpdateAgent) containing the agent and all attachments. Preserves backwards compatibility -- older sims get passed attachments one by one. Meaning that I finally introduced versioning in the simulation service.
2011-04-28 20:19:54 -07:00
Melanie
9bf5e94b70
Merge branch 'master' into careminster-presence-refactor
2011-04-25 23:18:32 +01:00
Diva Canto
ef4f1fc4ba
Made things consistent between LocalInventoryServiceConnector and RemoteXInventoryServiceConnector on GetFolderContent.
2011-04-25 11:00:48 -07:00
Melanie
474910c9d6
Merge branch 'master' into careminster-presence-refactor
2011-04-17 18:48:53 +01:00
Justin Clark-Casey (justincc)
a0d80140f2
Make all the objects in a coalescence reappears after being loaded from an IAR. This still doesn't work proprerly since some required textures/contained item assets might be missing.
...
From pure code inspection, it looks like the uuid gatherer may get most asset uuids because the scene object serializer naively pulls non-root parts from all contained scene objects into one mega-object. However, root part uuids may well still be missing, and there may be other odd artifacts from this bug.
It appears that storing the size of the coalescence and the offsets is redundant, since one can work out this information from the position data already in the scene object groups.
2011-04-15 00:42:06 +01:00
Melanie
9165a5207d
Merge branch 'master' into careminster-presence-refactor
2011-03-10 07:14:03 +00:00
Justin Clark-Casey (justincc)
9456bb77fb
Upgrade nunit.framework.dll to version 2.5.9. Fix up tests appropriately.
...
This version removes the NUnit.Framework.SyntaxHelpers namespace, so any modules with their own tests will need to delete this using statement.
2011-03-09 23:25:24 +00:00
Mic Bowman
3c0d607f45
Changed order of checks for local regions when processing
...
AgentUpdate messages. Should improve throttles and reprioritization
when an avatar is moving.
2011-03-04 17:17:53 -08:00
Melanie
918c12c965
Change the QUERYACCESS method to eliminate spurious access denied messages
2011-02-16 08:06:11 +00:00
Melanie
cfce0aa448
Change the QUERYACCESS method to eliminate spurious access denied messages
2011-02-16 05:22:05 +01:00
Melanie
e2762a68b3
Merge branch 'master' into careminster-presence-refactor
2011-02-12 00:42:10 +00:00
Diva Canto
d934add021
Thanks Tokeiito for noticing this bug. mantis #5366
2011-02-07 14:49:18 -08:00
Melanie
076f2ac8db
Merge branch 'master' into careminster-presence-refactor
2011-02-07 23:07:36 +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
Diva Canto
2c7e87c45b
Better output for show neighbours
2011-02-06 07:51:20 -08: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
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
Melanie
24a768a99b
Merge branch 'master' into careminster-presence-refactor
2011-01-29 04:47:32 +00:00
Justin Clark-Casey (justincc)
ab1ec3c3cc
minor: remove a few mono compiler warnings
2011-01-28 21:51:25 +00:00
Melanie
188d86998d
Fix up QueryAccess to also check parcels
2011-01-28 04:09:04 +00:00
Melanie
657c14c5db
Fix up QueryAccess to also check parcels
2011-01-28 03:07:25 +01:00
Melanie
dd1980c24c
Add an interface for a region's user account cache
2011-01-27 02:58:14 +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
Melanie
dbbf43663e
Add a careminster API to scripting again
2011-01-24 02:16:28 +01:00
Diva Canto
52f88f5739
Spawn a threadlet upon receiving requests to close agents. The operation may take too long, and we don't need to keep the caller waiting.
2011-01-07 10:04:39 -08:00
Melanie
9971766256
Implement Scope ID lookup on GetLandData. Stacked regions were not handled
...
properly
2011-01-03 19:40:55 +00:00
