ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-07-13 19:14:51 +08:00
Code Issues Packages Projects Releases Wiki Activity
14,219 Commits 5 Branches 86 Tags
9f17ae580dd2c6000c1f90ad83bb00e1ba097666
Commit Graph

1516 Commits

Author SHA1 Message Date
Melanie
9f17ae580d Merge branch 'master' into careminster-presence-refactor 2010-09-26 23:57:06 +01:00
Melanie
6f78358b09 When receiving intersim IM, don't let the spoof protection bomb 2010-09-26 23:50:55 +01:00
Melanie
dc49057c8a Consistency patch: use Path.Combine() instead of + and eliminate the need 
for a trailing slash on exports/
 2010-09-26 20:03:00 +01:00
Melanie
0080f28f1d Merge branch 'master' into careminster-presence-refactor 2010-09-25 06:57:53 +01:00
Melanie
d8ae287ebf Prevent spoofing the agent name on text IM 2010-09-25 06:56:08 +01:00
Melanie
4fbdcb95a0 Merge branch 'master' into careminster-presence-refactor 2010-09-25 06:19:26 +01:00
Melanie
3b76d7bbb6 Fix a minor economy issue 2010-09-25 06:09:35 +01:00
Melanie
9feef34a81 Merge branch 'master' into careminster-presence-refactor 2010-09-21 04:03:14 +01:00
Melanie
2b8c99c2fb Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim 2010-09-21 04:02:50 +01:00
Melanie
14adf90805 Fix a typo 2010-09-21 04:02:34 +01:00
Melanie
10a37f5be4 Refactor script create permission into the perms module 2010-09-21 04:02:28 +01:00
Justin Clark-Casey (justincc)
889923841c Stop broadcasting non 0/DEBUG ChatTypeEnum.Region messages to all avatars 
This allows non public/debug region wide messages to be sent to scripts but not be broadast to avatars
 2010-09-18 01:43:22 +01:00
Melanie
7df4383235 Merge branch 'master' into careminster-presence-refactor 
Integrate the next large patch.
Don't use this version, it has a ghost avatar issue. Next push
will fix it.
 2010-09-17 03:49:30 +01:00
root
7762301cea Revert "* Changed 11 calls for session info to the more optimized API method" 
This reverts commit 5dc9ea2f24.
Also makes online indicators and IM more robust
 2010-09-17 01:57:26 +01:00
John Hurliman
860b2a502f Changed SceneObjectGroup to store parts with the fast and thread-safe MapAndArray collection 2010-09-16 17:30:46 -07:00
root
251f2444d0 Revert "* Changed 11 calls for session info to the more optimized API method" 
This reverts commit 5dc9ea2f24.
Also makes online indicators and IM more robust
 2010-09-17 01:50:48 +02:00
root
512ded6eb5 Catch a nullref 2010-09-16 21:07:09 +02:00
Melanie
1212cb0c74 Merge branch 'master' into careminster-presence-refactor 2010-09-14 22:03:42 +01:00
Justin Clark-Casey (justincc)
ae1a0150a1 Rename now protected method SetAttachmentInventoryStatus() to ShowAttachInUserInventory() to match ShowDetachInUserInventory() 2010-09-13 21:15:12 +01:00
Justin Clark-Casey (justincc)
cd153a20b7 Remove IAttachmentsModule.SetAttachmentInventoryStatus() from public interface 
No core module is calling and it makes more sense to call methods such as AttachObject() which attach both to the avatar and update inventory appropriately
 2010-09-13 21:05:03 +01:00
Justin Clark-Casey (justincc)
366de0a7b5 If attachment fails (e.g. because asset wasn't found) then don't try to set attachment as shown in inventory 
Doing this results in a null reference exception
 2010-09-13 20:58:50 +01:00
Justin Clark-Casey (justincc)
ff098ae110 minor: Clean up log messages generated when an item is attached 2010-09-13 20:44:32 +01:00
John Hurliman
5ef2da39d8 * Fixing length calculations for HTTP texture downloads (the end byte is inclusive in Range: headers) 2010-09-13 11:23:45 -07:00
Melanie
6a1ce17cdb Merge branch 'master' into careminster-presence-refactor 
The modules will need to be updated for this to compile and run again. Please
don't use until I do the companion commit to modules later on.
 2010-09-13 16:17:38 +01:00
Jeff Ames
f1f0bc23f4 Formatting cleanup. 2010-09-12 13:43:49 -04:00
John Hurliman
dd277a0d02 First pass at cleaning up thread safety in EntityManager and SceneGraph 2010-09-10 12:04:12 -07:00
John Hurliman
8415b98806 Over a dozen thread safety fixes in FriendsModule 2010-09-09 14:45:10 -07:00
John Hurliman
972ef92590 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2010-09-08 15:09:34 -07:00
John Hurliman
5dc9ea2f24 * Changed 11 calls for session info to the more optimized API method 2010-09-08 15:08:49 -07:00
Diva Canto
ae6682036d Made the HG asset and inventory brokers use the Helo service in order to instantiate the right network connectors. Tested on Robust only. 2010-09-08 14:13:01 -07:00
Diva Canto
d301f3fd6a Renamed the Helo server connector to a consistent name. Added this in connector to both Robust.HG.ini.example and HypergridServiceInConnectorModule. 2010-09-08 14:12:01 -07:00
Justin Clark-Casey (justincc)
b8d14fcc4a Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2010-09-08 01:05:56 +01:00
John Hurliman
0bebe94231 Rolling back the recent libomv update but keeping the ExpiringCache cleanups (as much as is possible). There was a report of non-finite avatar positions after the update 2010-09-07 15:45:33 -07:00
John Hurliman
9be1c0ff44 * Cache null account responses in the SimianUserAccountServiceConnector to avoid repeated requests for missing avatar IDs 
* Updated to OpenMetaverse r3442 to fix a timezone issue with ExpiringCache
 2010-09-07 14:41:13 -07:00
Justin Clark-Casey (justincc)
f7b28dd321 If a scene object part UUID is changed (only possible when not in a scene), then adjust the inventory items to point to the new uuid as well 2010-09-07 03:41:29 +01:00
Melanie Thielker
36cb6208b5 Fix yet another cause of "Ghost attachments" 2010-09-06 22:08:15 +01:00
Melanie Thielker
8886afd319 Fix yet another cause of "Ghost attachments" 2010-09-06 21:59:52 +02:00
Melanie Thielker
0246edc2ea Reflect the ParcelPropertiesUpdateRequest into Scene.EventManager, because 
modules need to see it (Search!) even if it comes in via CAPS
 2010-09-06 04:09:51 +01:00
Melanie Thielker
00a23eea0e Reflect the ParcelPropertiesUpdateRequest into Scene.EventManager, because 
modules need to see it (Search!) even if it comes in via CAPS
 2010-09-06 03:59:48 +02:00
Melanie
e4c2b44e5c Merge branch 'master' into careminster-presence-refactor 2010-09-05 15:06:00 +01:00
Melanie Thielker
6a0a878f7c Remove "Dwell" support from core and replace it with calls to methods 
on IDwellModule
 2010-09-05 14:28:33 +01:00
Melanie Thielker
e593607171 Remove "Dwell" support from core and replace it with calls to methods 
on IDwellModule
 2010-09-05 14:16:42 +02:00
Justin Clark-Casey (justincc)
1e8e98a07f Move code that allows llGiveInvetory() to move item into appropriate system folder up from connectors into Scene.Inventory.cs 
This fixes the problem for all architectures (hg as well as local and grid) and means we don't have to dupe code between connectors.
Not ideal in that it becomes non-modular, but methods in Scene.Inventory.cs should eventually be modularized anyway.
 2010-09-04 01:36:26 +01:00
Justin Clark-Casey (justincc)
107052b23d Create Scene.Inventory.cs.AddInventoryItem(InventoryItemBase item) 
The agentID in AddInventoryItem(UUID agentID, InventoryItemBase item) is redundant since it's contained in item.Owner, and it doesn't make sense for agentID != item.Owner, hence the method is deprecated.
 2010-09-04 00:09:53 +01:00
Justin Clark-Casey (justincc)
63617c79d8 minor: remove mono compiler warnings 2010-09-03 23:29:39 +01:00
Justin Clark-Casey (justincc)
8d2e8b7d5c minor: remove mono compiler warnings 2010-09-03 21:28:57 +01:00
Melanie
4e0d6e8e41 Merge branch 'master' into careminster-presence-refactor 2010-09-03 03:37:18 +01:00
Justin Clark-Casey (justincc)
6cbf66827b refactor: move SOG.AttachToAgent() into AttachmentsModule 2010-09-01 01:11:52 +01:00
Justin Clark-Casey (justincc)
c947a67b23 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2010-09-01 00:17:23 +01:00
Melanie Thielker
c47de94263 Adjust the "Magic numbers" we use because we can't reference the actual 
script state enum to reflect recent changes.
 2010-08-31 22:36:46 +01:00