ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-05-21 16:05:39 +08:00
Code Issues Packages Projects Releases Wiki Activity
16,952 Commits 5 Branches 93 Tags
8fac7c065088d9861ba2ff772fde7f2e9c8d1003
Commit Graph

256 Commits

Author SHA1 Message Date
Tom
66dec3b874 Resolve merge commits, stage 1 2011-09-04 07:06:36 -07:00
Justin Clark-Casey (justincc)
1bf29d60e1 Remove code which was automatically deleting non-root prims from scene objects that had previous been attachments. 
Looks like this code was accidentally uncommented in e1b5c612 from feb 2010.
Appears to resolve the rest of http://opensimulator.org/mantis/view.php?id=5664
 2011-09-01 22:05:05 +01:00
Justin Clark-Casey (justincc)
8d29d490a1 minor: remove some mono compiler warnings 2011-08-18 01:16:58 +01:00
Melanie
326c46ba70 Merge branch 'master' into careminster-presence-refactor 2011-06-09 02:05:04 +01:00
Chris Hart
5fb0455e92 Updates to MSSQL to most recent compatibility, also included Windlight support. Needs plenty of testing but clean install and migration from 0.6.9 have been tested and work, a few indexes still need to be added for performance. 2011-06-01 21:01:04 +01:00
Justin Clark-Casey (justincc)
5711ada5c9 Fix dumb sql mistake in MSSQLGenericTableHandler.Delete() 2011-05-31 22:42:18 +01:00
Diva Canto
336665e035 More on HG Friends. Added Delete(string, string) across the board. Added security to friendship identifiers so that they can safely be deleted across worlds. Had to change Get(string) to use LIKE because the secret in the identifier is not always known -- affects only HG visitors. BOTTOM LINE SO FAR: HG friendships established and deleted safely across grids, local rights working but not (yet?) being transmitted back. 2011-05-22 16:51:03 -07:00
Diva Canto
58c53c41de Fixed permissions bug related to friends in PermissionsModule. Added FriendsData[] GetFriends(string principalID) to IFriendsData and FriendInfo[] GetFriends(string PrincipalID) to IFriendsService. Refactored some more in the FriendsModule. Made client get notification of local friends permissions upon HGLogin. HG Friends object permissions work. 2011-05-21 16:48:00 -07:00
Melanie
e62d1cc480 Merge branch 'master' into careminster-presence-refactor 2011-05-20 22:38:05 +01:00
Justin Clark-Casey (justincc)
bdd7849094 Allow item links to be deleted even when other deletes and purges are disabled. 
If these links are not deleted, then they will build up in the player's inventory until they can no longer log in.
Accidental deletion of links due to bugs or other causes is potentially inconvenient but on a par with items being
accidentally moved.  When a link is deleted, the target of the link is never touched.
This is a general solution that accounts for the use of links anywhere in the user's inventory.
 2011-05-19 00:51:14 +01:00
Justin Clark-Casey (justincc)
6dcc87b1ad Accidentally committed too early 
Revert "Allow item links to be deleted even when other deletes and purges are disabled."

This reverts commit 491279f99a.
 2011-05-18 00:23:35 +01:00
Justin Clark-Casey (justincc)
491279f99a Allow item links to be deleted even when other deletes and purges are disabled. 
If these links are not deleted, then they will build up in the player's inventory until they can no longer log in.
Accidental deletion of links due to bugs or other causes is potentially inconvenient but on a par with items being
accidentally moved.  When a link is deleted, the target of the link is never touched.
This is a general solution that accounts for the use of links anywhere in the user's inventory.
 2011-05-17 22:31:16 +01:00
Melanie
b451cc1ebb Merge branch 'master' into careminster-presence-refactor 2011-05-08 20:23:06 +01:00
Diva Canto
72fb0d5b93 Mantis #5470 -- add forgotten MSSQL's GridUserStore. Thank you MrMonkE 2011-05-07 14:56:59 -07:00
Melanie
d1cf1fe3d7 Merge branch 'master' into careminster-presence-refactor 2011-04-30 14:37:37 +01:00
Diva Canto
7ecf689584 Thank you MrMonkE for a patch that seems to bring the MSSQL data layer up to speed with 0.7.x. 2011-04-28 07:28:29 -07:00
Melanie
407c2b1823 Merge branch 'master' into careminster-presence-refactor 2011-04-06 09:22:55 +01:00
Justin Clark-Casey (justincc)
f58941e89f Make the "All Estates" option work from the client (this makes chosen changes to all the estates that the user owns). 
This applies to adding/removing estate users, groups, managers and bans.
This is the application of the AllEstates_0.5.patch from http://opensimulator.org/mantis/view.php?id=5420
Thanks very much, Snoopy!
 2011-04-05 01:30:13 +01:00
