ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-09 18:55:58 +08:00
Code Issues Packages Projects Releases Wiki Activity
33,458 Commits 5 Branches 94 Tags
master
Commit Graph

1890 Commits

Author SHA1 Message Date
Melanie
296cf04ce6 Merge branch 'master' into careminster-presence-refactor 2010-09-27 01:32:06 +01:00
Melanie
84ab4742c8 Quash the region ID on intersim messages. That prevents people from determining 
another avatars location
 2010-09-27 01:31:17 +01:00
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
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
9feef34a81 Merge branch 'master' into careminster-presence-refactor 2010-09-21 04:03:14 +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
5dc9ea2f24 * Changed 11 calls for session info to the more optimized API method 2010-09-08 15:08:49 -07: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
e4c2b44e5c Merge branch 'master' into careminster-presence-refactor 2010-09-05 15:06:00 +01: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)
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)
01276ef433 refactor: change AttachmentsModule.AttachObject to use sp.GetAttachments rather than filter sp.Attachments list directly 2010-08-31 22:22:45 +01:00
Melanie
79bfa275da Merge branch 'master' into careminster-presence-refactor 2010-08-30 02:30:28 +01:00
Justin Clark-Casey (justincc)
def6b1544f very minor log message and var name tweaking for iar saving 2010-08-28 02:40:21 +01:00
Justin Clark-Casey (justincc)
1c0b4457cd Improve liveness by operating on list copies of SOG.Children where appropriate 2010-08-28 00:40:33 +01:00
Justin Clark-Casey (justincc)
4f9931ec10 minor: reduce log chattiness of "load iar" for IARs with lots of folders 2010-08-27 23:23:55 +01:00
Justin Clark-Casey (justincc)
86937d0a0f allow inventory path specified in "load iar" to start with a / (e.g. /Objects is now valid where it wasn't before) 2010-08-27 23:22:49 +01:00
Justin Clark-Casey (justincc)
8f875700ef refactor: Make IAR tests set up standard iar for loading 2010-08-27 22:52:26 +01:00
Justin Clark-Casey (justincc)
2b0f924557 refactor: Move Scene.Inventory.UpdateKnownItem() into Attachments module since this appears to relate solely to attachments 2010-08-26 22:09:52 +01:00
Justin Clark-Casey (justincc)
f3f4428700 refactor: break out attachment position change code in Scene.UpdatePrimPosition() and move into AttachmentsModule 
This allows region modules to change attachment positions.
 2010-08-26 21:50:19 +01:00
Justin Clark-Casey (justincc)
8571a55d29 minor: change log message from info to debug 2010-08-26 20:42:56 +01:00
Justin Clark-Casey (justincc)
8031f8ec09 Improve consistency of locking for SOG.m_parts in order to avoid race conditions in linking and unlinking 2010-08-26 00:08:53 +01:00
Melanie
fc8d2be632 Merge branch 'master' into careminster-presence-refactor 
This was rather conflicted. Please test linking.
 2010-08-26 00:11:07 +01:00
Melanie
1bfec00a88 Merge branch 'master' into careminster-presence-refactor 2010-08-23 23:55:15 +01:00
Justin Clark-Casey (justincc)
74e5fe5aa9 Remove various warnings and improve logging messages. No functional changes. 2010-08-23 22:24:23 +01:00
Melanie
f8ff98577e Merge branch 'master' into careminster-presence-refactor 2010-08-21 00:32:26 +01:00
Marck
bb5dd9fbbc Some code cleanup for console command alert. 
Made parsing of parameters more robust.
Allow general alerts without specifying keyword 'general'.
Extended help texts.
 2010-08-20 17:53:21 +01:00
Melanie
e74809ff4c Merge branch 'master' into careminster-presence-refactor 2010-08-18 00:59:20 +01:00
Justin Clark-Casey (justincc)
9d84dfb687 minor: remove mono compiler warning 2010-08-13 21:44:44 +01:00