| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-08-23 | 1 | -198/+0 | |
| |\ \ | |/ | ||||||
| | * | Finally putting estate_settings.xml to rest. There will be no more attempts | Melanie | 2010-08-21 | 1 | -198/+0 | |
| | | | | | | | | | to read or write this file. | |||||
| * | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-08-21 | 5 | -87/+7 | |
| |\ \ | |/ | ||||||
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2010-08-20 | 2 | -3/+3 | |
| | |\ | ||||||
| | | * | Unit test breakage fix. | Diva Canto | 2010-08-20 | 2 | -3/+3 | |
| | | | | ||||||
| | * | | Some code cleanup for console command "create region". | Marck | 2010-08-20 | 1 | -1/+1 | |
| | |/ | | | | | | | | | | | Make region name an optional command parameter. Avoid question for region name if it has already been specified. Extend help text. | |||||
| | * | Finished implementing ViaLogin vs ViaHGLogin. Removed lookup on ↵ | Diva Canto | 2010-08-19 | 1 | -82/+0 | |
| | | | | | | | | | myipaddress.com. Also removed client IP verification upon UDP connection that had been left there -- we can't do that in general. | |||||
| | * | Partial rewrite of client IP verification. Not completely finished yet, and ↵ | Diva Canto | 2010-08-19 | 1 | -1/+3 | |
| | | | | | | | | | untested. Committing to move to my other computer. | |||||
| | * | Revert "One more go at GetExternalIpOf(user). Addresses mantis #4955 and #4943." | Diva Canto | 2010-08-19 | 1 | -40/+28 | |
| | | | | | | | | | | | | | Reverting mostly because of the texture asset files that got committed and cause grief with the 0.7-post-fixes branch. But also because I'm going to go at those mantises in another way. This reverts commit e47608fc62647a28be91dd9caf6e446826fdb54c. | |||||
| | * | One more go at GetExternalIpOf(user). Addresses mantis #4955 and #4943. | Diva Canto | 2010-08-18 | 1 | -28/+40 | |
| | | | | | | | | | (Files .xml and .txt also want to be committed) | |||||
| * | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-08-18 | 2 | -13/+30 | |
| |\ \ | |/ | ||||||
| | * | Added SendTeleportProgress to IClientAPI. Ya know what that means... 8 files ↵ | Diva Canto | 2010-08-16 | 1 | -0/+2 | |
| | | | | | | | | | affected. | |||||
| | * | Work on TeleportStart: renamed method from TeleportLocationStart to ↵ | Diva Canto | 2010-08-16 | 1 | -1/+1 | |
| | | | | | | | | | TeleportStart, and now sending this upon all teleports, not just some, and in the right place (EntityTransferModule). | |||||
| | * | * Cleaned up the magic UUID definitions in AvatarWearable.cs | John Hurliman | 2010-08-13 | 1 | -12/+27 | |
| | | | ||||||
| * | | Note to self: don't break the build | meta7 | 2010-08-10 | 1 | -1/+1 | |
| | | | ||||||
| * | | Add a stack trace to the error output on the recursive read lock warning on ↵ | meta7 | 2010-08-10 | 1 | -0/+14 | |
| | | | | | | | | | my RWlocks. Whilst recursive locks are safe, coupled with other issues we're experiencing with the TaskInventoryDictionary it implies that somewhere the lock is not being freed possibly due to a merge error somewhere, and thus it needs to be looked into. | |||||
| * | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-08-07 | 2 | -30/+42 | |
| |\ \ | |/ | ||||||
| | * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-08-07 | 2 | -30/+42 | |
| | |\ | ||||||
| | | * | Fix XStats formatting: | BlueWall (James Hughes) | 2010-08-06 | 1 | -30/+35 | |
| | | | | | | | | | | | | | | | | | | | | | | Recent libomv update broke the json serialization for XStats. This uses String.Format to convert all data to strings with fixed decimal (2 places ), or integer formats as appropriate. | |||||
| | | * | HACK ALERT! There's some underlying bug in the HTTP server that makes ↵ | Diva Canto | 2010-08-06 | 1 | -0/+7 | |
| | | | | | | | | | | | | | requests come up with Accept headers from previous requests. Until that gets fixed, this hack goes in. | |||||
| | * | | Correct display of landmark about info. Also correct region maturity rating | Melanie Thielker | 2010-08-07 | 1 | -1/+11 | |
| | |/ | | | | | | | | | in LM info. Maturity is NOT the parcel's setting, that is only for the image and text. Parcel maturity is governed by region maturity. | |||||
| * | | Correct display of landmark about info. Also correct region maturity rating | Melanie Thielker | 2010-08-07 | 1 | -1/+11 | |
| | | | | | | | | | | | in LM info. Maturity is NOT the parcel's setting, that is only for the image and text. Parcel maturity is governed by region maturity. | |||||
| * | | Merge branch 'careminster-presence-refactor' of ↵ | Tom | 2010-08-06 | 3 | -5/+141 | |
| |\ \ | | | | | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor | |||||
| | * \ | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-08-06 | 3 | -5/+141 | |
| | |\ \ | | |/ | ||||||
| | | * | Merge branch 'moap' | Justin Clark-Casey (justincc) | 2010-08-06 | 2 | -3/+114 | |
| | | |\ | ||||||
| | | | * | Simplify serialized version string. Change element capitalization for ↵ | Justin Clark-Casey (justincc) | 2010-08-03 | 1 | -5/+10 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | consistency THIS CHANGE ALTERS THE SERIALIZATION FORMAT, HOPEFULLY FOR THE LAST TIME. If you're testing, please start with a new database. This commit also improves locking for manipulation of media entries. | |||||
| | | | * | get rid of PrimitiveBaseShape.MediaRaw staging post | Justin Clark-Casey (justincc) | 2010-08-03 | 1 | -6/+0 | |
| | | | | | | | | | | | | | | | | | | | | | 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 | |||||
| | | | * | remove duplicated serialization code | Justin Clark-Casey (justincc) | 2010-08-03 | 1 | -12/+26 | |
| | | | | | ||||||
| | | | * | serialize media textures to inventory with a largely osd representation ↵ | Justin Clark-Casey (justincc) | 2010-08-03 | 1 | -3/+87 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rather than .net auto-serialization THIS WILL BREAK ANY EXISTING MEDIA TEXTURE SERIALIZATIONS. If you're testing this, please start with new databases. This makes media textures serialized in the same way, which is probably better in the long term. | |||||
| | | | * | comment out further debug line in BaseHttpServer | Justin Clark-Casey (justincc) | 2010-07-27 | 1 | -1/+1 | |
| | | | | | ||||||
| | | | * | relocate serialization code from SQLiteRegionData to MoapModule using load ↵ | Justin Clark-Casey (justincc) | 2010-07-26 | 1 | -0/+6 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and save events. This is better modularity. It also allows MoapModule to be replaced with some other media module that may behave completely differently in the future. Remaining non-modularity: PrimitiveBaseShape needs explicit Media and MediaRaw fields. MediaRaw is required in order to shuttle the pre-serialization data back and forth from the database layer. The database also needs to know about MediaRaw though not about Media. IMO, it would be extremely nice to remove these hard codings but this is a bridge too far at the present time. | |||||
| | | | * | implement llSetPrimMediaParams() | Justin Clark-Casey (justincc) | 2010-07-26 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | | | | Untested | |||||
| | | | * | start storing incoming MediaEntry on a new Media field on PrimitiveBaseShape | Justin Clark-Casey (justincc) | 2010-07-26 | 1 | -0/+7 | |
| | | | | | | | | | | | | | | | | | | | | | This allows the media texture to persist in memory - logging in and out will redisplay it (after a click) though navigation will be lost Next need to implement media uri on prim and delegate more incoming llsd parsing to libomv | |||||
| | | | * | do a whole load of crappy hacking to get cubes to display google.com | Justin Clark-Casey (justincc) | 2010-07-26 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | currently, for smoe reason the page only appears when you click a face. also, actually navigating anywhere always snaps you back to the google search box, for some unknown reason you can still change the url and normal navigation will work again | |||||
| | | * | | Merge branch 'iar-merge' | Justin Clark-Casey (justincc) | 2010-08-04 | 1 | -2/+27 | |
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs | |||||
| | | | * | | Add --merge switch to load iar. | Justin Clark-Casey (justincc) | 2010-06-30 | 1 | -2/+27 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When this switch is used, iar folders are merged with existing same-name user inventory folders. This makes it a little easier to back and restore entire individual user inventories, among other things Added unit test to check behaviour | |||||
| * | | | | | Implement CreateNewOutfitAttachments. This addresses mantis #199. | Tom | 2010-08-06 | 1 | -0/+4 | |
| |/ / / / | ||||||
| * | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-08-04 | 3 | -0/+323 | |
| |\ \ \ \ | |/ / / | ||||||
| | * | | | Revert "remove long unused OpenSim/Framework/Configuration/* projects" | Melanie | 2010-08-04 | 3 | -0/+323 | |
| | | | | | | | | | | | | | | | | | This reverts commit cdd3f17b2bee58def470635cfc06e26b0d0145b2. | |||||
| * | | | | don't mask current time reads (since we don't mask the corresponding subtract) | Mike Rieker | 2010-08-03 | 1 | -3/+3 | |
| | | | | | | | | | | | | | | | | | | | | | if you mask the reads you have to mask the subtract as well. simplest is just don't mask any of it. | |||||
| * | | | | Drop the RestClient timeout from 15 minutes to 30 seconds. This does not ↵ | Tom | 2010-08-03 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | address the problem, but it will allow the regions to recover in the event that the remote server goes away. | |||||
| * | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-07-31 | 15 | -1512/+88 | |
| |\ \ \ \ | |/ / / | ||||||
| | * | | | Slight improvement on previous commit. | Diva Canto | 2010-07-30 | 1 | -1/+13 | |
| | | | | | ||||||
| | * | | | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim | Diva Canto | 2010-07-30 | 13 | -1509/+0 | |
| | |\ \ \ | ||||||
| | | * | | | remove long unused OpenSim/Framework/Configuration/* projects | Justin Clark-Casey (justincc) | 2010-07-30 | 3 | -323/+0 | |
| | | | | | | ||||||
| | | * | | | Remove unused ILoginServiceToRegionsConnector | Justin Clark-Casey (justincc) | 2010-07-30 | 1 | -41/+0 | |
| | | | | | | ||||||
| | | * | | | Remove unused LLFileTransfer | Justin Clark-Casey (justincc) | 2010-07-30 | 1 | -40/+0 | |
| | | | | | | ||||||
| | | * | | | remove long superseded HGNetworkServersInfo | Justin Clark-Casey (justincc) | 2010-07-30 | 1 | -107/+0 | |
| | | | | | | ||||||
| | | * | | | remove unused FriendRegionInfo | Justin Clark-Casey (justincc) | 2010-07-30 | 1 | -38/+0 | |
| | | | | | | ||||||
| | | * | | | remove now unused GridConfig, MessageServerConfig, UserConfig | Justin Clark-Casey (justincc) | 2010-07-30 | 4 | -583/+0 | |
| | | | | | | ||||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |