ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-05-27 04:16:00 +08:00
Code Issues Packages Projects Releases Wiki Activity
19,368 Commits 5 Branches 93 Tags
fc576df273e41b47ff66b4bb503b9f86ded96cdb
Commit Graph

2874 Commits

Author SHA1 Message Date
Melanie
0fe0b2ceec Prevent objects rezzed in sim from being seen as attachments and becoming uneditable or crashers. (Foxtail of death) 2012-04-17 23:39:41 +02:00
Melanie
b39de2425c Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
	OpenSim/Region/CoreModules/World/Land/LandObject.cs
	OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
 2012-04-07 04:52:14 +01:00
Diva Canto
806082cd6e Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2012-04-06 20:35:01 -07:00
Diva Canto
9637e50956 Moved the inventory manipulation from HGEntityTransferModule to HGInventoryAccessModule where it belongs. They need to exchange some events, so added those to EventManager. Those events (TeleportStart and TeleportFail) are nice to have anyway. 2012-04-06 20:34:31 -07:00
Justin Clark-Casey (justincc)
cce760dbfc Rather than having a FromFolderID property on every single prim and only ever using the root prim one, store on SOG instead. 
This reduces pointless memory usage.
 2012-04-07 00:40:55 +01:00
Justin Clark-Casey (justincc)
7d8bb33c5b Store FromItemID for attachments once on SOG instead of on every SOP and only ever using the root part entry. 
This eliminates some pointless memory use.
 2012-04-07 00:33:02 +01:00
Diva Canto
6a9f36788d Deleted the unused and commented code from 2 commits ago. 2012-04-06 12:28:15 -07:00
Diva Canto
4c32f79c10 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2012-04-06 11:52:38 -07:00
Diva Canto
25b3edc21c WARNING: LOTS OF COMMENTED AND UNUSED CODE IN THIS COMMIT. This is on purpose; it's an historical record of what works and what doesn't wrt manipulating inventory at the viewer. I'll remove the unused code in a subsequent commit, but wanted to place it in history. The uncommented code works. 2012-04-06 11:51:12 -07:00
Diva Canto
6eaff18961 Finish the implementation of GetUserInventory, even though it's still not used. 2012-04-06 11:38:47 -07:00
Snoopy Pfeffer
8f45eb913c Revert last commit 2012-04-05 11:10:05 +02:00
Snoopy Pfeffer
e4406c846d Group based access restrictions to parcels require group membership, but not that this group is active for that user. 2012-04-05 10:25:54 +02:00
Snoopy Pfeffer
600a86bcae Little bug fix in HasGroupAccess, to properly store the case "true" in the cache. 2012-04-05 10:02:18 +02:00
Melanie
a5d6b624f6 Simplify group access checks and break them out into a separate method. 
Use existing cache if the avatar is within the region and use an
ExpiringCache to cache status if the avatar is not in the region. The
30 second delay now applies to scripted objects ony and only when the owner
is not present.
 2012-04-05 00:45:58 +01:00
Snoopy Pfeffer
36c8fa16c0 Implements group based access restrictions for parcels of land. Because of caching there can be a delay of up to 30 seconds until the access rights are effectively changed for a user. 2012-04-05 00:53:40 +02:00
Melanie
77caa286a4 Remove some unneeded parens 2012-04-04 23:48:37 +02:00
Melanie
c7419a4d61 Adjust Snoopy's contribution for AVN 2012-04-05 00:36:30 +01:00
Melanie
3a0aac97b4 Merge branch 'master' into careminster 2012-04-04 23:57:50 +01:00
Melanie
63c44719f7 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
	OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
 2012-04-03 23:52:53 +01:00
Garmin Kawaguichi
9a9923405a terrain save-tile extensions Signed-off-by: Garmin Kawaguichi <garmin.kawaguichi@magalaxie.com> 
Signed-off-by: Melanie <melanie@t-data.com>
 2012-04-03 20:06:03 +01:00
Justin Clark-Casey (justincc)
7468299673 Eliminate race condition where many callers would check SOP.PhysicsActor != null then assume it was still not null in later code. 
Another thread could come and turn off physics for a part (null PhysicsActor) at any point.
Had to turn off localCopy on warp3D CoreModules section in prebuild.xml since on current nant this copies all DLLs in bin/ which can be a very large number with compiled DLLs
No obvious reason for doing that copy - nothing else does it.
 2012-04-03 05:51:38 +01:00
Melanie
a6c26b093c Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster 2012-03-31 02:31:57 +01:00
Melanie
f3132c45d9 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
	OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
	OpenSim/Tests/Common/Mock/TestClient.cs
 2012-03-31 02:18:02 +01:00
Justin Clark-Casey (justincc)
32a953fed7 refactor: Rename SOG.GetChildPart() to GetPart() since it can also return the 'root' part. 2012-03-31 01:52:06 +01:00
Justin Clark-Casey (justincc)
387d7fdad5 Allow llRegionSayTo() to work on the PUBLIC_CHANNEL, as per http://wiki.secondlife.com/wiki/LlRegionSayTo 
Addresses http://opensimulator.org/mantis/view.php?id=5950
 2012-03-31 01:29:13 +01:00
Justin Clark-Casey (justincc)
69fc8c4985 minor: small message adjustment and unnecessary code elimination when notifying client of no build permission 2012-03-31 01:07:14 +01:00
PixelTomsen
874140f950 fix Infinite loading on No Rez http://opensimulator.org/mantis/view.php?id=5932 2012-03-31 01:01:59 +01:00
Justin Clark-Casey (justincc)
3525c876c8 Make default "show friends" console command show friends fetched from the friends service. 
There is no a --cache option which will show friends from the local cache if available.
 2012-03-30 01:57:38 +01:00
Justin Clark-Casey (justincc)
bce7964ac2 refactor: Move "friends show cache" console command out into separate FriendsCommandsModule. 
Expose required methods on IFriendsModule.  Rename GetFriends() -> GetFriendsFromCache() for self-documentation
 2012-03-30 01:05:29 +01:00
Justin Clark-Casey (justincc)
59157d9d63 Add simple login test with online friends. Add IFriendsModule.GrantRights() for granting rights via a module call. 
Rename IFriendsModule.GetFriendPerms() -> GetRightsGrantedByFriend() to be more self-documenting and consistent with friends module terminology.
Add some method doc.
 2012-03-30 00:42:55 +01:00
Melanie
5e3999c84c Cache the last maptile and return the cachrd tile if the last request is 
less than an hour ago. Avoids generating the maptile twice on startup.
 2012-03-29 22:34:33 +02:00
Justin Clark-Casey (justincc)
bf09d6a22b refactor: Stop passing both IClientAPI and agentID to friend event listeners, these are redundant. Replace a few magic numbers with FriendRights enum already used elsewhere. 2012-03-29 18:31:57 +01:00
Melanie
b9d61d5413 Allow the map tile module to be enabled without also eabling refresh 2012-03-29 15:38:12 +02:00
Justin Clark-Casey (justincc)
012b01f224 Add simple regression test for logging in with offline friends. Don't expect to receive any in this instance. 2012-03-29 03:19:45 +01:00
Justin Clark-Casey (justincc)
22a85b947a Add back parts of reverted changes that were not concerned with child agent caching. 
This adds ScenePresence to IClientAPI.SceneAgent earlier on in the add client process so that its information is available to EventManager.OnNewClient() and OnClientLogin()
Also add a code comment as to why we're caching friend information for child agents.
 2012-03-29 01:26:30 +01:00
Melanie
bd83676d6c Change namespace on CallingCardModule and correct interface file placemant. Also ass OpenSource header 2012-03-29 01:13:08 +01:00
Justin Clark-Casey (justincc)
93ac47f0d3 Revert "Simplify friends caching by only doing this for root agents - no functions require caching for child agents." 
We need to cache child agents so that friends object edit/delete permissions will work across boarders on regions hosted by different simulators.

This reverts commit d9f7b8549b.
 2012-03-29 01:08:47 +01:00
Melanie
c52ff5cf7b Committing the Avination calling card module 2012-03-29 00:47:09 +01:00
Melanie
532e3dad26 Pushing the Avination Calling card hooks. Module to follow. 2012-03-29 00:31:11 +01:00
Justin Clark-Casey (justincc)
d9f7b8549b Simplify friends caching by only doing this for root agents - no functions require caching for child agents. 
This allows us to avoid unnecessary multiple calls to the friends service.
All friends functions originate from the root agent and only go to other root agents in existing code.
This also allows us to eliminate complex ref counting.
 2012-03-28 23:40:25 +01:00
Diva Canto
6bf4d88397 HG 2.0 Suitcase inventory: proof of concept now working properly with the heavy SendBulkInventoryUpdate message. Waiting for Melanie to finish the light-weight version of that message. 2012-03-28 15:32:19 -07:00
Diva Canto
51dc1e709c HG 2.0: added the beginning of HGSuitcaseInventoryService. Plus moved the hack away from ScenePresence. This is better but it still doesn't restore the inventory upon arrival. 2012-03-28 15:01:37 -07:00
Melanie
a85876bc17 Committing the Avination calling card module 2012-03-28 23:51:44 +02:00
Melanie
7dad1ded2e Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
 2012-03-29 00:27:35 +01:00
Diva Canto
4007f62158 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2012-03-27 19:09:03 -07:00
Diva Canto
300968e933 HG: Switch root folders from under the viewer. Towards HG 2.0. This is guarded by an obscure config that no one but me should be using at this point. 2012-03-27 19:08:29 -07:00
Justin Clark-Casey (justincc)
12d3ea3029 Add "friends show cache <first-name> <last-name>" command for debugging purposes. 
This adds a reverse lookup (name -> ID) to IUserManagement instead of hitting the UserAccountService directly.
 2012-03-28 02:51:34 +01:00
Melanie
300488f862 Merge branch 'master' into careminster 2012-03-28 02:46:54 +01:00
Melanie
b18b1b1d70 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
 2012-03-27 23:14:43 +01:00
Diva Canto
db5f46fa23 Let grided simulators retrieve the user's inventory skeleton 2012-03-27 15:24:55 -07:00