Justin Clark-Casey (justincc)
7bba31e8d9 remove some mono compiler warnings 2011-03-31 22:20:12 +01:00
Melanie
a62b435a39 Merge branch 'master' into careminster-presence-refactor 2011-03-27 21:41:54 +01:00
Justin Clark-Casey (justincc)
d3a20a1e92 On initial region registration, if the user chooses the option to make the region part of an existing estate, then list the existing region names. 2011-03-21 21:37:06 +00:00
Melanie
ee9aca9c52 Add the ability for gods to impersonate users. For this, bit 6 needs to be 
set in the target's UserFlags and the impersonator must have UserLevel 200
or above. The user can then log in using the target's name and their own
password.
 2010-11-25 20:34:55 +01:00
Melanie
5f8ab9f018 Merge branch 'master' into careminster-presence-refactor 2010-11-03 02:34:36 +00:00
Melanie
6c3b7617b0 Add lsClearWindlightScene() to the lightshare module to remove WL settings 
from a region and allow normal day cycles to be reestablished
 2010-11-03 02:31:43 +00: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
John Hurliman
860b2a502f Changed SceneObjectGroup to store parts with the fast and thread-safe MapAndArray collection 2010-09-16 17:30:46 -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
John Hurliman
c03b24cbfd Merged 2010-09-12 14:21:51 -07:00
John Hurliman
0db1ed0b5a * Added ISimulationDataService and IEstateDataService 
* Removed StorageManager
* CONFIG CHANGE: There are no more database settings in OpenSim.ini. Check the config-include configuration files for region store and estate store database settings
 2010-09-12 14:20:26 -07:00
Jeff Ames
f1f0bc23f4 Formatting cleanup. 2010-09-12 13:43:49 -04:00
John Hurliman
109b517583 Fixed the naming mess around data connectors for simulation data 2010-09-11 20:43:06 -07: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)
692cf3c657 Remove parts locking from data classes since these are using a copy of the scene object 2010-08-26 00:17:26 +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
e74809ff4c Merge branch 'master' into careminster-presence-refactor 2010-08-18 00:59:20 +01:00
Justin Clark-Casey (justincc)
39a748b47a refactor: Use SOP.Flags rather than SOP.ObjectFlags 2010-08-13 20:23:53 +01:00
Melanie Thielker
1f25b9e8db Thank you, Marck00, for a patch that implemented region distance sorting 
for fallback regions. Applied with changes.
 2010-08-08 17:37:50 +01:00
Melanie Thielker
1cde77293e Thank you, Marck00, for a patch that implemented region distance sorting 
for fallback regions. Applied with changes.
 2010-08-08 17:51:43 +02:00
Melanie
26387252f5 Merge branch 'master' into careminster-presence-refactor 2010-08-06 18:08:40 +01:00
Justin Clark-Casey (justincc)
1270727c96 Merge branch 'moap' 2010-08-06 18:29:30 +01:00
Justin Clark-Casey (justincc)
7f3f1bfe88 fix mysql/mssql prim serialization problem 2010-08-04 20:23:18 +01:00
Justin Clark-Casey (justincc)
2a0254f2da Implement MediaUrl persistence for MySQL and MsSQL 
Not sure how I forgot this.  This may resolve problems with media textures not persisting over restart for these databases.
 2010-08-03 17:54:40 +01:00
Justin Clark-Casey (justincc)
9d8a67fe13 get rid of PrimitiveBaseShape.MediaRaw staging post 
using an OSD serialization rather than auto forces serialization code to be placed in OpenSim.Framework
this makes the media texture raw data staging post in PrimitiveBaseShape redundant, now we just directly call the code in PrimitiveBaseShape.MediaList itself
 2010-08-03 16:26:27 +01:00
Melanie
5f94b98cb2 Merge branch 'master' into careminster-presence-refactor 2010-08-01 18:00:04 +01:00
Diva Canto
c4ecbd1fb1 White space from previous commit. 2010-07-31 16:40:58 -07:00
Marck
f91ec19224 Implemented console command "show hyperlinks". 2010-07-31 16:38:23 -07:00
Justin Clark-Casey (justincc)
109ddd1bd5 add mssql support for media on a prim 
compiles but not tested.  please test and correct if necessary!
 2010-07-26 23:34:23 +01:00
Tom Grimshaw
a5a1df68c2 Provide the interface for StoreAsset to report success or failure 2010-06-28 04:02:33 -07:00